summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-22 20:42:05 +0200
committerwm4 <wm4@nowhere>2016-09-22 20:57:06 +0200
commit01e95468f96ac14fead2ffe2d53ed11acfbe8a39 (patch)
tree3de189dca2ed9ee1bb001ad91572ef6c289ea039
parentefbfc00741d36e9de8b724e615c5b723bcf28f20 (diff)
downloadmpv-01e95468f96ac14fead2ffe2d53ed11acfbe8a39.tar.bz2
mpv-01e95468f96ac14fead2ffe2d53ed11acfbe8a39.tar.xz
player: remove some explicit options accesses when saving resume file
Basically, make use of all the new code. Unfortunately, the new code and it's "compromise semantics" with the old behavior before the options/properties merge bites back: this vid/aid/sid, deinterlace, and video-aspect properties have neutral default settings (such as "auto"), but return the current value during playback, so we would unnecessarily force this value when playback is resumed. So leave those as they are. Also, the colormatrix options were removed a long time ago.
-rw-r--r--player/configfiles.c55
1 files changed, 26 insertions, 29 deletions
diff --git a/player/configfiles.c b/player/configfiles.c
index 3ab0d368bc..2ade83db86 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -214,44 +214,41 @@ exit:
}
static const char *const backup_properties[] = {
- "options/osd-level",
+ "osd-level",
//"loop",
- "options/speed",
+ "speed",
"options/edition",
- "options/pause",
+ "pause",
"volume",
"mute",
- "options/audio-delay",
+ "audio-delay",
//"balance",
- "options/fullscreen",
- "options/colormatrix",
- "options/colormatrix-input-range",
- "options/colormatrix-output-range",
- "options/ontop",
- "options/border",
- "options/gamma",
- "options/brightness",
- "options/contrast",
- "options/saturation",
- "options/hue",
+ "fullscreen",
+ "ontop",
+ "border",
+ "gamma",
+ "brightness",
+ "contrast",
+ "saturation",
+ "hue",
"options/deinterlace",
- "options/vf",
- "options/af",
- "options/panscan",
+ "vf",
+ "af",
+ "panscan",
"options/aid",
"options/vid",
"options/sid",
- "options/sub-delay",
- "options/sub-speed",
- "options/sub-pos",
- "options/sub-visibility",
- "options/sub-scale",
- "options/sub-use-margins",
- "options/ass-force-margins",
- "options/ass-vsfilter-aspect-compat",
- "options/ass-style-override",
- "options/ab-loop-a",
- "options/ab-loop-b",
+ "sub-delay",
+ "sub-speed",
+ "sub-pos",
+ "sub-visibility",
+ "sub-scale",
+ "sub-use-margins",
+ "ass-force-margins",
+ "ass-vsfilter-aspect-compat",
+ "ass-style-override",
+ "ab-loop-a",
+ "ab-loop-b",
"options/video-aspect",
0
};