summaryrefslogtreecommitdiffstats
path: root/options/options.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-19 23:27:09 +0200
committerwm4 <wm4@nowhere>2014-05-20 02:40:22 +0200
commit4664f8b3b7cd5089463623df02655ec11e258671 (patch)
tree1dfe5ed9633762ec8f50deabaa4e23b24104f401 /options/options.h
parentac66bcc25955b41f71202273490d4073a013a7db (diff)
downloadmpv-4664f8b3b7cd5089463623df02655ec11e258671.tar.bz2
mpv-4664f8b3b7cd5089463623df02655ec11e258671.tar.xz
cache: redo options and default settings
Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
Diffstat (limited to 'options/options.h')
-rw-r--r--options/options.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/options/options.h b/options/options.h
index e7008846de..d512089b3a 100644
--- a/options/options.h
+++ b/options/options.h
@@ -40,6 +40,13 @@ typedef struct mp_vo_opts {
int fs_missioncontrol;
} mp_vo_opts;
+struct mp_cache_opts {
+ int size;
+ int def_size;
+ int initial;
+ int seek_min;
+};
+
typedef struct MPOpts {
int use_terminal;
char *msglevels;
@@ -108,12 +115,10 @@ typedef struct MPOpts {
int load_config;
char *force_configdir;
int use_filedir_conf;
- int stream_cache_size;
- int stream_cache_def_size;
- float stream_cache_min_percent;
- float stream_cache_seek_min_percent;
int network_rtsp_transport;
+ struct mp_cache_opts stream_cache;
int stream_cache_pause;
+ int stream_cache_unpause;
int chapterrange[2];
int edition_id;
int correct_pts;
@@ -170,7 +175,6 @@ typedef struct MPOpts {
char *sub_cp;
char *audio_stream;
- int audio_stream_cache;
char *demuxer_name;
char *audio_demuxer_name;
char *sub_demuxer_name;