options: transition options from OPT_FLAG to OPT_BOOL

c78482045444c488bb7948305d583a55d17cd236 introduced a bool option type
as a replacement for the flag type, but didn't actually transition and
remove the flag type because it would have been too much mundane work.

1 files changed, 91 insertions, 91 deletions

diff --git a/options/options.h b/options/options.h
index 86e95dc826..2830a7a14d 100644
--- a/options/options.h
+++ b/options/options.h
@@ -9,16 +9,16 @@
 typedef struct mp_vo_opts {
     struct m_obj_settings *video_driver_list;
 
-    int taskbar_progress;
-    int snap_window;
-    int ontop;
+    bool taskbar_progress;
+    bool snap_window;
+    bool ontop;
     int ontop_level;
     bool fullscreen;
-    int border;
-    int fit_border;
-    int all_workspaces;
-    int window_minimized;
-    int window_maximized;
+    bool border;
+    bool fit_border;
+    bool all_workspaces;
+    bool window_minimized;
+    bool window_maximized;
     bool focus_on_open;
 
     int screen_id;
@@ -31,7 +31,7 @@ typedef struct mp_vo_opts {
     int x11_netwm;
     int x11_bypass_compositor;
     int x11_present;
-    int native_keyrepeat;
+    bool native_keyrepeat;
 
     float panscan;
     float zoom;
@@ -48,17 +48,17 @@ typedef struct mp_vo_opts {
     struct m_geometry autofit_smaller;
     double window_scale;
 
-    int keepaspect;
-    int keepaspect_window;
-    int hidpi_window_scale;
-    int native_fs;
+    bool keepaspect;
+    bool keepaspect_window;
+    bool hidpi_window_scale;
+    bool native_fs;
 
     int64_t WinID;
 
     float force_monitor_aspect;
     float monitor_pixel_aspect;
-    int force_render;
-    int force_window_position;
+    bool force_render;
+    bool force_window_position;
 
     char *mmcss_profile;
 
@@ -73,52 +73,52 @@ typedef struct mp_vo_opts {
 
 // Subtitle options needed by the subtitle decoders/renderers.
 struct mp_subtitle_opts {
-    int sub_visibility;
-    int sec_sub_visibility;
+    bool sub_visibility;
+    bool sec_sub_visibility;
     int sub_pos;
     float sub_delay;
     float sub_fps;
     float sub_speed;
     int forced_subs_only;
     int forced_subs_only_current;
-    int stretch_dvd_subs;
-    int stretch_image_subs;
-    int image_subs_video_res;
-    int sub_fix_timing;
-    int sub_scale_by_window;
-    int sub_scale_with_window;
-    int ass_scale_with_window;
+    bool stretch_dvd_subs;
+    bool stretch_image_subs;
+    bool image_subs_video_res;
+    bool sub_fix_timing;
+    bool sub_scale_by_window;
+    bool sub_scale_with_window;
+    bool ass_scale_with_window;
     struct osd_style_opts *sub_style;
     float sub_scale;
     float sub_gauss;
-    int sub_gray;
-    int ass_enabled;
+    bool sub_gray;
+    bool ass_enabled;
     float ass_line_spacing;
-    int ass_use_margins;
-    int sub_use_margins;
-    int ass_vsfilter_aspect_compat;
+    bool ass_use_margins;
+    bool sub_use_margins;
+    bool ass_vsfilter_aspect_compat;
     int ass_vsfilter_color_compat;
-    int ass_vsfilter_blur_compat;
-    int use_embedded_fonts;
+    bool ass_vsfilter_blur_compat;
+    bool use_embedded_fonts;
     char **ass_force_style_list;
     char *ass_styles_file;
     int ass_style_override;
     int ass_hinting;
     int ass_shaper;
-    int ass_justify;
-    int sub_clear_on_seek;
+    bool ass_justify;
+    bool sub_clear_on_seek;
     int teletext_page;
-    int sub_past_video_end;
+    bool sub_past_video_end;
 };
 
 struct mp_sub_filter_opts {
-    int sub_filter_SDH;
-    int sub_filter_SDH_harder;
-    int rf_enable;
-    int rf_plain;
+    bool sub_filter_SDH;
+    bool sub_filter_SDH_harder;
+    bool rf_enable;
+    bool rf_plain;
     char **rf_items;
     char **jsre_items;
-    int rf_warn;
+    bool rf_warn;
 };
 
 struct mp_osd_render_opts {
@@ -127,21 +127,21 @@ struct mp_osd_render_opts {
     float osd_bar_w;
     float osd_bar_h;
     float osd_scale;
-    int osd_scale_by_window;
+    bool osd_scale_by_window;
     struct osd_style_opts *osd_style;
-    int force_rgba_osd;
+    bool force_rgba_osd;
 };
 
 typedef struct MPOpts {
-    int property_print_help;
-    int use_terminal;
+    bool property_print_help;
+    bool use_terminal;
     char *dump_stats;
     int verbose;
-    int msg_really_quiet;
+    bool msg_really_quiet;
     char **msg_levels;
-    int msg_color;
-    int msg_module;
-    int msg_time;
+    bool msg_color;
+    bool msg_module;
+    bool msg_time;
     char *log_file;
 
     char *test_mode;
@@ -150,25 +150,25 @@ typedef struct MPOpts {
     char **reset_options;
     char **script_files;
     char **script_opts;
-    int lua_load_osc;
-    int lua_load_ytdl;
+    bool lua_load_osc;
+    bool lua_load_ytdl;
     char *lua_ytdl_format;
     char **lua_ytdl_raw_options;
-    int lua_load_stats;
-    int lua_load_console;
+    bool lua_load_stats;
+    bool lua_load_console;
     int lua_load_auto_profiles;
 
-    int auto_load_scripts;
+    bool auto_load_scripts;
 
-    int audio_exclusive;
-    int ao_null_fallback;
-    int audio_stream_silence;
+    bool audio_exclusive;
+    bool ao_null_fallback;
+    bool audio_stream_silence;
     float audio_wait_open;
     int force_vo;
     float softvol_volume;
     int rgain_mode;
     float rgain_preamp;         // Set replaygain pre-amplification
-    int rgain_clip;             // Enable/disable clipping prevention
+    bool rgain_clip;             // Enable/disable clipping prevention
     float rgain_fallback;
     int softvol_mute;
     float softvol_max;
@@ -184,7 +184,7 @@ typedef struct MPOpts {
 
     int stop_screensaver;
     int cursor_autohide_delay;
-    int cursor_autohide_fs;
+    bool cursor_autohide_fs;
 
     struct mp_subtitle_opts *subs_rend;
     struct mp_sub_filter_opts *subs_filt;
@@ -192,43 +192,43 @@ typedef struct MPOpts {
 
     int osd_level;
     int osd_duration;
-    int osd_fractions;
+    bool osd_fractions;
     int osd_on_seek;
-    int video_osd;
+    bool video_osd;
 
-    int untimed;
+    bool untimed;
     char *stream_dump;
     char *record_file;
-    int stop_playback_on_init_failure;
+    bool stop_playback_on_init_failure;
     int loop_times;
     int loop_file;
-    int shuffle;
-    int ordered_chapters;
+    bool shuffle;
+    bool ordered_chapters;
     char *ordered_chapters_files;
     int chapter_merge_threshold;
     double chapter_seek_threshold;
     char *chapter_file;
-    int merge_files;
-    int quiet;
-    int load_config;
+    bool merge_files;
+    bool quiet;
+    bool load_config;
     char *force_configdir;
-    int use_filedir_conf;
+    bool use_filedir_conf;
     int hls_bitrate;
     int edition_id;
-    int initial_audio_sync;
+    bool initial_audio_sync;
     double sync_max_video_change;
     double sync_max_audio_change;
     int sync_max_factor;
     int hr_seek;
     float hr_seek_demuxer_offset;
-    int hr_seek_framedrop;
+    bool hr_seek_framedrop;
     float audio_delay;
     float default_max_pts_correction;
     int autosync;
     int frame_dropping;
-    int video_latency_hacks;
+    bool video_latency_hacks;
     int term_osd;
-    int term_osd_bar;
+    bool term_osd_bar;
     char *term_osd_bar_chars;
     char *term_title;
     char *playing_msg;
@@ -238,47 +238,47 @@ typedef struct MPOpts {
     char *osd_status_msg;
     char *osd_msg[3];
     int player_idle_mode;
-    int consolecontrols;
+    bool consolecontrols;
     int playlist_pos;
     struct m_rel_time play_start;
     struct m_rel_time play_end;
     struct m_rel_time play_length;
     int play_dir;
-    int rebase_start_time;
+    bool rebase_start_time;
     int play_frames;
     double ab_loop[2];
     int ab_loop_count;
     double step_sec;
-    int position_resume;
-    int position_check_mtime;
-    int position_save_on_quit;
-    int write_filename_in_watch_later_config;
-    int ignore_path_in_watch_later_config;
+    bool position_resume;
+    bool position_check_mtime;
+    bool position_save_on_quit;
+    bool write_filename_in_watch_later_config;
+    bool ignore_path_in_watch_later_config;
     char *watch_later_directory;
     char **watch_later_options;
-    int pause;
+    bool pause;
     int keep_open;
-    int keep_open_pause;
+    bool keep_open_pause;
     double image_display_duration;
     char *lavfi_complex;
     int stream_id[2][STREAM_TYPE_COUNT];
     char **stream_lang[STREAM_TYPE_COUNT];
-    int stream_auto_sel;
-    int subs_with_matching_audio;
+    bool stream_auto_sel;
+    bool subs_with_matching_audio;
     int audio_display;
     char **display_tags;
 
     char **audio_files;
     char *demuxer_name;
-    int demuxer_thread;
+    bool demuxer_thread;
     double demux_termination_timeout;
-    int demuxer_cache_wait;
-    int prefetch_open;
+    bool demuxer_cache_wait;
+    bool prefetch_open;
     char *audio_demuxer_name;
     char *sub_demuxer_name;
 
-    int cache_pause;
-    int cache_pause_initial;
+    bool cache_pause;
+    bool cache_pause_initial;
     float cache_pause_wait;
 
     struct image_writer_opts *screenshot_image_opts;
@@ -292,7 +292,7 @@ typedef struct MPOpts {
     int audio_output_format;
     int force_srate;
     double playback_speed;
-    int pitch_correction;
+    bool pitch_correction;
     struct m_obj_settings *vf_settings, *vf_defs;
     struct m_obj_settings *af_settings, *af_defs;
     struct filter_opts *filter_opts;
@@ -302,12 +302,12 @@ typedef struct MPOpts {
     char **audiofile_paths;
     char **coverart_files;
     char **external_files;
-    int autoload_files;
+    bool autoload_files;
     int sub_auto;
     int audiofile_auto;
     int coverart_auto;
     bool coverart_whitelist;
-    int osd_bar_visible;
+    bool osd_bar_visible;
 
     int w32_priority;
 
@@ -374,7 +374,7 @@ struct dvd_opts {
 };
 
 struct filter_opts {
-    int deinterlace;
+    bool deinterlace;
 };
 
 extern const struct m_sub_options vo_sub_opts;