diff options
| author | wm4 <wm4@nowhere> | 2013-03-08 02:08:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-08 02:12:53 +0100 |
| commit | bc20f2cb00234ce436be2f939cb62dbbde5e8dd2 (patch) | |
| tree | c4c55ae65b8f468578de5eb7253c9c2cd6c44c5c /core/options.h | |
| parent | 14427ae2ee1923eeeb5189f6a0a3c9ebf391eff6 (diff) | |
| download | mpv-bc20f2cb00234ce436be2f939cb62dbbde5e8dd2.tar.bz2 mpv-bc20f2cb00234ce436be2f939cb62dbbde5e8dd2.tar.xz | |
core: remove a number of global variables
Move them into per-instance structs. This should get rid of all global
variables in mplayer.c (not counting those referenced by cfg-mplayer.h).
In core/input/ar.c, just remove checking the slave_mode variable. I'm
not sure what this code was supposed to achieve, but slave mode is
broken, slave mode is actually infeasible on OSX (ar.c is completely OSX
specific), and the correct way of doing this would be to disable this
input device per command line switch.
Diffstat (limited to 'core/options.h')
| -rw-r--r-- | core/options.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/options.h b/core/options.h index a6724959aa..4483d6bed2 100644 --- a/core/options.h +++ b/core/options.h @@ -2,6 +2,7 @@ #define MPLAYER_OPTIONS_H #include <stdbool.h> +#include <stdint.h> #include "core/m_option.h" typedef struct mp_vo_opts { @@ -83,6 +84,7 @@ typedef struct MPOpts { int chapter_merge_threshold; int quiet; int load_config; + int use_filedir_conf; int stream_cache_size; float stream_cache_min_percent; float stream_cache_seek_min_percent; @@ -95,6 +97,9 @@ typedef struct MPOpts { int initial_audio_sync; int hr_seek; float hr_seek_demuxer_offset; + float audio_delay; + float default_max_pts_correction; + int ignore_start; int autosync; int softsleep; int frame_dropping; @@ -103,13 +108,18 @@ typedef struct MPOpts { char *playing_msg; char *status_msg; char *osd_status_msg; + char *heartbeat_cmd; int player_idle_mode; + int slave_mode; int consolecontrols; int doubleclick_time; int list_properties; struct m_rel_time play_start; struct m_rel_time play_end; struct m_rel_time play_length; + int play_frames; + double step_sec; + int64_t seek_to_byte; int start_paused; int keep_open; int audio_id; @@ -119,6 +129,7 @@ typedef struct MPOpts { char **sub_lang; int audio_display; int sub_visibility; + int forced_subs_only; char *quvi_format; char *audio_stream; @@ -132,8 +143,11 @@ typedef struct MPOpts { struct image_writer_opts *screenshot_image_opts; char *screenshot_template; + double force_fps; + int audio_output_channels; int audio_output_format; + int force_srate; int dtshd; float playback_speed; float drc_level; |