diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | i18n.c | 696 | ||||
| -rw-r--r-- | i18n.h | 35 | ||||
| -rw-r--r-- | osd.c | 17 | ||||
| -rw-r--r-- | osd.h | 2 | ||||
| -rw-r--r-- | osd_info.c | 1 | ||||
| -rw-r--r-- | osdpip.c | 12 | ||||
| -rw-r--r-- | po/ca_ES.po | 3 | ||||
| -rw-r--r-- | po/cs_CZ.po | 3 | ||||
| -rw-r--r-- | po/da_DK.po | 3 | ||||
| -rw-r--r-- | po/de_DE.po | 3 | ||||
| -rw-r--r-- | po/el_GR.po | 3 | ||||
| -rw-r--r-- | po/es_ES.po | 3 | ||||
| -rw-r--r-- | po/et_EE.po | 3 | ||||
| -rw-r--r-- | po/fi_FI.po | 3 | ||||
| -rw-r--r-- | po/fr_FR.po | 3 | ||||
| -rw-r--r-- | po/hr_HR.po | 3 | ||||
| -rw-r--r-- | po/hu_HU.po | 3 | ||||
| -rw-r--r-- | po/it_IT.po | 4 | ||||
| -rw-r--r-- | po/nl_NL.po | 3 | ||||
| -rw-r--r-- | po/nn_NO.po | 3 | ||||
| -rw-r--r-- | po/pl_PL.po | 3 | ||||
| -rw-r--r-- | po/pt_PT.po | 3 | ||||
| -rw-r--r-- | po/ro_RO.po | 3 | ||||
| -rw-r--r-- | po/ru_RU.po | 3 | ||||
| -rw-r--r-- | po/sl_SI.po | 3 | ||||
| -rw-r--r-- | po/sv_SE.po | 3 | ||||
| -rw-r--r-- | po/tr_TR.po | 3 | ||||
| -rw-r--r-- | receiver.c | 15 | ||||
| -rw-r--r-- | receiver.h | 8 | ||||
| -rw-r--r-- | setup.c | 1 |
33 files changed, 53 insertions, 806 deletions
@@ -1,6 +1,10 @@ VDR Plugin 'osdpip' Revision History ------------------------------------ +2012-05-16: Version 0.1.2 +- Adapted for VDR 1.7.27 (Closes #981, #964, #902) +- Dropped VDR 1.6 support + 2012-02-12: Version 0.1.1 - Fixed compile error with newer ffmpeg versions >= svn 20100426 (closes #345) @@ -107,7 +107,7 @@ endif ### The object files (add further files here): -OBJS = $(PLUGIN).o osd_info.o remux.o osd.o receiver.o setup.o i18n.o pes.o quantize.o decoder.o +OBJS = $(PLUGIN).o osd_info.o remux.o osd.o receiver.o setup.o pes.o quantize.o decoder.o ### The main target: @@ -30,7 +30,7 @@ See the file COPYING for the full license information. Requirements: ------------- -- vdr 1.3.47 or higher, tested here with 1.4.7 and 1.6.0 +- vdr 1.7.27 or higher - libavcodec from ffmpeg (http://ffmpeg.sourceforge.net) version 0.4.8 or higher @@ -1,696 +0,0 @@ -/* - * OSD Picture in Picture plugin for the Video Disk Recorder - * - * Copyright (C) 2004 - 2008 Andreas Regel <andreas.regel@powarman.de> - * Copyright (C) 2004 Sascha Volkenandt <sascha@akv-soft.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#if (APIVERSNUM < 10507) - -#include "i18n.h" - -const tI18nPhrase Phrases[] = { - { "OSD Picture-in-Picture", // English - "OSD Bild-in-Bild", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "OSD-PIP Incrustation d'image dans l'image", // Français - "", // Norsk - "Kuva kuvassa -toiminto (OSD)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Picture-in-Picture", // English - "Bild-in-Bild", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Incrustation d'image", // Français - "", // Norsk - "Kuva kuvassa", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Crop left", // English - "Links abschneiden", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couper a gauche", // Français - "", // Norsk - "Leikkaa vasemmalta", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Crop right", // English - "Rechts abschneiden", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couper a droite", // Français - "", // Norsk - "Leikkaa oikealta", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Crop at top", // English - "Oben abschneiden", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couper la partie haute", // Français - "", // Norsk - "Leikkaa ylhäältä", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Crop at bottom", // English - "Unten abschneiden", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couper la partie basse", // Français - "", // Norsk - "Leikkaa alhaalta", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Color depth", // English - "Farbtiefe", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Nobre de couleur pour l'image", // Français - "", // Norsk - "Värisyvyys", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Size", // English - "Größe", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Taille", // Français - "", // Norsk - "Koko", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Frames to display", // English - "Darzustellende Bilder", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Sequence a afficher", // Français - "", // Norsk - "Näytä kehykset", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Drop frames", // English - "Einzelbilder auslassen", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Sauter des sequences", // Français - "", // Norsk - "Hylkää kehyksiä", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Swap FFMPEG output", // English - "FFMPEG Ausgabe umdrehen", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Changer la sortie de FFMPEG", // Français - "", // Norsk - "Invertoi FFMPEG-kuva", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Show info window", // English - "Info-Fenster anzeigen", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Montrer les informations de la fenetre", // Français - "", // Norsk - "Näytä kanavatieto", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Info window width", // English - "Breite Info-Fenster", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Information sur la taille de la fenetre", // Français - "", // Norsk - "Kanavatiedon leveys", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Info window position", // English - "Position Info-Fenster", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Information sur la position de la fenetre", // Français - "", // Norsk - "Kanavatiedon sijainti", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "top left", // English - "oben links", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "En haut a gauche", // Français - "", // Norsk - "vasen yläreuna", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "top right", // English - "oben rechts", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "En haut a droite", // Français - "", // Norsk - "oikea yläreuna", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "bottom left", // English - "unten links", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "En bas a gauche", // Français - "", // Norsk - "vasen alareuna", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "bottom right", // English - "unten rechts", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "En bas a droite", // Français - "", // Norsk - "oikea alareuna", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Greyscale (16)", // English - "16 Graustufen", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Niveau de gris (16)", // Français - "", // Norsk - "harmaasävy (16)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Greyscale (256)", // English - "256 Graustufen", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Niveau de gris (256)", // Français - "", // Norsk - "harmaasävy (256)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Color (256, fixed)", // English - "256 Farben (fest)", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couleur (256 fixe)", // Français - "", // Norsk - "väri (256)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Color (128, variable)", // English - "128 Farben (variabel)", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Couleur (128 variable)", // Français - "", // Norsk - "väri (128, vaihtuva)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Color (256, dithered)", // English - "256 Farben (dithered)", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "", // Français - "", // Norsk - "väri (256)", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "X Position", // English - "X-Position", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "X Position", // Français - "", // Norsk - "Vaakasijainti", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Y Position", // English - "Y-Position", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Y Position", // Français - "", // Norsk - "Pystysijainti", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "automatic", // English - "automatisch", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Automatique", // Français - "", // Norsk - "automaattisesti", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "none", // English - "keine", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Aucun", // Français - "", // Norsk - "ei", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "1 frame", // English - "1 Frame", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Sequence 1", // Français - "", // Norsk - "1 kehys", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "2 frames", // English - "2 Frames", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Sequence 2", // Français - "", // Norsk - "2 kehystä", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "channel only", // English - "nur Kanal", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Seulement la chaine", // Français - "", // Norsk - "kanava", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "simple", // English - "einfach", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Simple", // Français - "", // Norsk - "lyhyt", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "complete", // English - "komplett", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Complet", // Français - "", // Norsk - "pitkä", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Normal mode", // English - "Normaler Modus", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Mode normale", // Français - "", // Norsk - "Normaalitoiminto", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Move mode", // English - "Bewegungsmodus", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "Mode mouvement", // Français - "", // Norsk - "Siirtotoiminto", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { "Zapping mode", // English - "Umschaltmodus", // Deutsch - "", // Slovenski - "", // Italiano - "", // Nederlands - "", // Português - "", // Français - "", // Norsk - "", // Suomi - "", // Polski - "", // Español - "", // Ellinika - "", // Svenska - "", // Romaneste - "", // Magyar - "", // Catala - "", // Russian - "", // Croatian - }, - { NULL } -}; - -#endif - @@ -1,35 +0,0 @@ -/* - * OSD Picture in Picture plugin for the Video Disk Recorder - * - * Copyright (C) 2004 - 2008 Andreas Regel <andreas.regel@powarman.de> - * Copyright (C) 2004 Sascha Volkenandt <sascha@akv-soft.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef VDR_OSDPIP_I18N_H -#define VDR_OSDPIP_I18N_H - -#include <vdr/config.h> -#include <vdr/i18n.h> - -#if (APIVERSNUM < 10507) -#define trNOOP(a) a -#define trVDR tr -#endif - -extern const tI18nPhrase Phrases[]; - -#endif // VDR_OSDPIP_I18N_H @@ -29,14 +29,9 @@ #include "quantize.h" #include "receiver.h" #include "setup.h" -#if VDRVERSNUM > 10703 #include "remux.h" -#endif #include <vdr/ringbuffer.h> -#if VDRVERSNUM <= 10703 -#include <vdr/remux.h> -#endif #include <vdr/thread.h> #include <vdr/menu.h> @@ -99,11 +94,7 @@ void cOsdPipObject::SwapChannels(void) if (chan) { Stop(); Channels.SwitchTo(m_Channel->Number()); -#if (APIVERSNUM < 10500) - cDevice *dev = cDevice::GetDevice(chan, 1); -#else cDevice *dev = cDevice::GetDevice(chan, 1, false); -#endif if (dev) { DELETENULL(m_Receiver); m_Channel = chan; @@ -123,11 +114,7 @@ void cOsdPipObject::SwitchOsdPipChan(int i) { Stop(); DELETENULL(m_Receiver); -#if (APIVERSNUM < 10500) - cDevice *dev = cDevice::GetDevice(pipChan, 1); -#else cDevice *dev = cDevice::GetDevice(pipChan, 1, false); -#endif if (dev) { m_Channel = pipChan; @@ -890,9 +877,9 @@ eOSState cOsdPipObject::ProcessKey(eKeys Key) return state; } -void cOsdPipObject::ChannelSwitch(const cDevice * device, int channelNumber) +void cOsdPipObject::ChannelSwitch(const cDevice * device, int channelNumber, bool LiveView) { - if (device != cDevice::PrimaryDevice()) + if (!LiveView) return; if (channelNumber == 0) return; @@ -76,7 +76,7 @@ private: void StopReplay(); protected: virtual void Action(void); - virtual void ChannelSwitch(const cDevice * device, int channelNumber); + virtual void ChannelSwitch(const cDevice * device, int channelNumber, bool LiveView); virtual void OsdStatusMessage(const char * message); public: @@ -21,7 +21,6 @@ #include "osd_info.h" #include "setup.h" -#include "i18n.h" #include <vdr/device.h> #include <vdr/thread.h> @@ -23,13 +23,10 @@ #include "decoder.h" #include "osd.h" #include "setup.h" -#if (APIVERSNUM < 10507) -#include "i18n.h" -#endif #include <vdr/plugin.h> -static const char *VERSION = "0.1.1"; +static const char *VERSION = "0.1.2"; static const char *DESCRIPTION = trNOOP("OSD Picture-in-Picture"); static const char *MAINMENUENTRY = trNOOP("Picture-in-Picture"); @@ -83,9 +80,6 @@ bool cPluginOsdpip::Initialize(void) bool cPluginOsdpip::Start(void) { -#if (APIVERSNUM < 10507) - RegisterI18n(Phrases); -#endif return true; } @@ -101,11 +95,7 @@ cOsdObject *cPluginOsdpip::MainMenuAction(void) chan = cDevice::CurrentChannel() != 0 ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL; if (chan != NULL) { -#if (APIVERSNUM < 10500) - dev = cDevice::GetDevice(chan, 1); -#else dev = cDevice::GetDevice(chan, 1, false); -#endif if (dev) return new cOsdPipObject(dev, chan); } diff --git a/po/ca_ES.po b/po/ca_ES.po index c3427fb..4826686 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index aa0bb44..615ac5e 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/da_DK.po b/po/da_DK.po index 8c4e727..e0bae34 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de_DE.po b/po/de_DE.po index be5747c..9fdeb49 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-01-01 22:29+0100\n" "Last-Translator: Mitchm at vdrportal.de\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/el_GR.po b/po/el_GR.po index 9154242..01c39f1 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-7\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/es_ES.po b/po/es_ES.po index 8411cbf..64a1478 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/et_EE.po b/po/et_EE.po index e400bdd..525fa4e 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-13\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fi_FI.po b/po/fi_FI.po index c04d5f6..3772707 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.0.9\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2008-04-27 18:44+0200\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fr_FR.po b/po/fr_FR.po index 5f2d246..6b3809c 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.0.8\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2008-04-13 20:07+0200\n" "Last-Translator: micky979 at vdrportal.de\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/hr_HR.po b/po/hr_HR.po index 80d2c33..611e22f 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/hu_HU.po b/po/hu_HU.po index 886742d..7d4d064 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it_IT.po b/po/it_IT.po index 5f53cb9..464f167 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-01-13 00:15+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -125,4 +126,3 @@ msgstr "Info larghezza finestra" msgid "Info window position" msgstr "Info posizione finestra" - diff --git a/po/nl_NL.po b/po/nl_NL.po index 8969f8d..a88e5d9 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nn_NO.po b/po/nn_NO.po index 22e0e48..80c4e62 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pl_PL.po b/po/pl_PL.po index b0128b8..5ea071a 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 1cf53b4..0438620 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/ro_RO.po b/po/ro_RO.po index c77eeae..1d32d40 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index 2807775..5cc78e0 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sl_SI.po b/po/sl_SI.po index 4ceeb80..fd0af58 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sv_SE.po b/po/sv_SE.po index 530cbf3..53a1a59 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/tr_TR.po b/po/tr_TR.po index 5804237..4fdcabd 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: vdr-osdpip 0.1.0\n" "Report-Msgid-Bugs-To: <andreas.regel@powarman.de>\n" -"POT-Creation-Date: 2010-03-27 14:40+0100\n" +"POT-Creation-Date: 2012-05-16 21:38+0200\n" "PO-Revision-Date: 2010-03-27 14:40+0100\n" "Last-Translator: \n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,33 +23,20 @@ #include "receiver.h" #include "pes.h" #include "setup.h" -#if VDRVERSNUM > 10703 #include "remux.h" -#endif #include <vdr/channels.h> -#if VDRVERSNUM <= 10703 -#include <vdr/remux.h> -#endif #include <vdr/ringbuffer.h> cOsdPipReceiver::cOsdPipReceiver(const cChannel *Channel, cRingBufferFrame *ESBuffer): -#if (APIVERSNUM < 10500) - cReceiver(Channel->Ca(), 0, Channel->Vpid()), -#else - cReceiver(Channel->GetChannelID(), 0, Channel->Vpid()), -#endif + cReceiver(Channel), cThread("osdpip_receiver") { m_TSBuffer = new cRingBufferLinear(MEGABYTE(3), TS_SIZE * 2, true); m_TSBuffer->SetTimeouts(0, 100); m_ESBuffer = ESBuffer; -#if VDRVERSNUM > 10703 m_Remux = new cRemuxPIP(Channel->Vpid(), NULL, NULL, NULL, true); -#else - m_Remux = new cRemux(Channel->Vpid(), NULL, NULL, NULL, true); -#endif m_Active = false; } @@ -28,21 +28,13 @@ class cRingBufferLinear; class cRingBufferFrame; -#if VDRVERSNUM > 10703 class cRemuxPIP; -#else -class cRemux; -#endif class cOsdPipReceiver: public cReceiver, public cThread { private: cRingBufferLinear *m_TSBuffer; cRingBufferFrame *m_ESBuffer; -#if VDRVERSNUM > 10703 cRemuxPIP *m_Remux; -#else - cRemux *m_Remux; -#endif bool m_Active; @@ -21,7 +21,6 @@ #include <vdr/config.h> #include "setup.h" -#include "i18n.h" const int kColorDepths = 5; const int kSizes = 11; |