diff options
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | menu.c | 6 | ||||
| -rw-r--r-- | po/de_DE.po | 40 | ||||
| -rw-r--r-- | po/it_IT.po | 23 | ||||
| -rw-r--r-- | po/pvrinput.pot | 2 | ||||
| -rw-r--r-- | pvrinput.c | 2 | ||||
| -rw-r--r-- | submenu.c | 33 | ||||
| -rw-r--r-- | submenu.h | 17 |
8 files changed, 64 insertions, 69 deletions
@@ -370,17 +370,14 @@ devices will be used. Note: Don't change vdr's setup.conf while vdr is running, it won't take effect and will be overwritten by vdr when vdr terminates. There is also an OSD menu entry to allow setting PvrSetup.UseOnlyCard while -vdr is running. By default it is not visible to avoid confusion of a common -user. To use this feature just uncomment "//#define PVR_DEBUG" in the top of -menu.c before compiling the plugin. (Note: will be uncommented by default in -development snapshots) +vdr is running. Have a look in the 'Expert Parameters' submenu. Using Stream type V4L2_MPEG_STREAM_TYPE_MPEG2_DVD (not possible for HD PVR) --------------------------------------------------------------------------- Some users have reported that recordings which were done using this stream type work better with the burn plugin or mplex. If you want to use this stream, you can use PvrSetup.StreamType=1 by editing -the setup.conf. There is also a menu entry when compiling as described above. +the setup.conf. There is also a menu entry in the 'Expert Parameters' submenu. Adjust different Audio volume levels (not possible for HD PVR) -------------------------------------------------------------- @@ -414,3 +411,6 @@ an external input, pvrinput will call this script with three arguments: It is up to you what you want to do in this script. For example, you could use the lirc irsend command. The scripts contains an exampe for usage of dct6200. + +Note: You need to activate 'use externchannelswitch.sh' in the +'Expert Parameters' submenu.
\ No newline at end of file @@ -27,7 +27,6 @@ /*uncomment the following line to allow setting of PvrSetup.UseOnlyCard and StreamType.value via OSD menu (see README) */ -#define PVR_DEBUG #include "common.h" #include "submenu.h" @@ -81,9 +80,12 @@ cPvrMenuSetup::cPvrMenuSetup() eOSState cPvrMenuSetup::ProcessKey(eKeys Key) { eOSState state = osUnknown; - if (Key == kOk || Key == kBack) { + if (Key == kOk && HasSubMenu()) { Store(); } + if (Key == kBack && HasSubMenu()) { + newPvrSetup = PvrSetup; + } if (!HasSubMenu()) { if (Key == kOk) { const char* ItemText = Get(Current())->Text(); diff --git a/po/de_DE.po b/po/de_DE.po index 178c436..be654e7 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1,26 +1,27 @@ # translation of de_DE.po to # pvrinput -# Copyright (C) 2007 Andreas Regel, Martin Dauskardt, Winfried K�hler +# Copyright (C) 2007 Andreas Regel, Martin Dauskardt, Winfried Kï¿œhler # This file is distributed under the same license as the PACKAGE package. # # -# Andreas Regel, Martin Dauskardt, Winfried K�hler <see README>, 2007. -# Martin Dauskardt <martin.dauskardt@gmx.de>, 2008. +# Andreas Regel, Martin Dauskardt, Winfried Kï¿œhler <see README>, 2007. +# Martin Dauskardt <martin.dauskardt@gmx.de>, 2008, 2010. msgid "" msgstr "" "Project-Id-Version: de_DE\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2010-07-08 07:14+0200\n" -"PO-Revision-Date: 2009-10-11 22:39+0200\n" -"Last-Translator: root\n" -"Language-Team: <de@li.org>\n" +"PO-Revision-Date: 2010-07-14 09:32+0200\n" +"Last-Translator: Martin Dauskardt <martin.dauskardt@gmx.de>\n" +"Language-Team: Deutsch <kde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" msgid "pvrinput no longer supports old channel syntax!" -msgstr "pvrinput unterst�tzt alte Kanalsyntax nicht mehr!" +msgstr "pvrinput unterstützt alte Kanalsyntax nicht mehr!" msgid "Setup.pvrinput$General Parameters" msgstr "Generelle Einstellungen" @@ -47,13 +48,13 @@ msgid "Setup.pvrinput$Contrast" msgstr "Kontrast" msgid "Setup.pvrinput$Saturation" -msgstr "S�ttigung" +msgstr "Sättigung" msgid "Setup.pvrinput$Hue" msgstr "Farbton" msgid "use Hauppauge PVR as input device" -msgstr "Hauppauge PVR als Eingabeger�t " +msgstr "Hauppauge PVR als Eingabegerät " msgid "PVR picture settings" msgstr "PVR Bildeinstellungen " @@ -77,7 +78,7 @@ msgid "Setup.pvrinput$Slice VBI Teletext" msgstr "Teletext durchschleifen" msgid "Setup.pvrinput$Hide main menu entry" -msgstr "Hauptmen�-Eintrag verstecken" +msgstr "Hauptmenü-Eintrag verstecken" msgid "Setup.pvrinput$Bitrate mode" msgstr "Bitraten Modus" @@ -86,22 +87,22 @@ msgid "Setup.pvrinput$Video bitrate TV (kbit/s)" msgstr "Video Bitrate TV (kbit/s)" msgid "Setup.pvrinput$Aspect ratio" -msgstr "Seitenverh�ltnis" +msgstr "Seitenverhältnis" msgid "Setup.pvrinput$Common Audio volume (TV)" -msgstr "allg. TV-Lautst�rke" +msgstr "allg. TV-Lautstärke" msgid "Setup.pvrinput$Exception Audio volume (TV)" -msgstr "abw. TV Lautst�rke" +msgstr "abw. TV Lautstärke" msgid "Setup.pvrinput$Exception TV Volume for Card" -msgstr "abw. TV-Lautst�rke f�r Karte" +msgstr "abw. TV-Lautstärke für Karte" msgid "Setup.pvrinput$Tuner Audio Mode" msgstr "Tuner Audio Mode" msgid "Setup.pvrinput$Audio radio volume" -msgstr "FM Radio Lautst�rke" +msgstr "FM Radio Lautstärke" msgid "Setup.pvrinput$Audio bitrate (kbit/s)" msgstr "Audio Bitrate (kbit/s)" @@ -155,7 +156,7 @@ msgid "Setup.pvrinput$Mode Spatial Video Filter" msgstr "Modus Spatial Video Filter" msgid "Setup.pvrinput$Strength Spatial Video Filter" -msgstr "St�rke Spatial Video Filter" +msgstr "Stärke Spatial Video Filter" msgid "Setup.pvrinput$Luma Spatial Filter Type" msgstr "Helligkeit Spatial Filter Typ" @@ -167,7 +168,7 @@ msgid "Setup.pvrinput$Mode Temporal Video Filter" msgstr "Modus Temporal Video Filter" msgid "Setup.pvrinput$Strength Temporal Video Filter" -msgstr "St�rke Temporal Video Filter" +msgstr "Stärke Temporal Video Filter" msgid "Setup.pvrinput$Median Filter Type" msgstr "Median Filter Typ" @@ -187,7 +188,6 @@ msgstr "Chroma Median Filter Oben" msgid "Setup.pvrinput$Stream type" msgstr "Stream Typ" -#, fuzzy msgid "Setup.pvrinput$Use only card" msgstr "verwende nur Karte" diff --git a/po/it_IT.po b/po/it_IT.po index d23e55d..5f58b75 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: it_IT\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2010-07-08 07:14+0200\n" -"PO-Revision-Date: 2010-04-06 00:26+0100\n" +"PO-Revision-Date: 2010-07-17 00:28+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -23,29 +23,23 @@ msgstr "" msgid "pvrinput no longer supports old channel syntax!" msgstr "Sintassi vecchi canali non supportata" -#, fuzzy msgid "Setup.pvrinput$General Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri generali" -#, fuzzy msgid "Setup.pvrinput$Video Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri video" -#, fuzzy msgid "Setup.pvrinput$Audio Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri audio" -#, fuzzy msgid "Setup.pvrinput$MPEG Filter Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri filtro MPEG" -#, fuzzy msgid "Setup.pvrinput$Expert Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri avanzati" -#, fuzzy msgid "Setup.pvrinput$HDPVR Parameters" -msgstr "Utilizza solo scheda" +msgstr "Parametri HDPVR" msgid "Setup.pvrinput$Brightness" msgstr "Luminosità" @@ -224,9 +218,8 @@ msgstr "Ingresso audio HDPVR" #, fuzzy #~ msgid "Setup.pvrinput$General Parameter" #~ msgstr "Utilizza solo scheda" - #~ msgid "Setup.pvrinput$PVRUSB2 Stop on Change" #~ msgstr "Ferma PVRUSB2 al cambio" - #~ msgid "Setup.pvrinput$Video bitrate Radio (kbit/s)" #~ msgstr "Codifica video radio (kbit/s)" + diff --git a/po/pvrinput.pot b/po/pvrinput.pot index 371bd12..3917169 100644 --- a/po/pvrinput.pot +++ b/po/pvrinput.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2010-07-08 07:20+0200\n" +"POT-Creation-Date: 2010-07-19 08:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -6,7 +6,7 @@ #endif #endif -static const char *VERSION = "2010-04-14"; +static const char *VERSION = "2010-07-22-rb_osd_submenus"; static const char *DESCRIPTION = tr("use Hauppauge PVR as input device"); static const char *MAINMENUENTRY = tr("PVR picture settings"); @@ -26,7 +26,6 @@ ***************************************************************************/ #include "submenu.h" -#define PVR_DEBUG static const char *aspectRatios[] = { "1:1", @@ -66,7 +65,6 @@ static const char *tunerAudioModes[] = { "bilingual" }; -#ifdef PVR_DEBUG static const char *useOnlyCard[] = { "/dev/video0", "/dev/video1", @@ -89,14 +87,12 @@ static const char *useOnlyCard[] = { "PVRUSB2", //18 "HDPVR" //19 }; -#endif -#ifdef PVR_DEBUG static const char *streamType[] = { "MPEG2 PS", "MPEG2 DVD" }; -#endif + static const char *exceptionVolumeForCard[] = { "/dev/video0", @@ -121,8 +117,7 @@ static const char *exceptionVolumeForCard[] = { }; cPvrMenuGeneral::cPvrMenuGeneral(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$General Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$General Parameters")), setup(setupObject) { Add(new cMenuEditIntItem(tr("Setup.pvrinput$Log level"), &setup->LogLevel, 0, 4)); @@ -134,8 +129,7 @@ cPvrMenuGeneral::cPvrMenuGeneral(cPvrSetup *setupObject) : cPvrMenuVideo::cPvrMenuVideo(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$Video Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$Video Parameters")), setup(setupObject) { Add(new cMenuEditIntItem(tr("Setup.pvrinput$Brightness"), &setup->Brightness.value, 0, 100)); @@ -164,8 +158,7 @@ cPvrMenuVideo::cPvrMenuVideo(cPvrSetup *setupObject) : } cPvrMenuAudio::cPvrMenuAudio(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$Audio Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$Audio Parameters")), setup(setupObject) { Add(new cMenuEditIntItem(tr("Setup.pvrinput$Common Audio volume (TV)"), &setup->AudioVolumeTVCommon.value, 0, 100)); @@ -196,8 +189,7 @@ cPvrMenuAudio::cPvrMenuAudio(cPvrSetup *setupObject) : } cPvrMenuMpegFilter::cPvrMenuMpegFilter(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$MPEG Filter Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$MPEG Filter Parameters")), setup(setupObject) { static const char *FilterModes[2]; @@ -275,22 +267,18 @@ cPvrMenuMpegFilter::cPvrMenuMpegFilter(cPvrSetup *setupObject) : } cPvrMenuExperts::cPvrMenuExperts(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$Expert Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$Expert Parameters")), setup(setupObject) { -#ifdef PVR_DEBUG Add(new cMenuEditStraItem(tr("Setup.pvrinput$Stream type"), &setup->StreamType.value, 2, streamType)); Add(new cMenuEditStraItem(tr("Setup.pvrinput$Use only card"), &setup->UseOnlyCard, 20, useOnlyCard)); -#endif Add(new cMenuEditBoolItem(tr("Setup.pvrinput$use externchannelswitch.sh"), &setup->UseExternChannelSwitchScript)); } cPvrMenuHdPvr::cPvrMenuHdPvr(cPvrSetup *setupObject) : - cOsdMenu(tr("Setup.pvrinput$HDPVR Parameters"), - 33/*same col value as in cMenuSetupPage::cMenuSetupPage*/), + cPvrSubMenu(tr("Setup.pvrinput$HDPVR Parameters")), setup(setupObject) { static const char *HDPVR_AudioEncodings[2]; @@ -306,3 +294,10 @@ cPvrMenuHdPvr::cPvrMenuHdPvr(cPvrSetup *setupObject) : Add(new cMenuEditStraItem(tr("Setup.pvrinput$HDPVR audio input"), &setup->HDPVR_AudioInput, 3, HDPVR_AudioInputs)); } + +eOSState cPvrSubMenu::ProcessKey(eKeys Key) { + if (Key == kOk) { + return osBack; + } + return cOsdMenu::ProcessKey(Key); +} @@ -28,8 +28,13 @@ #include "common.h" #include <vdr/osdbase.h> +class cPvrSubMenu : public cOsdMenu { +public: + cPvrSubMenu(const char* text) : cOsdMenu(text, 33) { } + virtual eOSState ProcessKey(eKeys Key); +}; -class cPvrMenuGeneral : public cOsdMenu { +class cPvrMenuGeneral : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; @@ -37,7 +42,7 @@ public: cPvrMenuGeneral(cPvrSetup *setupObject); }; -class cPvrMenuVideo : public cOsdMenu { +class cPvrMenuVideo : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; @@ -45,7 +50,7 @@ public: cPvrMenuVideo(cPvrSetup *setupObject); }; -class cPvrMenuAudio : public cOsdMenu { +class cPvrMenuAudio : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; @@ -53,7 +58,7 @@ public: cPvrMenuAudio(cPvrSetup *setupObject); }; -class cPvrMenuMpegFilter : public cOsdMenu { +class cPvrMenuMpegFilter : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; @@ -61,7 +66,7 @@ public: cPvrMenuMpegFilter(cPvrSetup *setupObject); }; -class cPvrMenuExperts : public cOsdMenu { +class cPvrMenuExperts : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; @@ -69,7 +74,7 @@ public: cPvrMenuExperts(cPvrSetup *setupObject); }; -class cPvrMenuHdPvr : public cOsdMenu { +class cPvrMenuHdPvr : public cPvrSubMenu { private: /* Reference to the setup data object, mustn't be deleted within this Object */ cPvrSetup *setup; |