diff options
| -rw-r--r-- | libhb/common.c | 27 | ||||
| -rw-r--r-- | libhb/common.h | 54 | ||||
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs | 3 |
3 files changed, 5 insertions, 79 deletions
diff --git a/libhb/common.c b/libhb/common.c index 1668ff210..6e37c1c31 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -3261,33 +3261,6 @@ void hb_job_set_file(hb_job_t *job, const char *file) } } -#ifdef HB_API_OLD_PRESET_SETTERS -void hb_job_set_x264_preset(hb_job_t *job, const char *preset) -{ - hb_job_set_encoder_preset(job, preset); -} - -void hb_job_set_x264_tune(hb_job_t *job, const char *tune) -{ - hb_job_set_encoder_tune(job, tune); -} - -void hb_job_set_advanced_opts(hb_job_t *job, const char *opts) -{ - hb_job_set_encoder_options(job, opts); -} - -void hb_job_set_h264_profile(hb_job_t *job, const char *profile) -{ - hb_job_set_encoder_profile(job, profile); -} - -void hb_job_set_h264_level(hb_job_t *job, const char *level) -{ - hb_job_set_encoder_level(job, level); -} -#endif - hb_filter_object_t * hb_filter_copy( hb_filter_object_t * filter ) { if( filter == NULL ) diff --git a/libhb/common.h b/libhb/common.h index 655f472e0..4c8dd2cc6 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -143,15 +143,6 @@ void hb_job_set_encoder_options(hb_job_t *job, const char *options); void hb_job_set_encoder_profile(hb_job_t *job, const char *profile); void hb_job_set_encoder_level (hb_job_t *job, const char *level); void hb_job_set_file (hb_job_t *job, const char *file); -// TODO: legacy functions, remove once UIs are updated -#define HB_API_OLD_PRESET_SETTERS -#ifdef HB_API_OLD_PRESET_SETTERS -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_advanced_opts(hb_job_t *job, const char *opts); -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); -#endif hb_audio_t *hb_audio_copy(const hb_audio_t *src); hb_list_t *hb_audio_list_copy(const hb_list_t *src); @@ -470,41 +461,11 @@ struct hb_job_s int cfr; int pass; int fastfirstpass; - union - { -#ifdef HB_API_OLD_PRESET_SETTERS - char *x264_preset; // TODO: legacy name, remove once UIs are updated -#endif - char *encoder_preset; - }; - union - { -#ifdef HB_API_OLD_PRESET_SETTERS - char *x264_tune; // TODO: legacy name, remove once UIs are updated -#endif - char *encoder_tune; - }; - union - { -#ifdef HB_API_OLD_PRESET_SETTERS - char *advanced_opts; // TODO: legacy name, remove once UIs are updated -#endif - char *encoder_options; - }; - union - { -#ifdef HB_API_OLD_PRESET_SETTERS - char *h264_profile; // TODO: legacy name, remove once UIs are updated -#endif - char *encoder_profile; - }; - union - { -#ifdef HB_API_OLD_PRESET_SETTERS - char *h264_level; // TODO: legacy name, remove once UIs are updated -#endif - char *encoder_level; - }; + char *encoder_preset; + char *encoder_tune; + char *encoder_options; + char *encoder_profile; + char *encoder_level; int areBframes; int color_matrix_code; @@ -594,11 +555,6 @@ struct hb_job_s { int decode; int async_depth; -#ifdef HB_API_OLD_PRESET_SETTERS - const char *preset; // TODO: deprecated, remove once UIs are updated -#else - const char *reserved; // keep around until Interop is updated -#endif av_qsv_context *ctx; // shared encoding parameters // initialized by the QSV encoder, then used upstream (e.g. by filters) diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs index a591a4247..5f41366c1 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs @@ -225,9 +225,6 @@ namespace HandBrake.Interop.HbLib public int async_depth;
- /// const char*
- public IntPtr preset;
-
/// av_qsv_context*
public IntPtr ctx;
|