From a1a9dc9c850f6e99103e34f1ed8e66fdc9d2012c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 Mar 2013 00:24:34 +0100 Subject: options: remove --no-vsync Latest nvidia drivers ignore the application setting, so this switch makes even less sense than before. It's still possible to control this with VO specific suboptions. --- core/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 3d4c05bcc1..a6724959aa 100644 --- a/core/options.h +++ b/core/options.h @@ -11,7 +11,6 @@ typedef struct mp_vo_opts { int screenheight; int ontop; bool fs; - int vsync; int screen_id; int fsscreen_id; int stop_screensaver; -- cgit v1.2.3 From bc20f2cb00234ce436be2f939cb62dbbde5e8dd2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 8 Mar 2013 02:08:02 +0100 Subject: 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. --- core/options.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'core/options.h') 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 +#include #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; -- cgit v1.2.3 From ef3c0e6edafd6460d30c24dfd9f5b2f50401f38f Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 30 Mar 2013 20:08:56 +0100 Subject: osd: draw the OSD bar with ASS vector drawings Drawing the bar with vector drawings (instead with characters from the OSD font) offers more flexibility and looks better. This also adds chapter marks to the OSD bar, which are visible as small triangles on the top and bottom inner border of the bar. Change the default position of the OSD bar below the center of the screen. This is less annoying than putting the bar directly into the center of the view, where it obscures the video. The new position is not quite on the bottom of the screen to avoid collisions with subtitles. The old centered position can be forced with ``--osd-bar-align-y=0``. Also make it possible to change the OSD bar width/height with the new --osd-bar-w and --osd-bar-h options. It's possible that the new OSD bar renders much slower than the old one. There are two reasons for this: 1. the character based bar allowed libass to cache each character, while the vector drawing forces it to redraw every time the bar position changes. 2., the bar position is updated at a much higher granularity (the bar position is passed along as float instead of as integer in the range 0-100, so the bar will be updated on every single video frame). --- core/options.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 4483d6bed2..4291f2d872 100644 --- a/core/options.h +++ b/core/options.h @@ -161,6 +161,8 @@ typedef struct MPOpts { int osd_bar_visible; float osd_bar_align_x; float osd_bar_align_y; + float osd_bar_w; + float osd_bar_h; struct osd_style_opts *osd_style; struct osd_style_opts *sub_text_style; float sub_scale; -- cgit v1.2.3 From c8fd9e50e47838bbdb0dc5e0b974091312cb8833 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 31 Mar 2013 11:03:04 +0200 Subject: remove Apple Remote related code The OSX part of the Apple Remote was unmaintained for a long time and was not working anymore. I tried to update the cookies to what the current versions of OS X expect without much luck. I decided to remove it since Apple is not including the IR receiver anymore in new hardware and it's clear that wifi based remotes are the way to go. A third party iOS app should be used in it's place. In the future we could look into having a dedicated iOS Remote Control app like VLC and XBMC do. The Linux side (`appleir.c`) was relatively tidy but it looks like LIRC can be configured to work with any version of Apple Remote [1] and is more maintained. [1] LIRC Apple Remote configs: http://lirc.sourceforge.net/remotes/apple/ --- core/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 4291f2d872..999f3439e9 100644 --- a/core/options.h +++ b/core/options.h @@ -219,7 +219,6 @@ typedef struct MPOpts { int use_joystick; int use_lirc; int use_lircc; - int use_ar; // apple remote int default_bindings; int test; } input; -- cgit v1.2.3 From ccc213fdac9783b9e450342cf5a346508e961e2f Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 4 Apr 2013 14:24:42 +0200 Subject: core: add --heartbeat-interval option This closely follows MPlayer commit 36099, with some changes. Move a mutable static variable into MPContext. --- core/options.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 999f3439e9..0f1df17ba5 100644 --- a/core/options.h +++ b/core/options.h @@ -109,6 +109,7 @@ typedef struct MPOpts { char *status_msg; char *osd_status_msg; char *heartbeat_cmd; + float heartbeat_interval; int player_idle_mode; int slave_mode; int consolecontrols; -- cgit v1.2.3 From 75afa370b9aba90be73b8acc97eb9669bc0f2133 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 4 Apr 2013 01:43:14 +0200 Subject: demux_mkv: try to show current subtitle when seeking Makes sure that seeking to a given time position shows the subtitle at that position. This can fail if the subtitle packet is not close enough to the seek target. Always enabled for hr-seeks, and can be manually enabled for normal seeks with --mkv-subtitle-preroll. This helps displaying subtitles correctly with ordered chapters. When switching ordered chapter segments, a seek is performed. If the subtitle is timed slightly before the start of the segment, it normally won't be demuxed. This is a problem with all seeks, but in this case normal playback is affected. Since switching segments always uses hr-seeks, the code added by this commit is always active in this situation. If no subtitles are selected or the subtitles come from an external file, the demuxer should behave exactly as before this commit. --- core/options.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 0f1df17ba5..716ad5c357 100644 --- a/core/options.h +++ b/core/options.h @@ -140,6 +140,7 @@ typedef struct MPOpts { char *audio_demuxer_name; char *sub_demuxer_name; int extension_parsing; + int mkv_subtitle_preroll; struct image_writer_opts *screenshot_image_opts; char *screenshot_template; -- cgit v1.2.3 From 4e55a6e828e4234fafe00e56573b24897380dcb1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Apr 2013 10:54:07 +0200 Subject: Remove some apple remote leftovers The options and key names don't do anything anymore. --- core/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 716ad5c357..c92420bf92 100644 --- a/core/options.h +++ b/core/options.h @@ -216,7 +216,6 @@ typedef struct MPOpts { int ar_delay; int ar_rate; char *js_dev; - char *ar_dev; char *in_file; int use_joystick; int use_lirc; -- cgit v1.2.3 From afbf29da1ac18a78931dd21b49b2504a528a92a9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 9 Apr 2013 02:41:46 +0200 Subject: core: remove volstep global variable --- core/options.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index c92420bf92..080ca021d7 100644 --- a/core/options.h +++ b/core/options.h @@ -50,6 +50,7 @@ typedef struct MPOpts { int softvol; float mixer_init_volume; int mixer_init_mute; + int volstep; float softvol_max; int gapless_audio; int ao_buffersize; -- cgit v1.2.3 From 9df2260506f825a05ecd500496260292ef2481aa Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 10 Apr 2013 21:06:00 +0200 Subject: core: add --reset-on-next-file option This option can be used to selectively reset settings when playing the next file in the playlist (i.e. restore mplayer and mplayer2 behavior). Might remove this option again should it turn out that nobody uses it. --- core/options.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 080ca021d7..0f57381f30 100644 --- a/core/options.h +++ b/core/options.h @@ -43,6 +43,8 @@ typedef struct mp_vo_opts { } mp_vo_opts; typedef struct MPOpts { + char **reset_options; + char **audio_driver_list; int fixed_vo; char *mixer_device; -- cgit v1.2.3 From d853abafc3e0f3de06e6cf86908f5bf2aba8f7c0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 4 Apr 2013 01:13:56 +0200 Subject: x11: use mpv internal key auto-repeat handling if possible Block X11's native key repeat, and use mpv's key repeat handling in input.c instead. No configure check for XKB. Even though it's an extension, it has been part of most (all?) xlibs since 1996. If XKB appears to be missing, just refuse enabling x11. This is a potentially controversial change. mpv will use its own key repeat rate, instead of X11's. This should be better, because seeking will have a standardized "speed" (seek events per seconds when keeping a seek key held down). It will also allow disabling key repears for certain commands, though this is not done anywhere yet. The new behavior can be disabled with the --native-keyrepeat option. --- core/options.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 0f57381f30..35d0329b7a 100644 --- a/core/options.h +++ b/core/options.h @@ -17,6 +17,7 @@ typedef struct mp_vo_opts { int stop_screensaver; char *winname; char** fstype_list; + int native_keyrepeat; float panscan; float panscanrange; -- cgit v1.2.3 From 3765cfcf57e0232b5e96e77d9dd628755f1c0518 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 25 Apr 2013 20:38:22 +0200 Subject: core: simplify handling of --pause Rename the struct MPOpts "start_pause" field to "pause". Store the user- pause state in that field, so that both runtime pause toggling and the --pause switch change the same variable. Simplify the initialization of pause so that using --pause and changing the file while paused is exactly the same case (changing the file while paused doesn't unpause, this has been always this way). Also make it a bit more consistent. Before, starting with --pause would reset the pause state for every file, instead of following the usual semantics for option switches (compare with behavior of --fs). --- core/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 35d0329b7a..8806a66211 100644 --- a/core/options.h +++ b/core/options.h @@ -125,7 +125,7 @@ typedef struct MPOpts { int play_frames; double step_sec; int64_t seek_to_byte; - int start_paused; + int pause; int keep_open; int audio_id; int video_id; -- cgit v1.2.3