diff options
-rw-r--r-- | dxr3.c | 36 | ||||
-rw-r--r-- | dxr3.h | 46 | ||||
-rw-r--r-- | po/ca_ES.po | 17 | ||||
-rw-r--r-- | po/de_DE.po | 17 | ||||
-rw-r--r-- | po/es_ES.po | 17 | ||||
-rw-r--r-- | po/fi_FI.po | 17 | ||||
-rw-r--r-- | po/fr_FR.po | 17 | ||||
-rw-r--r-- | po/it_IT.po | 17 | ||||
-rw-r--r-- | po/pl_PL.po | 17 | ||||
-rw-r--r-- | po/uk_UA.po | 17 |
10 files changed, 112 insertions, 106 deletions
@@ -21,34 +21,6 @@ static const char DESCRIPTION[] = trNOOP("Hardware MPEG decoder"); #define DXR3_MAX_CARDS 4 // ================================== -// 'message-handler' for the main screen -eOSState cDxr3OsdItem::ProcessKey(eKeys Key) -{ - if (Key == kOk) - { - switch (m_item) - { - case DXR3_FORCE_LETTER_BOX: - cSettings::instance()->forceLetterBox( - !cSettings::instance()->forceLetterBox()); - break; - - case DXR3_ANALOG_OUT: - cSettings::instance()->useDigitalOut(0); - //cDxr3Device::Instance().Reset(); - break; - - case DXR3_DIGITAL_OUT: - cSettings::instance()->useDigitalOut(1); - //cDxr3Device::Instance().Reset(); - break; - } - } - - return Key == kOk ? osBack : cOsdItem::ProcessKey(Key); -} - -// ================================== // setup menu cMenuSetupDxr3::cMenuSetupDxr3() { @@ -64,6 +36,7 @@ cMenuSetupDxr3::cMenuSetupDxr3() menuVideoModes[1] = tr("PAL60"); menuVideoModes[2] = tr("NTSC"); Add(new cMenuEditStraItem(tr("Video mode"), &newVideoMode, 3, menuVideoModes)); + Add(new cMenuEditBoolItem(tr("Toggle force letterbox"), &newForceLetterBox)); menuAc3AudioModes[0] = tr("PCM encapsulation"); menuAc3AudioModes[1] = tr("AC3 passthrough"); @@ -104,6 +77,7 @@ void cMenuSetupDxr3::Store() SetupStore("Contrast", cSettings::instance()->contrast(newContrast)); SetupStore("Saturation", cSettings::instance()->saturation(newSaturation)); SetupStore("Dxr3VideoMode", cSettings::instance()->videoMode((eVideoMode) newVideoMode)); + SetupStore("ForceLetterBox", cSettings::instance()->forceLetterBox(newForceLetterBox)); SetupStore("UseWSS", cSettings::instance()->useWss(newUseWSS)); SetupStore("UseDigitalOut", cSettings::instance()->useDigitalOut(newUseDigitalOut)); SetupStore("HideMenu", cSettings::instance()->hideMenu(newHideMenu)); @@ -184,6 +158,10 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value) cSettings::instance()->videoMode((eVideoMode) atoi(Value)); return true; } + if (!strcasecmp(Name, "ForceLetterBox")) { + cSettings::instance()->forceLetterBox(atoi(Value)); + return true; + } if (!strcasecmp(Name, "UseWSS")) { cSettings::instance()->useWss(atoi(Value)); return true; @@ -218,7 +196,7 @@ const char* cPluginDxr3::MainMenuEntry() // ================================== cOsdObject* cPluginDxr3::MainMenuAction() { - return new cDxr3OsdMenu; + return NULL; } const char *cPluginDxr3::CommandLineHelp() @@ -25,6 +25,7 @@ private: int newAc3AudioMode; const char *menuVideoModes[3]; const char *menuAc3AudioModes[2]; + int newForceLetterBox; int newUseWSS; int newHideMenu; int newOsdFlushRate; @@ -33,51 +34,6 @@ private: int newSaturation; }; - -// ================================== -enum eDxr3OsdItem -{ - DXR3_FORCE_LETTER_BOX, - DXR3_DIGITAL_OUT, - DXR3_ANALOG_OUT -}; - -// ================================== -// osd item -class cDxr3OsdItem : public cOsdItem -{ -public: - cDxr3OsdItem(const char* text, eDxr3OsdItem item) : - cOsdItem(text), m_item(item) {} - - // process fb input - eOSState ProcessKey(eKeys Key); - -protected: - eDxr3OsdItem m_item; -}; - -// ================================== -// main screen -class cDxr3OsdMenu : public cOsdMenu -{ -public: - cDxr3OsdMenu(): cOsdMenu(tr(MAINMENUENTRY)) - { - Clear(); - SetHasHotkeys(); - Add(new cDxr3OsdItem(hk(tr("Toggle force letterbox")), - DXR3_FORCE_LETTER_BOX)); - - if (cSettings::instance()->useDigitalOut()) - Add(new cDxr3OsdItem(hk(tr("Switch to analog audio output")), - DXR3_ANALOG_OUT)); - else - Add(new cDxr3OsdItem(hk(tr("Switch to digital audio output")), - DXR3_DIGITAL_OUT)); - } -}; - #endif /*_DXR3_H_*/ // Local variables: diff --git a/po/ca_ES.po b/po/ca_ES.po index a71bdbb..8cc3b15 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Opcions DXR3" -msgid "Reset DXR3 hardware" -msgstr "Reset hardware DXR3" - msgid "Toggle force letterbox" msgstr "Commuta modalitat letterbox forçada" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Modalitat vídeo" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "" @@ -68,5 +74,8 @@ msgstr "Targeta" msgid "DXR3: releasing devices" msgstr "DXR3: alliberant dispositiu" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Reset hardware DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Temps mínim refresc OSD (ms)" diff --git a/po/de_DE.po b/po/de_DE.po index 1396290..63a9f8c 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Christian Gmeiner <christian.gmeiner@gmail.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "DXR3 Einstellungen" -msgid "Reset DXR3 hardware" -msgstr "Reset DXR3 Hardware" - msgid "Toggle force letterbox" msgstr "Letterbox erzwingen" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Videomodus" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "" @@ -67,3 +73,6 @@ msgstr "Karte" msgid "DXR3: releasing devices" msgstr "DXR3: Releasing Devices" + +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Reset DXR3 Hardware" diff --git a/po/es_ES.po b/po/es_ES.po index 93021a0..0c7865d 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Opciones DXR3" -msgid "Reset DXR3 hardware" -msgstr "Reset hardware DXR3" - msgid "Toggle force letterbox" msgstr "Conmuta modalidad letterbox forzada" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Modalidad vídeo" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "" @@ -68,5 +74,8 @@ msgstr "Tarjeta" msgid "DXR3: releasing devices" msgstr "DXR3: liberando dispositivo" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Reset hardware DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Tiempo mínimo refresco OSD (ms)" diff --git a/po/fi_FI.po b/po/fi_FI.po index 356e003..e578f1a 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "DXR3-toiminnot" -msgid "Reset DXR3 hardware" -msgstr "Palauta kortti alkutilaan" - msgid "Toggle force letterbox" msgstr "Letterbox-näyttötilan pakotus päälle/pois" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Näyttötila" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "Käytä WSS-signalointia" @@ -68,5 +74,8 @@ msgstr "Kortin järjestysnumero" msgid "DXR3: releasing devices" msgstr "DXR3: vapautetaan laitteet" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Palauta kortti alkutilaan" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Kuvaruutunäytön päivitysväli (ms)" diff --git a/po/fr_FR.po b/po/fr_FR.po index 00019d3..48ce6f7 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2009-01-10 19:20+0100\n" "Last-Translator: Nival Michaël\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Fonctions DXR3" -msgid "Reset DXR3 hardware" -msgstr "Réinitialiser matériel DXR3" - msgid "Toggle force letterbox" msgstr "Forcer letterbox" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Mode vidéo" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "Utiliser signal Widescreen (WSS)" @@ -68,5 +74,8 @@ msgstr "Carte" msgid "DXR3: releasing devices" msgstr "DXR3 : Version matériel" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Réinitialiser matériel DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Temps minimum de MAJ (ms)" diff --git a/po/it_IT.po b/po/it_IT.po index 715a895..057a453 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Diego Pierotto\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Opzioni DXR3" -msgid "Reset DXR3 hardware" -msgstr "Reimposta hardware DXR3" - msgid "Toggle force letterbox" msgstr "Commuta modalità letterbox forzato" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Modalità Video" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "Utilizza segnale widescreen (WSS)" @@ -68,5 +74,8 @@ msgstr "Scheda numero" msgid "DXR3: releasing devices" msgstr "DXR3: rilascio dispositivo" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Reimposta hardware DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Tempo minimo aggiorn. OSD (ms)" diff --git a/po/pl_PL.po b/po/pl_PL.po index ae6d2b7..9db16c8 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2008-12-28 23:17+0200\n" "Last-Translator: Mikolaj Tutak <mtutak@nixz.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Ustawienia DXR3" -msgid "Reset DXR3 hardware" -msgstr "Zerowanie dekodera DXR3" - msgid "Toggle force letterbox" msgstr "Przełącz wymuszanie trybu letterbox" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Tryb obrazu" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "" @@ -68,5 +74,8 @@ msgstr "Numer karty" msgid "DXR3: releasing devices" msgstr "DXR3: zwalnianie sprzętu" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Zerowanie dekodera DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Czas odświeżania OSD (ms)" diff --git a/po/uk_UA.po b/po/uk_UA.po index 3aed162..042e4f2 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: dxr3plugin-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2009-10-16 15:22+0200\n" +"POT-Creation-Date: 2010-04-22 19:05+0200\n" "PO-Revision-Date: 2009-05-28 23:17+0200\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -17,9 +17,6 @@ msgstr "" msgid "DXR3 Functions" msgstr "Налаштування DXR3" -msgid "Reset DXR3 hardware" -msgstr "Ресет DXR3" - msgid "Toggle force letterbox" msgstr "Включити примусово режим letterbox" @@ -53,6 +50,15 @@ msgstr "NTSC" msgid "Video mode" msgstr "Режим відео" +msgid "PCM encapsulation" +msgstr "" + +msgid "AC3 passthrough" +msgstr "" + +msgid "AC3 mode" +msgstr "" + msgid "Use widescreen signaling (WSS)" msgstr "Використовувати широкий екран (WSS)" @@ -68,5 +74,8 @@ msgstr "Номер карти" msgid "DXR3: releasing devices" msgstr "DXR3: звільнення пристрою" +#~ msgid "Reset DXR3 hardware" +#~ msgstr "Ресет DXR3" + #~ msgid "OSD flush rate (ms)" #~ msgstr "Час оновленя OSD (мс)" |