Skip to content

Commit

Permalink
Resolve conflict with harfbuzz include file hb.h
Browse files Browse the repository at this point in the history 
Rename hb.h to handbrake.h
  • Loading branch information
@jstebbins
jstebbins committed Sep 10, 2019
1 parent e88c6d5 commit 294bb35
Show file tree
Hide file tree
Showing 97 changed files with 98 additions and 98 deletions.
2 changes: 1 addition & 1 deletion gtk/src/audiohandler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <glib/gi18n.h>
#include "ghbcompat.h"
#include "hb.h"
#include "handbrake.h"
#include "settings.h"
#include "jobdict.h"
#include "titledict.h"
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/callbacks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#include <dbt.h>
#endif

#include "hb.h"
#include "handbrake.h"
#include "callbacks.h"
#include "chapters.h"
#include "queuehandler.h"
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/callbacks.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#endif

#include <gtk/gtk.h>
#include "hb.h"
#include "handbrake.h"
#include "values.h"
#include "settings.h"

Expand Down
2 changes: 1 addition & 1 deletion gtk/src/hb-backend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <limits.h>
#include <ctype.h>
#include <math.h>
#include "hb.h"
#include "handbrake.h"
#include "ghbcompat.h"
#include <glib/gstdio.h>
#include <glib/gi18n.h>
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/hb-backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "values.h"
#include "settings.h"
#include "hb.h"
#include "handbrake.h"
#include "lang.h"

enum
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include "hb.h"
#include "handbrake.h"
#include "renderer_button.h"
#include "hb-backend.h"
#include "ghb-dvd.h"
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/presets.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <glib/gi18n.h>
#include <string.h>
#include "ghbcompat.h"
#include "hb.h"
#include "handbrake.h"
#include "settings.h"
#include "callbacks.h"
#include "audiohandler.h"
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/presets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#if !defined(_GHB_PRESETS_H_)
#define _GHB_PRESETS_H_

#include "hb.h"
#include "handbrake.h"
#include "values.h"

void ghb_presets_load(signal_user_data_t *ud);
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/preview.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "preview.h"
#include "values.h"
#include "queuehandler.h"
#include "hb.h"
#include "handbrake.h"

#define PREVIEW_STATE_IMAGE 0
#define PREVIEW_STATE_LIVE 1
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/queuehandler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
#include "hb.h"
#include "handbrake.h"
#include "settings.h"
#include "jobdict.h"
#include "titledict.h"
Expand Down
2 changes: 1 addition & 1 deletion gtk/src/subtitlehandler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <glib/gi18n.h>
#include "ghbcompat.h"
#include "hb.h"
#include "handbrake.h"
#include "settings.h"
#include "jobdict.h"
#include "titledict.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/batch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "lang.h"

struct hb_batch_s
Expand Down
2 changes: 1 addition & 1 deletion libhb/bd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "lang.h"
#include "hbffmpeg.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/chroma_smooth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"

#define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25
#define CHROMA_SMOOTH_SIZE_DEFAULT 7
Expand Down
2 changes: 1 addition & 1 deletion libhb/comb_detect.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Original "Faster" settings:
#define FILTER_CLASSIC 1
#define FILTER_ERODE_DILATE 2

#include "hb.h"
#include "handbrake.h"
#include "taskset.h"

typedef struct decomb_thread_arg_s {
Expand Down
2 changes: 1 addition & 1 deletion libhb/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ctype.h>
#include <sys/time.h>

#include "hb.h"
#include "handbrake.h"
#include "x264.h"
#include "lang.h"
#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/decavcodec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
VC1 decoder) can't easily be used by the HB mpeg stream reader.
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"
#include "hbavfilter.h"
#include "libavfilter/avfilter.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/deccc608sub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* Note that the SRT sub generation from CC could be useful for mkv subs.
*/
#include "hb.h"
#include "handbrake.h"
#include "deccc608sub.h"

#define SSA_PREAMBLE_LEN 24
Expand Down
2 changes: 1 addition & 1 deletion libhb/declpcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"
#include "audio_resample.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/decomb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ which will feed EEDI2 interpolations to yadif.
12-15: EEDI2 will override cubic interpolation
*****/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"
#include "eedi2.h"
#include "taskset.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/decpgssub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"

struct hb_work_private_s
Expand Down
2 changes: 1 addition & 1 deletion libhb/decsrtsub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <string.h>
#include <iconv.h>
#include <errno.h>
#include "hb.h"
#include "handbrake.h"
#include "colormap.h"
#include "decsrtsub.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/decssasub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include "hb.h"
#include "handbrake.h"

#include <ass/ass.h>
#include "decssasub.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/dectx3gsub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <stdlib.h>
#include <stdio.h>
#include "hb.h"
#include "handbrake.h"
#include "colormap.h"

struct hb_work_private_s
Expand Down
2 changes: 1 addition & 1 deletion libhb/decutf8sub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <stdlib.h>
#include <stdio.h>
#include "hb.h"
#include "handbrake.h"
#include "decsrtsub.h"

struct hb_work_private_s
Expand Down
2 changes: 1 addition & 1 deletion libhb/decvobsub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* }
*/

#include "hb.h"
#include "handbrake.h"

struct hb_work_private_s
{
Expand Down
2 changes: 1 addition & 1 deletion libhb/demuxmpeg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"

static inline int check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol )
{
Expand Down
2 changes: 1 addition & 1 deletion libhb/denoise.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"

#define HQDN3D_SPATIAL_LUMA_DEFAULT 4.0f
Expand Down
2 changes: 1 addition & 1 deletion libhb/detelecine.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion libhb/dvd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "lang.h"
#include "dvd.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/dvdnav.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "lang.h"
#include "dvd.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/eedi2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
http://web.missouri.edu/~kes25c/
*/

#include "hb.h"
#include "handbrake.h"
#include "eedi2.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion libhb/enc_qsv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#if HB_PROJECT_FEATURE_QSV

#include "hb.h"
#include "handbrake.h"
#include "nal_units.h"
#include "qsv_common.h"
#include "qsv_memory.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/encavcodec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hb_dict.h"
#include "hbffmpeg.h"
#include "h264_common.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/encavcodecaudio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"

struct hb_work_private_s
Expand Down
2 changes: 1 addition & 1 deletion libhb/enctheora.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "theora/codec.h"
#include "theora/theoraenc.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/encvobsub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"

struct hb_work_private_s
{
Expand Down
2 changes: 1 addition & 1 deletion libhb/encvorbis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "audio_remap.h"

#include "vorbis/vorbisenc.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/encx264.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <stdarg.h>

#include "hb.h"
#include "handbrake.h"
#include "hb_dict.h"
#include "encx264.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/encx265.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#if HB_PROJECT_FEATURE_X265

#include "hb.h"
#include "handbrake.h"
#include "hb_dict.h"
#include "h265_common.h"
#include "x265.h"
Expand Down
2 changes: 1 addition & 1 deletion libhb/fifo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#if HB_PROJECT_FEATURE_QSV
#include "qsv_libav.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion libhb/grayscale.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"
#include "taskset.h"

Expand Down
2 changes: 1 addition & 1 deletion libhb/hb.h → libhb/handbrake.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* hb.h
/* handbrake.h
Copyright (c) 2003-2019 HandBrake Team
This file is part of the HandBrake source code
Expand Down
2 changes: 1 addition & 1 deletion libhb/hb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
*/

#include "hb.h"
#include "handbrake.h"
#include "hbffmpeg.h"
#include "encx264.h"
#include "libavfilter/avfilter.h"
Expand Down
Loading

0 comments on commit 294bb35

Please sign in to comment.