diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-23 17:21:01 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-23 17:21:01 +0000 |
| commit | f9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42 (patch) | |
| tree | 8db9d460c3bea1a734a69a2740f25de72310c2d0 /cfg-common.h | |
| parent | a2dfc7a766c2f00408671327838602eebcc4cddf (diff) | |
| download | mpv-f9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42.tar.bz2 mpv-f9e3a4bf886ebfd865e6ffba7edc9c0a6f114b42.tar.xz | |
cleanup config option handling in libmpdemux.
removed overcompilacted m_config_register_options() mess - export the
subconfig structs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7868 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/cfg-common.h b/cfg-common.h index 941d9b8348..7fe5476194 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -71,6 +71,22 @@ {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, + { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "nohr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + + { "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + +#ifdef HAVE_CDDA + { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +#endif + + // demuxer.c - select audio/sub file/demuxer + { "audiofile", &audio_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "subfile", &sub_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "demuxer", &demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + { "audio-demuxer", &audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + { "sub-demuxer", &sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, + {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, #ifdef USE_TV {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, @@ -199,6 +215,15 @@ extern char *network_password; extern int network_bandwidth; #endif +/* defined in libmpdemux: */ +extern int hr_mp3_seek; +extern config_t demux_rawaudio_opts[]; +extern config_t cdda_opts[]; + +extern char* audio_stream; +extern char* sub_stream; +extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; + #include "libmpdemux/tv.h" #ifdef USE_TV |