[MPlayer-cvslog] r33331 - in trunk: gui/interface.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h ...

[ib]

Author: ib
Date: Mon Apr 25 16:25:15 2011
New Revision: 33331

Log:
Do not remove video filters.

If a video filter option isn't set, it does not mean to remove the
filter, but such option (if set) should only cause adding the filter
(if not already present). That way filters can be specified in MPlayer's
config or on the command line, too.

This closes Bugzilla #1442.

Modified:
   trunk/gui/interface.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-bg.h
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-de.h
   trunk/help/help_mp-en.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-pl.h
   trunk/help/help_mp-ru.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-uk.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Apr 25 14:38:55 2011	(r33330)
+++ trunk/gui/interface.c	Mon Apr 25 16:25:15 2011	(r33331)
@@ -536,46 +536,6 @@ static void add_vf(char *str)
     mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_AddingVideoFilter, str);
 }
 
-static void remove_vf(char *str)
-{
-    int n = 0;
-
-    if (!vf_settings)
-        return;
-
-    mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_RemovingVideoFilter, str);
-
-    while (vf_settings[n++].name) ;
-
-    n--;
-
-    if (n > -1) {
-        int i = 0, m = -1;
-
-        while (vf_settings[i].name) {
-            if (!gstrcmp(vf_settings[i++].name, str)) {
-                m = i - 1;
-                break;
-            }
-        }
-
-        i--;
-
-        if (m > -1) {
-            if (n == 1) {
-                free(vf_settings[0].name);
-                free(vf_settings[0].attribs);
-                free(vf_settings);
-                vf_settings = NULL;
-            } else {
-                free(vf_settings[i].name);
-                free(vf_settings[i].attribs);
-                memcpy(&vf_settings[i], &vf_settings[i + 1], (n - i) * sizeof(m_obj_settings_t));
-            }
-        }
-    }
-}
-
 int guiGetEvent(int type, void *arg)
 {
     const ao_functions_t *audio_out = NULL;
@@ -911,8 +871,6 @@ int guiGetEvent(int type, void *arg)
         }
 
 #ifdef CONFIG_DXR3
-        remove_vf("lavc");
-
         if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3"))
             if (guiIntfStruct.StreamType != STREAMTYPE_DVD && guiIntfStruct.StreamType != STREAMTYPE_VCD)
                 if (gtkVfLAVC)
@@ -921,8 +879,6 @@ int guiGetEvent(int type, void *arg)
 
         if (gtkVfPP)
             add_vf("pp");
-        else
-            remove_vf("pp");
 
         // audio opts