Mercurial > mplayer.hg

changeset 33244:cee07c3dbff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Mon, 25 Apr 2011 14:25:15 +0000
parents c33f32258d33
children a8b2e3a6c79b
files 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 help/help_mp-ru.h help/help_mp-tr.h help/help_mp-uk.h help/help_mp-zh_CN.h help/help_mp-zh_TW.h
diffstat 15 files changed, 0 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Mon Apr 25 12:38:55 2011 +0000
+++ b/gui/interface.c	Mon Apr 25 14:25:15 2011 +0000
@@ -536,46 +536,6 @@
     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 @@
         }
 
 #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 @@
 
         if (gtkVfPP)
             add_vf("pp");
-        else
-            remove_vf("pp");
 
         // audio opts
 
--- a/help/help_mp-bg.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-bg.h	Mon Apr 25 14:25:15 2011 +0000
@@ -805,7 +805,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Изтриване на субтитрите.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Зареждане на субтитрите: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Добавяне на видео филтър: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Премахване на видео филтър: %s\n"
 
 // mw.c
 
--- a/help/help_mp-cs.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-cs.h	Mon Apr 25 14:25:15 2011 +0000
@@ -779,7 +779,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Mažu titulky.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Načítám titulky: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Přidávám video filtr: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Odstraňuji video filtr: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Toto nevypadá jako soubor: %s !\n"
--- a/help/help_mp-de.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-de.h	Mon Apr 25 14:25:15 2011 +0000
@@ -997,7 +997,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Lösche Untertitel.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Lade Untertitel: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Füge Videofilter %s hinzu.\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Entferne Videofilter: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Dies scheint keine Datei zu sein: %s !\n"
--- a/help/help_mp-en.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-en.h	Mon Apr 25 14:25:15 2011 +0000
@@ -799,7 +799,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Deleting subtitles.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Loading subtitles: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Adding video filter: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Removing video filter: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "This does not seem to be a file: %s !\n"
--- a/help/help_mp-es.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-es.h	Mon Apr 25 14:25:15 2011 +0000
@@ -795,7 +795,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Borrando subtítulos.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Carganado subtítulos: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Agregando filtro de video: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Eliminando filtro de video: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Esto no parece ser un archivo: %s !\n"
--- a/help/help_mp-fr.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-fr.h	Mon Apr 25 14:25:15 2011 +0000
@@ -960,7 +960,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Suppression des sous-titres.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Chargement des soustitres : %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Ajout de filtre vidéo : %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Enlèvement de filtre video : %s\n"
 
 // mw.c
 
--- a/help/help_mp-hu.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-hu.h	Mon Apr 25 14:25:15 2011 +0000
@@ -792,7 +792,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Feliratok törlése.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Feliratok betöltése: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Videó szűrő hozzáadása: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Videó szűrő eltávolítása: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Úgy tűnik, hogy ez nem fájl: %s !\n"
--- a/help/help_mp-it.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-it.h	Mon Apr 25 14:25:15 2011 +0000
@@ -786,7 +786,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Elimino sottotitoli.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Carico sottotitoli: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Aggiungo filtro video: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Rimuovo filtro video: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Questo non pare essere un file: %s !\n"
--- a/help/help_mp-pl.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-pl.h	Mon Apr 25 14:25:15 2011 +0000
@@ -931,7 +931,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Usuwam napisy.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Wczytuję napisy: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Dodaję filtr video: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Usuwam filtr video: %s\n"
 
 // mw.c
 
--- a/help/help_mp-ru.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-ru.h	Mon Apr 25 14:25:15 2011 +0000
@@ -781,7 +781,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Удаляю субтитры.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Загружаю субтитры: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Добавляю видеофильтр: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Удаляю видеофильтр: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Это не похоже на файл: '%s' !\n"
--- a/help/help_mp-tr.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-tr.h	Mon Apr 25 14:25:15 2011 +0000
@@ -974,7 +974,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Altyazılar siliniyor.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Altyazılar yükleniyor: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Video filtresi ekleniyor: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Video filtresi kaldırılıyor: %s\n"
 
 // mw.c
 
--- a/help/help_mp-uk.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-uk.h	Mon Apr 25 14:25:15 2011 +0000
@@ -774,7 +774,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] Видаляю субтитри.\n"
 #define MSGTR_LoadingSubtitles "[GUI] Вантажу субтитри: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] Додаю відео фільтр: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] Видаляю відео фільтр: %s\n"
 
 // mw.c
 #define MSGTR_NotAFile "Здається, це не файл: %s !\n"
--- a/help/help_mp-zh_CN.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-zh_CN.h	Mon Apr 25 14:25:15 2011 +0000
@@ -782,7 +782,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] 删除字幕。\n"
 #define MSGTR_LoadingSubtitles "[GUI] 加载字幕：%s\n"
 #define MSGTR_AddingVideoFilter "[GUI] 添加视频滤镜：%s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] 删除视频滤锐：%s\n"
 
 // mw.c
 #define MSGTR_NotAFile "这好像不是文件：%s！\n"
--- a/help/help_mp-zh_TW.h	Mon Apr 25 12:38:55 2011 +0000
+++ b/help/help_mp-zh_TW.h	Mon Apr 25 14:25:15 2011 +0000
@@ -946,7 +946,6 @@
 #define MSGTR_DeletingSubtitles "[GUI] 删除字幕。\n"
 #define MSGTR_LoadingSubtitles "[GUI] 導入字幕: %s\n"
 #define MSGTR_AddingVideoFilter "[GUI] 添加視頻過濾器: %s\n"
-#define MSGTR_RemovingVideoFilter "[GUI] 删除視頻過濾器: %s\n"
 
 // mw.c