diff options
| -rw-r--r-- | options/options.c | 29 | ||||
| -rw-r--r-- | stream/cache.c | 27 |
2 files changed, 28 insertions, 28 deletions
diff --git a/options/options.c b/options/options.c index 38af34219b..5eec6070c6 100644 --- a/options/options.c +++ b/options/options.c @@ -65,6 +65,7 @@ extern const struct m_sub_options tv_params_conf; extern const struct m_sub_options stream_cdda_conf; extern const struct m_sub_options stream_dvb_conf; extern const struct m_sub_options stream_lavf_conf; +extern const struct m_sub_options stream_cache_conf; extern const struct m_sub_options sws_conf; extern const struct m_sub_options demux_rawaudio_conf; extern const struct m_sub_options demux_rawvideo_conf; @@ -117,34 +118,6 @@ static const struct m_sub_options screenshot_conf = { .defaults = &image_writer_opts_defaults, }; -#define OPT_BASE_STRUCT struct mp_cache_opts - -const struct m_sub_options stream_cache_conf = { - .opts = (const struct m_option[]){ - OPT_CHOICE_OR_INT("cache", size, 0, 32, 0x7fffffff, - ({"no", 0}, - {"auto", -1}, - {"yes", -2})), - OPT_CHOICE_OR_INT("cache-default", def_size, 0, 32, 0x7fffffff, - ({"no", 0})), - OPT_INTRANGE("cache-initial", initial, 0, 0, 0x7fffffff), - OPT_INTRANGE("cache-seek-min", seek_min, 0, 0, 0x7fffffff), - OPT_INTRANGE("cache-backbuffer", back_buffer, 0, 0, 0x7fffffff), - OPT_STRING("cache-file", file, M_OPT_FILE), - OPT_INTRANGE("cache-file-size", file_max, 0, 0, 0x7fffffff), - {0} - }, - .size = sizeof(struct mp_cache_opts), - .defaults = &(const struct mp_cache_opts){ - .size = -1, - .def_size = 75000, - .initial = 0, - .seek_min = 500, - .back_buffer = 75000, - .file_max = 1024 * 1024, - }, -}; - #undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct mp_vo_opts diff --git a/stream/cache.c b/stream/cache.c index 16ce35337c..a458dd14a7 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -66,6 +66,33 @@ #include "stream.h" #include "common/common.h" +#define OPT_BASE_STRUCT struct mp_cache_opts + +const struct m_sub_options stream_cache_conf = { + .opts = (const struct m_option[]){ + OPT_CHOICE_OR_INT("cache", size, 0, 32, 0x7fffffff, + ({"no", 0}, + {"auto", -1}, + {"yes", -2})), + OPT_CHOICE_OR_INT("cache-default", def_size, 0, 32, 0x7fffffff, + ({"no", 0})), + OPT_INTRANGE("cache-initial", initial, 0, 0, 0x7fffffff), + OPT_INTRANGE("cache-seek-min", seek_min, 0, 0, 0x7fffffff), + OPT_INTRANGE("cache-backbuffer", back_buffer, 0, 0, 0x7fffffff), + OPT_STRING("cache-file", file, M_OPT_FILE), + OPT_INTRANGE("cache-file-size", file_max, 0, 0, 0x7fffffff), + {0} + }, + .size = sizeof(struct mp_cache_opts), + .defaults = &(const struct mp_cache_opts){ + .size = -1, + .def_size = 75000, + .initial = 0, + .seek_min = 500, + .back_buffer = 75000, + .file_max = 1024 * 1024, + }, +}; // Note: (struct priv*)(cache->priv)->cache == cache struct priv { |