0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
mpv/core
wm4 62daa08d3b mplayer: keep volume persistent, even when using --volume
Consider:

    mpv --volume 10 file1.mkv file2.mkv

Before this commit, the volume was reset to 10 when playing file2.mkv.
This was inconsistent to most other options. E.g. --brightness is a
rather similar case.

In general, settings should never be reset when playing the next file,
unless the option was explicitly marked file-local. This commit
corrects the behavior of the --volume and --mute options.

File local --volume still works as expected:

    mpv --{ --volume 10 file1.mkv file2.mkv --}

This sets the volume always to 10 on playback start.

Move the m_config_leave_file_local() call down so that the mixer code
in uninit_player() can set the option volume and mute variables without
overwriting the global option values.

Another subtle issue is that we don't want to set volume if there's no
need to, which is why the user_set_volume/mute fields are introduced.
This is important because setting the volume might change the system
volume depending on other options.
2013-04-10 21:29:04 +02:00
..
input Remove some apple remote leftovers 2013-04-05 23:59:39 +02:00
timeline cache: refactor how cache enabling is done 2012-12-03 21:08:51 +01:00
asxparser.c Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
asxparser.h
av_common.c av_common: minor simplification 2013-04-04 14:11:07 +02:00
av_common.h demux_lavf, ad_lavc, vd_lavc: pass codec header data directly 2013-02-10 17:25:57 +01:00
av_log.c demux_lavf: add support for libavdevice 2012-12-03 21:08:51 +01:00
av_log.h
av_opts.c
av_opts.h
bstr.c Replace strsep() uses 2013-01-13 17:32:39 +01:00
bstr.h Replace strsep() uses 2013-01-13 17:32:39 +01:00
cfg-mplayer.h core: remove volstep global variable 2013-04-09 02:41:46 +02:00
codecs.c core: redo how codecs are mapped, remove codecs.conf 2013-02-10 17:25:56 +01:00
codecs.h core: redo how codecs are mapped, remove codecs.conf 2013-02-10 17:25:56 +01:00
command.c command: fix loadlist command 2013-04-10 17:16:49 +02:00
command.h command: give feedback on the OSD if a property is unavailable 2013-02-16 21:41:24 +01:00
cpudetect.c Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
cpudetect.h Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
defaultopts.c core: remove volstep global variable 2013-04-09 02:41:46 +02:00
defaultopts.h
encode_lavc.c Remove vo_fps global variable 2013-03-04 22:21:57 +01:00
encode_lavc.h Remove vo_fps global variable 2013-03-04 22:21:57 +01:00
encode.h Remove vo_fps global variable 2013-03-04 22:21:57 +01:00
m_config.c options: drop --opt:subopt option names 2013-02-23 00:07:11 +01:00
m_config.h options: drop --opt:subopt option names 2013-02-23 00:07:11 +01:00
m_option.c m_option: pretty-print floats with 3 pre-decimal digits instead of 2 2013-03-26 01:29:54 +01:00
m_option.h vo_opengl: split into multiple files, convert to new option API 2013-03-28 21:46:17 +01:00
m_property.c input: make input command deprecation warnings visible 2013-03-26 01:29:38 +01:00
m_property.h
m_struct.c Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
m_struct.h Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
mp_common.c cleanup: remove duplicated function, move escape parsing function 2013-02-16 23:24:46 +01:00
mp_common.h cleanup: remove duplicated function, move escape parsing function 2013-02-16 23:24:46 +01:00
mp_core.h core: add --heartbeat-interval option 2013-04-04 14:24:42 +02:00
mp_fifo.c Prefix keycode defines with MP_ 2013-02-12 10:27:00 +01:00
mp_fifo.h Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
mp_msg.c mp_msg: don't change text color for normal output 2013-03-26 01:17:38 +01:00
mp_msg.h Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
mp_osd.h osd: always update already visible OSD bar on seeks 2013-02-16 20:50:05 +01:00
mp_talloc.h video/filter: change filter API, use refcounting, remove filter DR 2013-01-13 20:04:10 +01:00
mplayer.c mplayer: keep volume persistent, even when using --volume 2013-04-10 21:29:04 +02:00
mplayer.h core: remove a number of global variables 2013-03-08 02:12:53 +01:00
options.h core: remove volstep global variable 2013-04-09 02:41:46 +02:00
parser-cfg.c parser-cfg: fix profile-desc 2013-02-18 17:01:25 +01:00
parser-cfg.h
parser-mpcmd.c options: fix --no-shuffle and --no-{ 2013-02-23 00:07:11 +01:00
parser-mpcmd.h
path.c path: add mp_find_config_file and reorganize some of the code 2012-12-15 17:38:00 +01:00
path.h path: add mp_find_config_file and reorganize some of the code 2012-12-15 17:38:00 +01:00
playlist_parser.c options: rename -ss and -endpos, allow relative times 2012-11-16 21:21:15 +01:00
playlist_parser.h
playlist.c Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
playlist.h Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
quvi.c Fix lots of bugs in mp_http URL handling 2013-01-10 14:11:26 +01:00
screenshot.c screenshot: show a message on each screenshot taken 2013-02-26 01:55:52 +01:00
screenshot.h screenshot: show a message on each screenshot taken 2013-02-26 01:55:52 +01:00
subopt-helper.c Rename directories, move files (step 2 of 2) 2012-11-12 20:08:18 +01:00
subopt-helper.h
version.c build: identify the build time of the binary in the versioning output 2012-12-03 21:08:51 +01:00