File handbrake-harfbuzz.patch of Package handbrake

File handbrake-harfbuzz.patch of Package handbrake (Revision e60bf2da495bd7f15f5eccea62d23150)

Currently displaying revision e60bf2da495bd7f15f5eccea62d23150 , Show latest

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"