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.

6 files changed, 15 insertions, 16 deletions

diff --git a/stream/dvbin.h b/stream/dvbin.h
index 2bb494d3d9..9bb06abe36 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -91,7 +91,7 @@ typedef struct {
     int cfg_devno;
     int cfg_timeout;
     char *cfg_file;
-    int cfg_full_transponder;
+    bool cfg_full_transponder;
     int cfg_channel_switch_offset;
 } dvb_opts_t;
 
diff --git a/stream/stream.c b/stream/stream.c
index 436bc7f779..263c7f5e72 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -103,7 +103,7 @@ static const stream_info_t *const stream_list[] = {
 
 struct stream_opts {
     int64_t buffer_size;
-    int load_unsafe_playlists;
+    bool load_unsafe_playlists;
 };
 
 #define OPT_BASE_STRUCT struct stream_opts
@@ -112,7 +112,7 @@ const struct m_sub_options stream_conf = {
     .opts = (const struct m_option[]){
         {"stream-buffer-size", OPT_BYTE_SIZE(buffer_size),
             M_RANGE(STREAM_MIN_BUFFER_SIZE, STREAM_MAX_BUFFER_SIZE)},
-        {"load-unsafe-playlists", OPT_FLAG(load_unsafe_playlists)},
+        {"load-unsafe-playlists", OPT_BOOL(load_unsafe_playlists)},
         {0}
     },
     .size = sizeof(struct stream_opts),
@@ -353,8 +353,8 @@ static int stream_create_instance(const stream_info_t *sinfo,
     if (flags & STREAM_LESS_NOISE)
         mp_msg_set_max_level(s->log, MSGL_WARN);
 
-    int opt;
-    mp_read_option_raw(s->global, "access-references", &m_option_type_flag, &opt);
+    bool opt;
+    mp_read_option_raw(s->global, "access-references", &m_option_type_bool, &opt);
     s->access_references = opt;
 
     MP_VERBOSE(s, "Opening %s\n", url);
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index b00bb22539..9a30d6ca23 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -67,10 +67,10 @@ typedef struct cdda_params {
     int search_overlap;
     int toc_bias;
     int toc_offset;
-    int skip;
+    bool skip;
     char *device;
     int span[2];
-    int cdtext;
+    bool cdtext;
 } cdda_priv;
 
 #define OPT_BASE_STRUCT struct cdda_params
@@ -82,17 +82,17 @@ const struct m_sub_options stream_cdda_conf = {
         {"overlap", OPT_INT(search_overlap), M_RANGE(0, 75)},
         {"toc-bias", OPT_INT(toc_bias)},
         {"toc-offset", OPT_INT(toc_offset)},
-        {"skip", OPT_FLAG(skip)},
+        {"skip", OPT_BOOL(skip)},
         {"span-a", OPT_INT(span[0])},
         {"span-b", OPT_INT(span[1])},
-        {"cdtext", OPT_FLAG(cdtext)},
+        {"cdtext", OPT_BOOL(cdtext)},
         {"span", OPT_REMOVED("use span-a/span-b")},
         {0}
     },
     .size = sizeof(struct cdda_params),
     .defaults = &(const struct cdda_params){
         .search_overlap = -1,
-        .skip = 1,
+        .skip = true,
     },
 };
 
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 22a2d300b1..14ff2f4ca4 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -77,7 +77,7 @@ const struct m_sub_options stream_dvb_conf = {
         {"card", OPT_INT(cfg_devno), M_RANGE(0, MAX_ADAPTERS-1)},
         {"timeout", OPT_INT(cfg_timeout), M_RANGE(1, 30)},
         {"file", OPT_STRING(cfg_file), .flags = M_OPT_FILE},
-        {"full-transponder", OPT_FLAG(cfg_full_transponder)},
+        {"full-transponder", OPT_BOOL(cfg_full_transponder)},
         {"channel-switch-offset", OPT_INT(cfg_channel_switch_offset),
             .flags = UPDATE_DVB_PROG},
         {0}
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 0886ef8a61..b99243448f 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -37,12 +37,12 @@
 #define OPT_BASE_STRUCT struct stream_lavf_params
 struct stream_lavf_params {
     char **avopts;
-    int cookies_enabled;
+    bool cookies_enabled;
     char *cookies_file;
     char *useragent;
     char *referrer;
     char **http_header_fields;
-    int tls_verify;
+    bool tls_verify;
     char *tls_ca_file;
     char *tls_cert_file;
     char *tls_key_file;
@@ -56,9 +56,9 @@ const struct m_sub_options stream_lavf_conf = {
         {"http-header-fields", OPT_STRINGLIST(http_header_fields)},
         {"user-agent", OPT_STRING(useragent)},
         {"referrer", OPT_STRING(referrer)},
-        {"cookies", OPT_FLAG(cookies_enabled)},
+        {"cookies", OPT_BOOL(cookies_enabled)},
         {"cookies-file", OPT_STRING(cookies_file), .flags = M_OPT_FILE},
-        {"tls-verify", OPT_FLAG(tls_verify)},
+        {"tls-verify", OPT_BOOL(tls_verify)},
         {"tls-ca-file", OPT_STRING(tls_ca_file), .flags = M_OPT_FILE},
         {"tls-cert-file", OPT_STRING(tls_cert_file), .flags = M_OPT_FILE},
         {"tls-key-file", OPT_STRING(tls_key_file), .flags = M_OPT_FILE},
diff --git a/stream/stream_slice.c b/stream/stream_slice.c
index c0dbeeb2af..88a611c4ad 100644
--- a/stream/stream_slice.c
+++ b/stream/stream_slice.c
@@ -177,5 +177,4 @@ const stream_info_t stream_info_slice = {
     .name = "slice",
     .open2 = open2,
     .protocols = (const char*const[]){ "slice", NULL },
-    .can_write = false,
 };