From a5916f5d1df7ad9c3e9d2644f930a3e62c4c0d3c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Apr 2013 14:36:26 +0200
Subject: core: remove dead --vsync leftovers

---
 core/command.c | 9 ---------
 core/mplayer.c | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'core')

diff --git a/core/command.c b/core/command.c
index 6a1c868ee1..8f6dfeb4ca 100644
--- a/core/command.c
+++ b/core/command.c
@@ -1089,13 +1089,6 @@ static int mp_property_gamma(m_option_t *prop, int action, void *arg,
     return M_PROPERTY_UNAVAILABLE;
 }
 
-/// VSync (RW)
-static int mp_property_vsync(m_option_t *prop, int action, void *arg,
-                             MPContext *mpctx)
-{
-    return mp_property_generic_option(prop, action, arg, mpctx);
-}
-
 /// Video codec tag (RO)
 static int mp_property_video_format(m_option_t *prop, int action,
                                     void *arg, MPContext *mpctx)
@@ -1420,7 +1413,6 @@ static const m_option_t mp_properties[] = {
     M_OPTION_PROPERTY_CUSTOM_("hue", mp_property_gamma,
                     .offset = offsetof(struct MPOpts, gamma_hue)),
     M_OPTION_PROPERTY_CUSTOM("panscan", mp_property_panscan),
-    M_OPTION_PROPERTY_CUSTOM_("vsync", mp_property_vsync),
     { "video-format", mp_property_video_format, CONF_TYPE_STRING,
       0, 0, 0, NULL },
     { "video-codec", mp_property_video_codec, CONF_TYPE_STRING,
@@ -1535,7 +1527,6 @@ static struct property_osd_display {
     { "contrast", _("Contrast"), .osd_progbar = OSD_CONTRAST },
     { "saturation", _("Saturation"), .osd_progbar = OSD_SATURATION },
     { "hue", _("Hue"), .osd_progbar = OSD_HUE },
-    { "vsync", _("VSync") },
     { "angle", _("Angle") },
     // subs
     { "sub", _("Subtitles") },
diff --git a/core/mplayer.c b/core/mplayer.c
index 7bb871fcb5..78c3cae3c5 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -175,8 +175,7 @@ static const char av_desync_help_text[] = _(
 "- Slow video output.\n"
 "     Try a different -vo driver (-vo help for a list) or try -framedrop!\n"
 "- Playing a video file with --vo=opengl with higher FPS than the monitor.\n"
-"     This is due to vsync limiting the framerate. Try --no-vsync, or a\n"
-"     different VO.\n"
+"     This is due to vsync limiting the framerate.\n"
 "- Playing from a slow network source.\n"
 "     Download the file instead.\n"
 "- Try to find out whether audio or video is causing this by experimenting\n"
-- 
cgit v1.2.3