diff options
| author | wm4 <wm4@nowhere> | 2013-08-02 17:02:34 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-08-02 17:02:34 +0200 |
| commit | bc1d61cf4296ab41564adb896e454e48c292e451 (patch) | |
| tree | 461dfa0cb61af73b62838608aa8fbb3dd99d3642 /core/m_option.h | |
| parent | 964194b55bf86d7c8b76febe8bf54c49648e79c1 (diff) | |
| download | mpv-bc1d61cf4296ab41564adb896e454e48c292e451.tar.bz2 mpv-bc1d61cf4296ab41564adb896e454e48c292e451.tar.xz | |
stream: redo URL parsing, replace m_struct usage with m_config
Move the URL parsing code from m_option.c to stream.c, and simplify it
dramatically. This code originates from times when http code used this,
but now it's just relict from other stream implementations reusing this
code. Remove the unused bits and simplify the rest.
stream_vcd is insane, and the priv struct is different on every
platform, so drop the URL parsing. This means you can't specify a track
anymore, only the device. (Does anyone use stream_vcd? Not like this
couldn't be fixed, but it doesn't seem worth the effort, especially
because it'd require potentially touching platform specific code.)
Diffstat (limited to 'core/m_option.h')
| -rw-r--r-- | core/m_option.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/core/m_option.h b/core/m_option.h index 6d44ce6696..973da4daaa 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -155,12 +155,6 @@ int m_obj_parse_sub_config(struct bstr opt_name, struct bstr name, struct bstr *pstr, struct m_config *config, int flags, char ***ret); -// Parse an URL into a struct. -/** The option priv field (\ref m_option::priv) must point to a - * \ref m_struct_st describing which fields of the URL must be used. - */ -extern const m_option_type_t m_option_type_custom_url; - struct m_opt_choice_alternatives { char *name; int value; @@ -193,7 +187,6 @@ struct m_sub_options { #define CONF_TYPE_FOURCC (&m_option_type_fourcc) #define CONF_TYPE_AFMT (&m_option_type_afmt) #define CONF_TYPE_OBJ_SETTINGS_LIST (&m_option_type_obj_settings_list) -#define CONF_TYPE_CUSTOM_URL (&m_option_type_custom_url) #define CONF_TYPE_TIME (&m_option_type_time) #define CONF_TYPE_CHOICE (&m_option_type_choice) #define CONF_TYPE_INT_PAIR (&m_option_type_intpair) |