diff options
| -rw-r--r-- | config.c | 10 | ||||
| -rw-r--r-- | config.h | 8 | ||||
| -rw-r--r-- | device.c | 9 | ||||
| -rw-r--r-- | device.h | 4 | ||||
| -rw-r--r-- | frontend.h | 5 | ||||
| -rw-r--r-- | frontend_local.c | 8 | ||||
| -rw-r--r-- | frontend_local.h | 4 | ||||
| -rw-r--r-- | menu.c | 6 | ||||
| -rw-r--r-- | po/cs_CZ.po | 20 | ||||
| -rw-r--r-- | po/de_DE.po | 20 | ||||
| -rw-r--r-- | po/et_EE.po | 20 | ||||
| -rw-r--r-- | po/fi_FI.po | 20 | ||||
| -rw-r--r-- | po/it_IT.po | 20 | ||||
| -rw-r--r-- | po/ru_RU.po | 20 | ||||
| -rw-r--r-- | po/uk_UA.po | 20 | ||||
| -rw-r--r-- | po/zh_CN.po | 20 | ||||
| -rw-r--r-- | po/zh_TW.po | 20 | ||||
| -rw-r--r-- | setup_menu.c | 15 | ||||
| -rw-r--r-- | xine_fbfe_frontend.c | 8 | ||||
| -rw-r--r-- | xine_frontend.c | 6 | ||||
| -rw-r--r-- | xine_frontend.h | 7 | ||||
| -rw-r--r-- | xine_frontend_internal.h | 3 | ||||
| -rw-r--r-- | xine_frontend_main.c | 4 | ||||
| -rw-r--r-- | xine_sxfe_frontend.c | 11 | ||||
| -rw-r--r-- | xineliboutput.c | 10 |
25 files changed, 127 insertions, 171 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.110 2012-01-30 10:41:56 phintuka Exp $ + * $Id: config.c,v 1.111 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -93,12 +93,6 @@ const char * const config_t::s_deinterlaceMethodNames[ DEINTERLACE_count+1 ] = { NULL }; -const char * const config_t::s_fieldOrder[ FIELD_ORDER_count+1 ] = { - trNOOP("normal"), - trNOOP("inverted"), - NULL -}; - const char * const config_t::s_audioDrivers[ AUDIO_DRIVER_count+1 ] = { "auto", "alsa", "oss", "none", "esd", "jack", NULL @@ -632,7 +626,6 @@ config_t::config_t() { width = 720; height = 576; scale_video = 0; - field_order = 0; autocrop = 0; autocrop_autodetect = 1; @@ -968,7 +961,6 @@ bool config_t::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "Video.Scale")) scale_video = atoi(Value); else if (!strcasecmp(Name, "Video.DeinterlaceOptions")) STRN0CPY(deinterlace_opts, Value); else if (!strcasecmp(Name, "Video.Deinterlace")) STRN0CPY(deinterlace_method, Value); - else if (!strcasecmp(Name, "Video.FieldOrder")) field_order=atoi(Value)?1:0; else if (!strcasecmp(Name, "Video.AutoCrop")) autocrop = atoi(Value); else if (!strcasecmp(Name, "Video.AutoCrop.AutoDetect")) autocrop_autodetect = atoi(Value); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.83 2012-01-19 08:18:26 phintuka Exp $ + * $Id: config.h,v 1.84 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -59,10 +59,6 @@ #define DEINTERLACE_TVTIME 7 #define DEINTERLACE_count 8 -#define FIELD_ORDER_NORMAL 0 -#define FIELD_ORDER_INVERTED 1 -#define FIELD_ORDER_count 2 - // Audio driver #define AUDIO_DRIVER_AUTO 0 #define AUDIO_DRIVER_ALSA 1 @@ -235,7 +231,6 @@ class config_t { static const char * const s_vo_aspects [VO_ASPECT_count + 1]; static const char * const s_deinterlaceMethods [DEINTERLACE_count + 1]; static const char * const s_deinterlaceMethodNames [DEINTERLACE_count + 1]; - static const char * const s_fieldOrder [FIELD_ORDER_count + 1]; static const char * const s_audioDriverNames [AUDIO_DRIVER_count + 1]; static const char * const s_audioDrivers [AUDIO_DRIVER_count + 1]; static const char * const s_videoDriverNamesX11 [X11_DRIVER_count + 1]; @@ -286,7 +281,6 @@ class config_t { int ypos; int display_aspect; int scale_video; - int field_order; int exit_on_close; // Terminate VDR when local frontend is closed int use_x_keyboard; // Use X11 keyboard to control VDR (console kbd is handled by VDR) int window_id; // use existing X11 window @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.c,v 1.118 2012-03-10 20:54:06 rofafor Exp $ + * $Id: device.c,v 1.119 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -483,8 +483,7 @@ void cXinelibDevice::ConfigureDecoder(int pes_buffers) void cXinelibDevice::ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, - int aspect, int scale_video, - int field_order) + int aspect, int scale_video) { TRACEF("cXinelibDevice::ConfigureWindow"); @@ -500,7 +499,7 @@ void cXinelibDevice::ConfigureWindow(int fullscreen, int width, int height, if(m_local) m_local->ConfigureWindow(fullscreen, width, height, modeswitch, modeline, - aspect, scale_video, field_order); + aspect, scale_video); else if(*xc.local_frontend && strncmp(xc.local_frontend, "none", 4)) { cXinelibThread *tmp = new cXinelibLocal(xc.local_frontend); @@ -520,7 +519,7 @@ void cXinelibDevice::ConfigureWindow(int fullscreen, int width, int height, ForcePrimaryDevice(true); m_local->ConfigureWindow(fullscreen, width, height, modeswitch, modeline, - aspect, scale_video, field_order); + aspect, scale_video); } } } @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.h,v 1.61 2011-03-20 21:36:31 phintuka Exp $ + * $Id: device.h,v 1.62 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -200,7 +200,7 @@ class cXinelibDevice : public cDevice // local mode: void ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, - int aspect, int scale_video, int field_order); + int aspect, int scale_video); void ConfigureDecoder(int pes_buffers); // remote mode: void Listen(bool activate, int port); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend.h,v 1.41 2011-03-20 20:59:25 phintuka Exp $ + * $Id: frontend.h,v 1.42 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -127,8 +127,7 @@ class cXinelibThread : public cThread, public cListObject // Local frontend: virtual void ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, - int aspect, int scale_video, - int field_order) {}; + int aspect, int scale_video) {}; virtual void ConfigureDecoder(int pes_buffers) {}; // Remote frontend server: virtual bool Listen(int port) { return false; } diff --git a/frontend_local.c b/frontend_local.c index 99b19d19..ed7f05f6 100644 --- a/frontend_local.c +++ b/frontend_local.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.c,v 1.55 2011-03-20 20:59:25 phintuka Exp $ + * $Id: frontend_local.c,v 1.56 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -189,14 +189,13 @@ bool cXinelibLocal::EndOfStreamReached(void) void cXinelibLocal::ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, - int aspect, int scale_video, - int field_order) + int aspect, int scale_video) { LOCK_FE; if(fe) fe->fe_display_config(fe, -1, -1, width, height, fullscreen, modeswitch, modeline, - aspect, scale_video, field_order); + aspect, scale_video); } void cXinelibLocal::ConfigureDecoder(int pes_buffers) @@ -350,7 +349,6 @@ void cXinelibLocal::Action(void) keypress_handler, 0/*no_x_kbd*/, 0/*gui_hotkeys*/, xc.video_port, xc.scale_video, - xc.field_order, NULL, xc.window_id)) { LOGMSG("cXinelibLocal: Error initializing display"); diff --git a/frontend_local.h b/frontend_local.h index 863d3f0e..4a942a95 100644 --- a/frontend_local.h +++ b/frontend_local.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_local.h,v 1.9 2011-03-20 20:59:25 phintuka Exp $ + * $Id: frontend_local.h,v 1.10 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -46,7 +46,7 @@ class cXinelibLocal : public cXinelibThread // Configuration virtual void ConfigureWindow(int fullscreen, int width, int height, int modeswitch, const char *modeline, - int aspect, int scale_video, int field_order); + int aspect, int scale_video); virtual void ConfigureDecoder(int pes_buffers); virtual int SupportsTrueColorOSD(void); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: menu.c,v 1.90 2012-01-16 11:57:53 phintuka Exp $ + * $Id: menu.c,v 1.91 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -781,7 +781,7 @@ eOSState cMenuXinelib::ProcessHotkey(eKeys Key) strn0cpy(xc.local_frontend, xc.s_frontends[local_frontend], sizeof(xc.local_frontend)); cXinelibDevice::Instance().ConfigureWindow( xc.fullscreen, xc.width, xc.height, xc.modeswitch, xc.modeline, - xc.display_aspect, xc.scale_video, xc.field_order); + xc.display_aspect, xc.scale_video); } Message = cString::sprintf("%s %s %s", tr("Local Frontend"), OnlyInfo ? ":" : "->", @@ -795,7 +795,7 @@ eOSState cMenuXinelib::ProcessHotkey(eKeys Key) xc.display_aspect = (xc.display_aspect < ASPECT_count-1) ? xc.display_aspect+1 : 0; cXinelibDevice::Instance().ConfigureWindow(xc.fullscreen, xc.width, xc.height, xc.modeswitch, xc.modeline, xc.display_aspect, - xc.scale_video, xc.field_order); + xc.scale_video); } Message = cString::sprintf("%s %s %s", tr("Aspect ratio"), OnlyInfo ? ":" : "->", diff --git a/po/cs_CZ.po b/po/cs_CZ.po index c2a9f31b..7df54fe2 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2008-03-20 23:57+0100\n" "Last-Translator: Maya <maja373@gmail.com>\n" "Language-Team: Czech <vdr@linuxtv.org>\n" @@ -59,12 +59,6 @@ msgstr "DVB" msgid "off" msgstr "vypnuto" -msgid "normal" -msgstr "normální" - -msgid "inverted" -msgstr "inverzní" - msgid "no audio" msgstr "bez zvuku" @@ -618,9 +612,6 @@ msgstr "Poměr stran okna" msgid "Scale to window size" msgstr "Škálovat do velikosti okna" -msgid "Interlaced Field Order" -msgstr "Pořadí půlsnímků" - msgid "Port" msgstr "Port" @@ -735,6 +726,15 @@ msgstr "Zkušební obrazce" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib výstupní plugin" +#~ msgid "normal" +#~ msgstr "normální" + +#~ msgid "inverted" +#~ msgstr "inverzní" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Pořadí půlsnímků" + #~ msgid "Button$Sort" #~ msgstr "Třídění" diff --git a/po/de_DE.po b/po/de_DE.po index 781709de..467a4f55 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2007-11-23 10:17+0200\n" "Last-Translator: Udo Richter\n" "Language-Team: German <vdr@linuxtv.org>\n" @@ -58,12 +58,6 @@ msgstr "" msgid "off" msgstr "Aus" -msgid "normal" -msgstr "Normal" - -msgid "inverted" -msgstr "Invertiert" - msgid "no audio" msgstr "Kein Audio" @@ -617,9 +611,6 @@ msgstr "Fenster-Seitenverhältnis" msgid "Scale to window size" msgstr "Skaliere auf Fenster-Größe" -msgid "Interlaced Field Order" -msgstr "Interlaced Halbbild-Reihenfolge" - msgid "Port" msgstr "Port" @@ -734,6 +725,15 @@ msgstr "Testbilder" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib Ausgabe-Plugin" +#~ msgid "normal" +#~ msgstr "Normal" + +#~ msgid "inverted" +#~ msgstr "Invertiert" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Interlaced Halbbild-Reihenfolge" + #~ msgid "Button$Sort" #~ msgstr "Sortiere" diff --git a/po/et_EE.po b/po/et_EE.po index 017ad55c..27f2f20a 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2008-10-06 11:19+0200\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: Estonian <vdr@linuxtv.org>\n" @@ -58,12 +58,6 @@ msgstr "DVB" msgid "off" msgstr "väljas" -msgid "normal" -msgstr "normaalne" - -msgid "inverted" -msgstr "pööratud" - msgid "no audio" msgstr "helita" @@ -617,9 +611,6 @@ msgstr "Akna külgsuhe" msgid "Scale to window size" msgstr "Akna skaleeritud suurus" -msgid "Interlaced Field Order" -msgstr "Ridade järjestus" - msgid "Port" msgstr "Port" @@ -734,6 +725,15 @@ msgstr "Testipildid" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib kuvar" +#~ msgid "normal" +#~ msgstr "normaalne" + +#~ msgid "inverted" +#~ msgstr "pööratud" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Ridade järjestus" + #~ msgid "Button$Sort" #~ msgstr "Sorteerimine" diff --git a/po/fi_FI.po b/po/fi_FI.po index 3be1afe1..05eda75a 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2008-10-06 11:19+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -59,12 +59,6 @@ msgstr "DVB" msgid "off" msgstr "ei käytössä" -msgid "normal" -msgstr "normaali" - -msgid "inverted" -msgstr "käänteinen" - msgid "no audio" msgstr "ei ääntä" @@ -618,9 +612,6 @@ msgstr "Ikkunan kuvasuhde" msgid "Scale to window size" msgstr "Skaalaa ikkunan kokoiseksi" -msgid "Interlaced Field Order" -msgstr "Lomitettujen kenttien järjestys" - msgid "Port" msgstr "Portti" @@ -735,6 +726,15 @@ msgstr "Testikuvat" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib näyttölaite" +#~ msgid "normal" +#~ msgstr "normaali" + +#~ msgid "inverted" +#~ msgstr "käänteinen" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Lomitettujen kenttien järjestys" + #~ msgid "Button$Sort" #~ msgstr "Järjestä" diff --git a/po/it_IT.po b/po/it_IT.po index 1d328bb2..13c8bd9b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2011-07-10 02:27+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr@linuxtv.org>\n" @@ -60,12 +60,6 @@ msgstr "DVB" msgid "off" msgstr "spento" -msgid "normal" -msgstr "normale" - -msgid "inverted" -msgstr "invertito" - msgid "no audio" msgstr "niente audio" @@ -619,9 +613,6 @@ msgstr "Aspetto finestra" msgid "Scale to window size" msgstr "Scala a dimensione finestra" -msgid "Interlaced Field Order" -msgstr "Ordine campo interlacciato" - msgid "Port" msgstr "Porta" @@ -736,6 +727,15 @@ msgstr "Prova immagini" msgid "X11/xine-lib output plugin" msgstr "Plugin uscita X11/xine-lib" +#~ msgid "normal" +#~ msgstr "normale" + +#~ msgid "inverted" +#~ msgstr "invertito" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Ordine campo interlacciato" + #~ msgid "Button$Sort" #~ msgstr "Ordina" diff --git a/po/ru_RU.po b/po/ru_RU.po index a2418616..410ff491 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2007-11-23 10:17+0200\n" "Last-Translator: Vladimir Monchenko\n" "Language-Team: Russian <vdr@linuxtv.org>\n" @@ -58,12 +58,6 @@ msgstr "" msgid "off" msgstr "Выкл." -msgid "normal" -msgstr "Нормальный" - -msgid "inverted" -msgstr "Инвертировано" - msgid "no audio" msgstr "Нет аудио" @@ -617,9 +611,6 @@ msgstr "Соотношение сторон" msgid "Scale to window size" msgstr "Масштабировать в размер окна" -msgid "Interlaced Field Order" -msgstr "Черезстрочный порядок полей" - msgid "Port" msgstr "Порт" @@ -734,6 +725,15 @@ msgstr "Тестовые изображения" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib видео модуль" +#~ msgid "normal" +#~ msgstr "Нормальный" + +#~ msgid "inverted" +#~ msgstr "Инвертировано" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Черезстрочный порядок полей" + #~ msgid "Play file >>" #~ msgstr "Проиграть файл >>" diff --git a/po/uk_UA.po b/po/uk_UA.po index 32a70935..e4163b6c 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2010-05-05 19:16+0200\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n" @@ -61,12 +61,6 @@ msgstr "DVB" msgid "off" msgstr "викл" -msgid "normal" -msgstr "нормально" - -msgid "inverted" -msgstr "обернено" - msgid "no audio" msgstr "немає аудіо" @@ -620,9 +614,6 @@ msgstr "Пропорція вікна" msgid "Scale to window size" msgstr "Масштабувати до розміру вікна" -msgid "Interlaced Field Order" -msgstr "Порядок поля згладження" - msgid "Port" msgstr "Порт" @@ -737,5 +728,14 @@ msgstr "Тестові зображення" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib output плагін" +#~ msgid "normal" +#~ msgstr "нормально" + +#~ msgid "inverted" +#~ msgstr "обернено" + +#~ msgid "Interlaced Field Order" +#~ msgstr "Порядок поля згладження" + #~ msgid "Button$Sort" #~ msgstr "Сортувати" diff --git a/po/zh_CN.po b/po/zh_CN.po index b2179c4d..6fb64202 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2009-09-21 23:32+0800\n" "Last-Translator: NanFeng <nfgx@21cn.com>\n" "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n" @@ -58,12 +58,6 @@ msgstr "DVB" msgid "off" msgstr "关" -msgid "normal" -msgstr "正常" - -msgid "inverted" -msgstr "反转" - msgid "no audio" msgstr "没有音频" @@ -617,9 +611,6 @@ msgstr "窗口缩放" msgid "Scale to window size" msgstr "缩放到窗口大小" -msgid "Interlaced Field Order" -msgstr "隔行场令" - msgid "Port" msgstr "端口" @@ -734,6 +725,15 @@ msgstr "测试图像" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib 视频输出插件 by NFVDR-HD" +#~ msgid "normal" +#~ msgstr "正常" + +#~ msgid "inverted" +#~ msgstr "反转" + +#~ msgid "Interlaced Field Order" +#~ msgstr "隔行场令" + #~ msgid "Button$Sort" #~ msgstr "按钮$排序" diff --git a/po/zh_TW.po b/po/zh_TW.po index 950515c1..da8f998b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Xineliboutput 1.1.0\n" "Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n" -"POT-Creation-Date: 2012-01-16 13:42+0200\n" +"POT-Creation-Date: 2012-03-13 13:13+0200\n" "PO-Revision-Date: 2009-09-21 23:32+0800\n" "Last-Translator: NanFeng <nfgx@21cn.com>\n" "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n" @@ -58,12 +58,6 @@ msgstr "DVB" msgid "off" msgstr "關" -msgid "normal" -msgstr "正常" - -msgid "inverted" -msgstr "反轉" - msgid "no audio" msgstr "沒有音頻" @@ -648,9 +642,6 @@ msgstr "窗口縮放" msgid "Scale to window size" msgstr "縮放到窗口大小" -msgid "Interlaced Field Order" -msgstr "隔行場令" - msgid "Port" msgstr "端口" @@ -779,6 +770,15 @@ msgstr "測試圖像" msgid "X11/xine-lib output plugin" msgstr "X11/xine-lib視頻輸出插件by NFVDR-HD" +#~ msgid "normal" +#~ msgstr "正常" + +#~ msgid "inverted" +#~ msgstr "反轉" + +#~ msgid "Interlaced Field Order" +#~ msgstr "隔行場令" + #~ msgid "Button$Sort" #~ msgstr "按鈕$排序" diff --git a/setup_menu.c b/setup_menu.c index 60ccc51d..b5c6d4f6 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.84 2012-01-16 11:57:53 phintuka Exp $ + * $Id: setup_menu.c,v 1.85 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -1301,7 +1301,7 @@ cMenuSetupLocal::~cMenuSetupLocal(void) { cXinelibDevice::Instance().ConfigureWindow( xc.fullscreen, xc.width, xc.height, xc.modeswitch, xc.modeline, - xc.display_aspect, xc.scale_video, xc.field_order); + xc.display_aspect, xc.scale_video); cXinelibDevice::Instance().ConfigurePostprocessing( xc.deinterlace_method, xc.audio_delay, xc.audio_compression, xc.audio_equalizer, xc.audio_surround, xc.speaker_type); @@ -1382,13 +1382,6 @@ void cMenuSetupLocal::Set(void) Add(ctrl_scale = new cMenuEditBoolItem(tr("Scale to window size"), &newconfig.scale_video)); -#ifdef HAVE_XV_FIELD_ORDER - Add(ctrl_interlace_order = - new cMenuEditStraI18nItem(tr("Interlaced Field Order"), - &newconfig.field_order, FIELD_ORDER_count, - xc.s_fieldOrder)); -#endif - Add(SeparatorItem(tr("Audio"))); Add(ctrl_audio_driver = @@ -1451,8 +1444,7 @@ eOSState cMenuSetupLocal::ProcessKey(eKeys Key) else if(item == ctrl_aspect || item == ctrl_scale || item == ctrl_interlace_order) cXinelibDevice::Instance().ConfigureWindow( xc.fullscreen, xc.width, xc.height, xc.modeswitch, xc.modeline, - newconfig.display_aspect, newconfig.scale_video, - newconfig.field_order); + newconfig.display_aspect, newconfig.scale_video); else if(item == ctrl_local_fe && local_frontend != prev_frontend) { if(local_frontend == local_frontend_orig) { @@ -1504,7 +1496,6 @@ void cMenuSetupLocal::Store(void) SetupStore("Video.Port.FB", xc.video_port_fb); #endif SetupStore("Video.Scale", xc.scale_video); - SetupStore("Video.FieldOrder", xc.field_order); SetupStore("Modeline", xc.modeline); SetupStore("VideoModeSwitching", xc.modeswitch); SetupStore("Fullscreen", xc.fullscreen); diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c index f50ccfd8..27cd54b4 100644 --- a/xine_fbfe_frontend.c +++ b/xine_fbfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_fbfe_frontend.c,v 1.48 2011-01-17 12:29:13 phintuka Exp $ + * $Id: xine_fbfe_frontend.c,v 1.49 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -121,7 +121,7 @@ static int fbfe_display_open(frontend_t *this_gen, int width, int height, int fullscreen, int hud, int opengl, int modeswitch, const char *modeline, int aspect, fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys, - const char *video_port, int scale_video, int field_order, + const char *video_port, int scale_video, const char *aspect_controller, int window_id) { fbfe_t *this = (fbfe_t*)this_gen; @@ -146,7 +146,6 @@ static int fbfe_display_open(frontend_t *this_gen, this->x.height = height; this->x.aspect = aspect; /*this->x.cropping = 0;*/ - this->x.field_order = field_order; this->x.scale_video = scale_video; this->x.overscan = 0; this->x.display_ratio = 1.0; @@ -195,7 +194,7 @@ static int fbfe_display_config(frontend_t *this_gen, int xpos, int ypos, int width, int height, int fullscreen, int modeswitch, const char *modeline, - int aspect, int scale_video, int field_order) + int aspect, int scale_video) { fbfe_t *this = (fbfe_t*)this_gen; @@ -208,7 +207,6 @@ static int fbfe_display_config(frontend_t *this_gen, this->x.height = height >= 0 ? height : this->x.height; this->x.aspect = aspect; this->x.scale_video = scale_video; - this->x.field_order = field_order; this->fullscreen = fullscreen; /*this->vmode_switch = modeswitch;*/ #if 0 diff --git a/xine_frontend.c b/xine_frontend.c index 44d4fcdb..cb4499c6 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.124 2012-03-10 23:51:10 phintuka Exp $ + * $Id: xine_frontend.c,v 1.125 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -317,11 +317,7 @@ static void fe_frame_output_cb (void *data, *dest_width = this->width; *dest_height = this->height; *dest_x = 0; -#ifndef HAVE_XV_FIELD_ORDER - *dest_y = 0 + this->field_order; -#else *dest_y = 0; -#endif #if 1 if(!this->scale_video) { diff --git a/xine_frontend.h b/xine_frontend.h index 876cebe2..cd064e15 100644 --- a/xine_frontend.h +++ b/xine_frontend.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.h,v 1.27 2012-01-31 19:49:24 phintuka Exp $ + * $Id: xine_frontend.h,v 1.28 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -37,7 +37,6 @@ struct frontend_config_s { char *video_port; int scale_video; - int field_order; fe_keypress_f keypresshandler; @@ -84,14 +83,14 @@ struct frontend_s { int aspect, fe_keypress_f keypresshandler, int no_x_kbd, int gui_hotkeys, const char *video_port, - int scale_video, int field_order, + int scale_video, const char *aspect_controller, int window_id); int (*fe_display_config)(frontend_t *, int xpos, int ypos, int width, int height, int fullscreen, int modeswitch, const char *modeline, - int aspect, int scale_video, int field_order); + int aspect, int scale_video); void (*fe_display_close)(frontend_t*); /* Xine engine */ diff --git a/xine_frontend_internal.h b/xine_frontend_internal.h index eb183a35..9dce35b9 100644 --- a/xine_frontend_internal.h +++ b/xine_frontend_internal.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_internal.h,v 1.9 2012-03-07 08:27:40 phintuka Exp $ + * $Id: xine_frontend_internal.h,v 1.10 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -82,7 +82,6 @@ typedef struct fe_s { uint8_t overscan; /* overscan in % (crop video borders) */ /*uint8_t cropping : 1;*/ uint8_t scale_video : 1; /* enable/disable all video scaling */ - uint8_t field_order : 1; /* invert top/bottom field order */ uint8_t playback_finished : 1; uint8_t slave_playback_finished : 1; diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 875e51ed..aa568dc6 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.101 2012-01-30 10:41:56 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.102 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -551,7 +551,7 @@ int main(int argc, char *argv[]) /* Initialize display */ if (!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, opengl, modeswitch, "", aspect, NULL, noxkbd, gui_hotkeys, - video_port, scale_video, 0, + video_port, scale_video, aspect_controller, window_id)) { fprintf(stderr, "Error opening display\n"); fe->fe_free(fe); diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c index 86d0b2f0..b18e8c48 100644 --- a/xine_sxfe_frontend.c +++ b/xine_sxfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_sxfe_frontend.c,v 1.202 2012-02-24 10:54:54 phintuka Exp $ + * $Id: xine_sxfe_frontend.c,v 1.203 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -2239,7 +2239,7 @@ static int sxfe_display_open(frontend_t *this_gen, int width, int height, int fullscreen, int hud, int opengl, int modeswitch, const char *modeline, int aspect, fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys, - const char *video_port, int scale_video, int field_order, + const char *video_port, int scale_video, const char *aspect_controller, int window_id) { sxfe_t *this = (sxfe_t*)this_gen; @@ -2299,7 +2299,6 @@ static int sxfe_display_open(frontend_t *this_gen, /*this->x.cropping = 0;*/ this->x.overscan = 0; this->x.scale_video = scale_video; - this->x.field_order = field_order ? 1 : 0; this->x.aspect_controller = aspect_controller ? strdup(aspect_controller) : NULL; this->video_win_active = 0; @@ -2460,8 +2459,7 @@ static int sxfe_display_config(frontend_t *this_gen, int xpos, int ypos, int width, int height, int fullscreen, int modeswitch, const char *modeline, - int aspect, int scale_video, - int field_order) + int aspect, int scale_video) { sxfe_t *this = (sxfe_t*)this_gen; @@ -2529,7 +2527,6 @@ static int sxfe_display_config(frontend_t *this_gen, /*this->vmode_switch = modeswitch;*/ this->x.aspect = aspect; this->x.scale_video = scale_video; - this->x.field_order = field_order ? 1 : 0; return 1; } @@ -2557,7 +2554,7 @@ static void sxfe_toggle_fullscreen(fe_t *this_gen, int fullscreen) this->fe.fe_display_config((frontend_t*)this, -1, -1, this->origwidth, this->origheight, fullscreen, 0/*this->vmode_switch*/, NULL/*this->modeline*/, - this->x.aspect, this->x.scale_video, this->x.field_order); + this->x.aspect, this->x.scale_video); this->fullscreen_state_forced = !force; } diff --git a/xineliboutput.c b/xineliboutput.c index 2b8ce4d6..6fd6970d 100644 --- a/xineliboutput.c +++ b/xineliboutput.c @@ -21,7 +21,7 @@ * * xineliboutput.c: VDR Plugin interface * - * $Id: xineliboutput.c,v 1.47 2012-01-30 10:41:56 phintuka Exp $ + * $Id: xineliboutput.c,v 1.48 2012-03-13 12:53:41 phintuka Exp $ * */ @@ -213,12 +213,6 @@ cOsdObject *cPluginXinelibOutput::MainMenuAction(void) if(xc.hide_main_menu) return NULL; -#ifdef HAVE_XV_FIELD_ORDER - xc.field_order = xc.field_order ? 0 : 1; - cXinelibDevice::Instance().ConfigureWindow(xc.fullscreen, xc.width, xc.height, - xc.modeswitch, xc.modeline, xc.display_aspect, - xc.scale_video, xc.field_order); -#endif return new cMenuXinelib(); } @@ -288,7 +282,7 @@ bool cPluginXinelibOutput::Service(const char *Id, void *Data) strn0cpy(xc.local_frontend, xc.s_frontends[local_frontend], sizeof(xc.local_frontend)); cXinelibDevice::Instance().ConfigureWindow( xc.fullscreen, xc.width, xc.height, xc.modeswitch, xc.modeline, - xc.display_aspect, xc.scale_video, xc.field_order); + xc.display_aspect, xc.scale_video); } return true; } |