diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /player/core.h | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'player/core.h')
| -rw-r--r-- | player/core.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/player/core.h b/player/core.h index 21129d6ea3..61360b726e 100644 --- a/player/core.h +++ b/player/core.h @@ -153,7 +153,7 @@ struct track { struct vo_chain { struct mp_log *log; - struct mp_hwdec_info *hwdec_info; + struct mp_hwdec_devices *hwdec_devs; double container_fps; struct vf_chain *vf; @@ -243,7 +243,7 @@ typedef struct MPContext { double osd_msg_visible; double osd_msg_next_duration; double osd_last_update; - bool osd_force_update; + bool osd_force_update, osd_idle_update; char *osd_msg_text; bool osd_show_pos; struct osd_progbar_state osd_progbar; @@ -398,6 +398,7 @@ typedef struct MPContext { bool paused_for_cache; double cache_stop_time, cache_wait_time; + int cache_buffer; // Set after showing warning about decoding being too slow for realtime // playback rate. Used to avoid showing it multiple times. @@ -515,7 +516,7 @@ char *chapter_display_name(struct MPContext *mpctx, int chapter); char *chapter_name(struct MPContext *mpctx, int chapter); double chapter_start_time(struct MPContext *mpctx, int chapter); int get_chapter_count(struct MPContext *mpctx); -double get_cache_buffering_percentage(struct MPContext *mpctx); +int get_cache_buffering_percentage(struct MPContext *mpctx); void execute_queued_seek(struct MPContext *mpctx); void run_playloop(struct MPContext *mpctx); void mp_idle(struct MPContext *mpctx); |