Version 1.4.0

- Fixed handling the "Power" key in case a recording is going on and no plugin
  is active (thanks to Udo Richter; bug reported by Dominique Simon).
- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
- Fixed a memory leak in handling external EPG data (thanks to Tobias Grimm).
- Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm).
- Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
This commit is contained in:
Klaus Schmidinger
2006-04-30 18:00:00 +02:00
parent 56e5836b54
commit 529fc7b48a
9 changed files with 157 additions and 135 deletions

View File

@@ -1420,6 +1420,8 @@ Udo Richter <udo_richter@gmx.de>
for suggesting to add a warning about plugins that don't honor APIVERSION in their
Makefile
for providing a shorter version of the 'sed' expression for extracting APIVERSION
for fixing a bug in handling the "Power" key in case a recording is going on and
no plugin is active
Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date
@@ -1861,6 +1863,8 @@ Richard Lithvall <richard@lithvall.se>
Tobias Grimm <listaccount@e-tobi.net>
for suggesting to use geteuid() to check whether VDR is running as user 'root'
for fixing a memory leak in handling external EPG data
for fixing a memory leak in closing the video file during replay
Helge Lenz <h.lenz@gmx.de>
for reporting a bug in setting the 'Delta' parameter when calling the shutdown
@@ -1886,3 +1890,7 @@ Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
Werner F<>rber <w.faerber@gmx.de>
for reporting a bug in handling the cPluginManager::Active() result when pressing
the "Power" key
Dominique Simon <d.simon@gmx.net>
for reporting a bug in handling the "Power" key in case a recording is going on and
no plugin is active

10
HISTORY
View File

@@ -4677,3 +4677,13 @@ Video Disk Recorder Revision History
- Removed the obsolete "'1' for encrypted radio channels" part from the description
of the VPID in vdr.5 (reported by Alexander Hans).
- Fixed tuning to the channel of a VPS timer if the device is the actual device.
2006-04-30: Version 1.4.0
- Fixed handling the "Power" key in case a recording is going on and no plugin
is active (thanks to Udo Richter; bug reported by Dominique Simon).
- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
- Fixed a memory leak in handling external EPG data (thanks to Tobias Grimm).
- Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm).
- Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).

View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $
* $Id: config.h 1.255 2006/04/29 09:24:07 kls Exp $
*/
#ifndef __CONFIG_H
@@ -21,13 +21,13 @@
// VDR's own version number:
#define VDRVERSION "1.3.49"
#define VDRVERSNUM 10349 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.4.0"
#define VDRVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "1.3.47"
#define APIVERSNUM 10347 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.4.0"
#define APIVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to

6
eit.c
View File

@@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
*
* $Id: eit.c 1.116 2006/04/15 14:11:52 kls Exp $
* $Id: eit.c 1.117 2006/04/29 11:38:37 kls Exp $
*/
#include "eit.h"
@@ -103,8 +103,10 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
cLinkChannels *LinkChannels = NULL;
cComponents *Components = NULL;
for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag)
if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag) {
delete d;
continue;
}
switch (d->getDescriptorTag()) {
case SI::ExtendedEventDescriptorTag: {
SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;

212
i18n.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: i18n.c 1.275 2006/04/28 12:50:04 kls Exp $
* $Id: i18n.c 1.279 2006/04/30 08:51:10 kls Exp $
*
* Translations provided by:
*
@@ -108,7 +108,7 @@ const tI18nPhrase Phrases[] = {
{ "iso8859-15",
"iso8859-15",
"iso8859-2",
"iso8859-1",
"iso8859-15",
"iso8859-15",
"iso8859-1",
"iso8859-1",
@@ -264,7 +264,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording info",
"Aufzeichnung",
"Podatki o snemanju",
"Info Registrazione",
"Informazioni registrazione",
"Opname info",
"",// TODO
"Infos sur l'enregistrement",
@@ -330,7 +330,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording commands",
"Befehle f<>r Aufzeichnungen",
"Ukazi za snemanje",
"Comandi di Registrazione",
"Comandi di registrazione",
"Opname commando's",
"",// TODO
"Commandes d'enregistrement",
@@ -418,7 +418,7 @@ const tI18nPhrase Phrases[] = {
{ "Info",
"Info",
"Info",
"Info",
"Informazioni",
"Info",
"",//TODO
"Info",
@@ -462,16 +462,16 @@ const tI18nPhrase Phrases[] = {
{ "This event - %s",
"Diese Sendung - %s",
"Ta oddaja - %s",
"Quest'evento - %s",
"Questo evento - %s",
"",//TODO
"",//TODO
"Cet <20>v<EFBFBD>nement",
"",//TODO
"T<EFBFBD>m<EFBFBD> tapahtuma - %s",
"Den h<>r s<>ndningen - %s",
"Ta audycja - %s",
"Este evento - %s",
"",//TODO
"",//TODO
"Den h<>r s<>ndningen - %s",
"Aceast<EFBFBD> emisiune - %s",
"",//TODO
"",//TODO
@@ -484,13 +484,13 @@ const tI18nPhrase Phrases[] = {
{ "This event - all channels",
"Diese Sendung - alle Kan<61>le",
"Ta oddaja - vsi kanali",
"Quest'evento - tutti i canali",
"Questo evento - tutti i canali"
"",//TODO
"",//TODO
"Cet <20>v<EFBFBD>nement - toutes les cha<68>nes",
"",//TODO
"T<EFBFBD>m<EFBFBD> tapahtuma - kaikki kanavat",
"",//TODO
"Ta audycja - wszystkie kana<6E>y",
"Este evento - todos los canales",
"",//TODO
"Den h<>r s<>ndningen - alla kanaler",
@@ -512,7 +512,7 @@ const tI18nPhrase Phrases[] = {
"Tous les <20>v<EFBFBD>nements - toutes cha<68>nes",
"",//TODO
"Kaikki tapahtumat - kaikki kanavat",
"",//TODO
"Wszystkie audycje - wszystkie kana<6E>y",
"Todos los eventos - todos los canales",
"",//TODO
"Alla tillf<6C>llen - alla kanaler",
@@ -528,7 +528,7 @@ const tI18nPhrase Phrases[] = {
{ "What's on now?",
"Was l<>uft jetzt?",
"Kaj je na sporedu?",
"In programmazione",
"In programmazione adesso",
"Wat is er nu?",
"Programa actual?",
"Programmes en cours",
@@ -727,7 +727,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Info",
"Info",
"Info",
"Info",
"Informazioni",
"Info",
"",//TODO
"Info",
@@ -793,7 +793,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Rewind",
"Anfang",
"Na za<7A>etek",
"Dall'inizio",
"Riavvolgi",
"Naar begin",
"Rebobinar",
"Retour",
@@ -1057,7 +1057,7 @@ const tI18nPhrase Phrases[] = {
{ "Button$Reset",
"R<EFBFBD>cksetzen",
"Reset",
"Reset",
"Resetta",
"Herstart",
"",//TODO
"R<EFBFBD>initialisation",
@@ -1124,7 +1124,7 @@ const tI18nPhrase Phrases[] = {
{ "Delete channel?",
"Kanal l<>schen?",
"Izbri<EFBFBD>i kanal?",
"Cancello il canale?",
"Cancellare il canale?",
"Kanaal verwijderen?",
"Apagar o canal?",
"Supprimer la cha<68>ne?",
@@ -1139,14 +1139,14 @@ const tI18nPhrase Phrases[] = {
"Esborrar el canal?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>?",
"Obrisati program?",
"Kustutan kanali?",
"Kustutada kanal?",
"Slet kanal?",
"Smazat kan<61>l?",
},
{ "Delete timer?",
"Timer l<>schen?",
"Izbri<EFBFBD>i termin?",
"Cancello il timer?",
"Cancellare il timer?",
"Timer verwijderen?",
"Apagar o timer?",
"Supprimer la programmation?",
@@ -1161,14 +1161,14 @@ const tI18nPhrase Phrases[] = {
"Esborrar el temporitzador?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Obrisati termin?",
"Kustutan taimeri?",
"Kustutada taimer?",
"Slet timer?",
"Smazat <20>asova<76>?",
},
{ "Delete recording?",
"Aufzeichnung l<>schen?",
"Izbri<EFBFBD>i posnetek?",
"Cancello la registrazione?",
"Cancellare la registrazione?",
"Opname verwijderen?",
"Apagar a grava<76><61>o?",
"Supprimer l'enregistrement?",
@@ -1183,14 +1183,14 @@ const tI18nPhrase Phrases[] = {
"Esborrar gravaci<63>?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Obrisati snimku?",
"Kustutan salvestuse?",
"Kustutada salvestus?",
"Slet optagelse?",
"Smazat nahr<68>vku?",
},
{ "Timer still recording - really delete?",
"Timer zeichnet auf - trotzdem l<>schen?",
"Snemanje po terminu - zares izbri<72>i?",
"Timer in registrazione - cancello?",
"Timer in registrazione - cancellare?",
"Timer neemt nog op - toch verwijderen?",
"Timer activo - t<>m a certeza que quer apagar?",
"Enregistrement en cours - confirmez la suppression",
@@ -1205,14 +1205,14 @@ const tI18nPhrase Phrases[] = {
"Temporitzador activat - Esborrar de totes maneres?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Jo<EFBFBD> snimam - zaista obrisati?",
"Salvestus aktiivne - kustutan?",
"Salvestus aktiivne - kustutada?",
"Timerstyret optagelse i gang - slet alligevel?",
"Prob<EFBFBD>h<EFBFBD> nahr<68>v<EFBFBD>n<EFBFBD> - opravdu smazat?",
},
{ "Stop recording?",
"Aufzeichnung beenden?",
"Prekini snemanje?",
"Fermo la registrazione?",
"Fermare la registrazione?",
"Opname stoppen?",
"Parar Grava<76><61>o?",
"Arr<EFBFBD>ter l'enregistrement?",
@@ -1227,14 +1227,14 @@ const tI18nPhrase Phrases[] = {
"Aturar la gravaci<63>?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Zaustaviti snimanje?",
"L<EFBFBD>petan salvestamise?",
"L<EFBFBD>petada salvestamine?",
"Stop optagelse?",
"Ukon<EFBFBD>it nahr<68>v<EFBFBD>n<EFBFBD>?",
},
{ "Cancel editing?",
"Schneiden abbrechen?",
"<EFBFBD>elite prekiniti urejanje?",
"Annullo la modifica?",
"Annullare la modifica?",
"Bewerken afbreken?",
"Cancelar Modifica<63><61>es?",
"Annuler les modifications?",
@@ -1249,14 +1249,14 @@ const tI18nPhrase Phrases[] = {
"Cancel<EFBFBD>lar l'edici<63>?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Otkazati ure<72>ivanje?",
"T<EFBFBD>histan muudatuse?",
"T<EFBFBD>histada muudatus?",
"Afbryd redigering?",
"Zru<EFBFBD>it editaci?",
},
{ "Really restart?",
"Wirklich neu starten?",
"Zares ponoven zagon?",
"Eseguo un riavvio?",
"Eseguire un riavvio?",
"Werkelijk opnieuw starten?",
"Tem a certeza que quer reiniciar?",
"Red<EFBFBD>marrer?",
@@ -1278,7 +1278,7 @@ const tI18nPhrase Phrases[] = {
{ "restart anyway?",
"trotzdem neu starten?",
"zares ponoven zagon?",
"riavvio comunque?",
"riavviare comunque?",
"toch opnieuw starten?",
"quer mesmo reiniciar?",
"red<EFBFBD>marrer?",
@@ -1300,7 +1300,7 @@ const tI18nPhrase Phrases[] = {
{ "shut down anyway?",
"trotzdem ausschalten?",
"zares izklopi?",
"spengo comunque?",
"spegnere comunque?",
"toch uitschakelen?",
"quer mesmo desligar?",
"confirmez l'arr<72>t",
@@ -1315,14 +1315,14 @@ const tI18nPhrase Phrases[] = {
"Apagar de totes maneres?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"svejedno isklju<6A>iti?",
"l<EFBFBD>litan v<>lja?",
"l<EFBFBD>litada v<>lja?",
"sluk alligevel?",
"p<EFBFBD>esto vypnout?",
},
{ "Recording - restart anyway?",
"Aufnahme l<>uft - trotzdem neu starten?",
"Snemanje - zares ponoven zagon?",
"In registrazione - riavvio comunque?",
"In registrazione - riavviare comunque?",
"Opname loopt - toch opnieuw starten?",
"Em grava<76><61>o - quer mesmo reiniciar?",
"Enregistrement en cours - red<65>marrer?",
@@ -1344,7 +1344,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording - shut down anyway?",
"Aufnahme l<>uft - trotzdem ausschalten?",
"Snemanje - zares izklopi?",
"In registrazione - spengo comunque?",
"In registrazione - spegnere comunque?",
"Opname loopt - toch uitschakelen?",
"Em grava<76><61>o - quer mesmo desligar?",
"Enregistrement en cours - confirmez l'arr<72>t",
@@ -1359,14 +1359,14 @@ const tI18nPhrase Phrases[] = {
"Gravant - Apagar de totes maneres?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Snimanje traje - svejedno isklju<6A>iti?",
"Salvestamine aktiivne - l<>litan v<>lja?",
"Salvestamine aktiivne - l<>litada v<>lja?",
"Optagelse igang - sluk alligevel?",
"Syst<EFBFBD>m je zanepr<70>zdn<64>n - p<>esto vypnout?",
},
{ "Recording in %ld minutes, shut down anyway?",
"Aufnahme in %ld Minuten - trotzdem ausschalten?",
"Snemanje <20>ez %ld minut, zares izklopi?",
"Registrazione fra %ld minuti - spengo comunque?",
"Registrazione fra %ld minuti - spegnere comunque?",
"Opname in %ld minuten - toch uitschakelen?",
"Em grava<76><61>o dentro de %ld minutos - quer mesmo desligar?",
"Enregistrement dans %ld minutes - confirmez l'arr<72>t",
@@ -1381,7 +1381,7 @@ const tI18nPhrase Phrases[] = {
"Hi ha una gravaci<63> en %ld minuts - Apagar de totes maneres?",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?",
"Snimanje za %ld minuta - svejedno isklju<6A>iti?",
"Salvestamine algab %ld minuti p<>rast - l<>litan v<>lja?",
"Salvestamine algab %ld minuti p<>rast - l<>litada v<>lja?",
"Optagelse om %ld minutter - sluk alligevel?",
"Nahr<EFBFBD>v<EFBFBD>n<EFBFBD> za<7A>ne za %ld minut - p<>esto vypnout?",
},
@@ -1703,7 +1703,7 @@ const tI18nPhrase Phrases[] = {
"Aucun cryptage",
"",//TODO
"vapaa",
"",//TODO
"nieszyfrowany"
"en abierto",
"",//TODO
"Okodad",
@@ -1725,7 +1725,7 @@ const tI18nPhrase Phrases[] = {
"Crypt<EFBFBD>",
"",//TODO
"salattu",
"",//TODO
"szyfrowany",
"cifrado",
"",//TODO
"krypterad",
@@ -2205,7 +2205,7 @@ const tI18nPhrase Phrases[] = {
{ "Timer is recording!",
"Timer zeichnet gerade auf!",
"Snemanje po terminu!",
"Registrazione da un timer in corso!",
"Registrazione di un timer in corso!",
"Timer is aan het opnemen!",
"Timer a gravar!",
"Enregistrement en cours!",
@@ -2227,7 +2227,7 @@ const tI18nPhrase Phrases[] = {
{ "Error while accessing recording!",
"Fehler beim Ansprechen der Aufzeichnung!",
"Napaka pri dostopu do posnetka!",
"Errore nell'accesso alla registrazione",
"Errore nell'accedere alla registrazione!",
"Fout bij lezen opname!",
"Erro ao aceder <20> grava<76><61>o",
"Impossible d'acc<63>der <20> l'enregistrement",
@@ -2271,7 +2271,7 @@ const tI18nPhrase Phrases[] = {
{ "*** Invalid Channel ***",
"*** Ung<6E>ltiger Kanal ***",
"*** Neznan kanal ***",
"*** CANALE NON VALIDO ***",
"*** Canale NON valido ***",
"*** Ongeldig kanaal ***",
"*** Canal Inv<6E>lido! ***",
"*** Cha<68>ne invalide! ***",
@@ -2293,7 +2293,7 @@ const tI18nPhrase Phrases[] = {
{ "Upcoming VPS recording!",
"VPS-Aufnahme beginnt in K<>rze!",
"Sledi VPS snemanje!",
"Registrazione VPS in esecuzione!",
"Registrazione VPS imminente!",
"",//TODO
"",//TODO
"Enregistrement VPS commence procha<68>nement",
@@ -2469,7 +2469,7 @@ const tI18nPhrase Phrases[] = {
{ "Editing process already active!",
"Schnitt bereits aktiv!",
"Urejanje je <20>e aktivno!",
"Processo di modifica gia` attivo!",
"Processo di modifica gia' attivo!",
"Bewerken is al actief!",
"Processo de modifica<63><61>o j<> activo!",
"Montage d<>j<EFBFBD> en cours!",
@@ -2601,7 +2601,7 @@ const tI18nPhrase Phrases[] = {
{ "Resetting CAM...",
"CAM wird zur<75>ckgesetzt...",
"Resetiram CAM...",
"CAM reimpostato...",
"Reimpostazione modulo CAM...",
"CAM wordt herstart...",
"",//TODO
"R<EFBFBD>initialisation du CAM",
@@ -2667,7 +2667,7 @@ const tI18nPhrase Phrases[] = {
{ "Please enter %d digits!",
"Bitte geben Sie %d Ziffern ein!",
"Prosim vnesite %d <20>tevilk!",
"Inserisci %d digits!",
"Inserire %d cifre!",
"Vul %d cijfers in!",
"",//TODO
"Veuillez entrer %d chiffres!",
@@ -2955,7 +2955,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Language",
"Sprache",
"Jezik",
"Linguaggio",
"Lingua",
"Taal",
"Linguagem",
"Langue",
@@ -2977,7 +2977,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Skin",
"Oberfl<EFBFBD>che",
"Preobleka",
"Skin",
"Stile interfaccia",
"Skin",
"",// TODO
"Skin",
@@ -2999,7 +2999,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Theme",
"Thema",
"Tema",
"Tema",
"Tema colori",
"Thema",
"",// TODO
"Th<EFBFBD>me",
@@ -3043,7 +3043,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Top",
"Oben",
"Zgoraj",
"Alto",
"In alto",
"Boven",
"",// TODO
"Haut",
@@ -3175,7 +3175,7 @@ const tI18nPhrase Phrases[] = {
{ "skin dependent",
"je nach Oberfl<66>che",
"odvisno od preobleke",
"in base allo skin",
"in base allo stile",
"skin afhankelijk",
"",// TODO
"d<EFBFBD>pend du skin",
@@ -3241,7 +3241,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Channel info time (s)",
"Anzeigedauer f<>r Kanalinfo (s)",
"<EFBFBD>as prikaza podatka o kanalu (s)",
"Info orario canale (s)",
"Durata informazioni canale (s)",
"Duur tonen kanaal-informatie (s)",
"",// TODO
"Dur<EFBFBD>e affichage infos cha<68>nes (s)",
@@ -3263,7 +3263,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Info on channel switch",
"Info beim Kanalwechsel",
"Poka<EFBFBD>i naziv kanala",
"Mostra info al cambio canale",
"Mostrare informazioni al cambio canale",
"Kanaal info tonen",
"Mostrar info ao mudar de Canal",
"Affichage progr. en cours",
@@ -3285,7 +3285,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Timeout requested channel info",
"Angeforderte Kanalinfo schlie<69>en",
"<EFBFBD>as prikaza informacije o kanalu",
"Richiesta timeout info canale",
"Scadenza informazioni canale richieste",
"", // TODO
"", // TODO
"Demande d'infos de cha<68>ne termin<69>e",
@@ -3307,7 +3307,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Scroll pages",
"Seitenweise scrollen",
"Drsni meni",
"Scorri pagina nel menu",
"Scorrere per pagine",
"Scrollen per pagina",
"Scroll da p<>gina no menu",
"D<EFBFBD>filement par pages",
@@ -3329,7 +3329,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Scroll wraps",
"Rundum scrollen",
"Iz konca sko<6B>i na za<7A>etek",
"Scrolling testo menu OSD",
"Scorrere riavvolgendo",
"Rondom scrollen",
"",// TODO
"D<EFBFBD>filement rotatif",
@@ -3351,13 +3351,13 @@ const tI18nPhrase Phrases[] = {
{ "Setup.OSD$Menu button closes",
"Menu-Taste schlie<69>t",
"Meni gumb zapre meni",
"Bottone menu bloccato",
"Usare il bottone Menu per chiudere",
"",// TODO
"",// TODO
"Menu bouton ferm<72>",
"",// TODO
"Sulje valikkon<6F>pp<70>imell<6C>",
"",// TODO
"Przycisk Menu zamyka",
"Cerrar al pulsar bot<6F>n de men<65>",
"",// TODO
"Menyknappen st<73>nger",
@@ -3395,7 +3395,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.EPG$EPG scan timeout (h)",
"Zeit bis zur EPG-Aktualisierung (h)",
"<EFBFBD>as do EPG pregleda (h)",
"Timeout scansione EPG (ore)",
"Timeout scansione aggiorn. EPG (ore)",
"EPG-scan Timeout (h)",
"Expirou o EPG (h)",
"Inactivit<EFBFBD> avant rech. EPG (h)",
@@ -3461,7 +3461,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.EPG$Set system time",
"Systemzeit stellen",
"Nastavi sistemski <20>as",
"Settaggio orario automatico",
"Settare orario automatico",
"Systeem klok instellen",
"Ajustar rel<65>gio do sistema",
"Ajuster l'heure du syst<73>me",
@@ -3483,7 +3483,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.EPG$Use time from transponder",
"Transponder f<>r Systemzeit",
"Transponder za nastavitev <20>asa",
"Utilizza orario da transponder",
"Utilizzare orario da transponder",
"Gebruik transponder tijd voor systeem",
"Usar rel<65>gio do transponder",
"Utiliser l'heure de la cha<68>ne",
@@ -3571,7 +3571,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Video display format",
"Video-Anzeigeformat",
"Format video prikaza",
"Formato display video",
"Formato di visualizz. video",
"Video display formaat",
"",//TODO
"Format d'affichage",
@@ -3681,7 +3681,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Use Dolby Digital",
"Dolby-Digital-Ton benutzen",
"Uporabljaj Dolby Digital",
"Usa Dolby Digital",
"Dolby Digital",
"Dolby Digital gebruiken",
"",//TODO
"Utiliser le Dolby Digital",
@@ -3747,13 +3747,13 @@ const tI18nPhrase Phrases[] = {
{ "PIDs only",
"nur PIDs",
"samo PIDe",
"solo PIDs",
"solo PID",
"",// TODO
"",// TODO
"PIDs uniquement",
"",// TODO
"vain PID:it",
"Tylko PID-y",
"tylko PID-y",
"",// TODO
"",// TODO
"bara PIDs",
@@ -3769,7 +3769,7 @@ const tI18nPhrase Phrases[] = {
{ "names and PIDs",
"Namen und PIDs",
"imena in PIDe",
"nomi e PIDs",
"nomi e PID",
"namen en PIDs",
"",// TODO
"noms et PIDs",
@@ -3791,7 +3791,7 @@ const tI18nPhrase Phrases[] = {
{ "add new channels",
"neue Kan<61>le hinzuf<75>gen",
"dodaj nove programe",
"aggiungere canali nuovi",
"nuovi canali",
"nieuwe kanalen toevoegen",
"",// TODO
"ajouter cha<68>nes",
@@ -3806,14 +3806,14 @@ const tI18nPhrase Phrases[] = {
"",// TODO
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"dodaj nove programe",
"lisa uued kanalid",
"uute kanalite lisamine",
"tilf. ny kanaler",
"p<EFBFBD>idat nov<6F> kan<61>ly",
},
{ "add new transponders",
"neue Transponder hinzuf<75>gen",
"dodaj nove oddajnike",
"aggiungere transponder nuovi",
"nuovi transponder",
"nieuwe transponders toevoegen",
"",// TODO
"ajouter transpondeurs",
@@ -3828,14 +3828,14 @@ const tI18nPhrase Phrases[] = {
"",// TODO
"<EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"dodaj nove transpondere", // hrv TODO transponderi == odasilja<6A>i?
"lisa uued transponderid",
"uute transponderite lisamine",
"tilf. ny transp.",
"p<EFBFBD>idat nov<6F> transpond<6E>ry",
},
{ "Setup.DVB$Audio languages", // note the plural
"Audio-Sprachen",
"Jeziki za zvok",
"Lingue Audio",
"Lingue per l'Audio",
"Audio talen",
"",//TODO
"Langues audio",
@@ -3857,7 +3857,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.DVB$Audio language", // note the singular
"Audio-Sprache",
"Jezik za zvok",
"Lingua Audio",
"Lingua per l'Audio",
"Audio taal",
"",//TODO
"Langue audio",
@@ -4143,7 +4143,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Recording$Use episode name",
"Episodenname verwenden",
"Uporabi ime epizode",
"Utilizza il nome dell'episodio",
"Usare nome episodio",
"Gebruik episode naam",
"Utilizar o nome do epis<69>dio",
"Utiliser le nom de l'<27>pisode",
@@ -4165,7 +4165,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Recording$Use VPS",
"VPS benutzen",
"Uporabi VPS",
"Utilizzare VPS",
"Usare VPS",
"VPS gebruiken",
"",// TODO
"Utiliser le VPS",
@@ -4209,7 +4209,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Recording$Mark instant recording",
"Direktaufzeichnung markieren",
"Ozna<EFBFBD>i direktno snemanje",
"Marca la registrazione",
"Marcare registrazione immediata",
"Direkte opnamen markeren",
"Marca de grava<76><61>o r<>pida",
"Marquage enregistr. imm<6D>diats",
@@ -4231,7 +4231,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Recording$Name instant recording",
"Direktaufzeichnung benennen",
"Ime za direktno snemanje",
"Nome registrazione istantanea",
"Nome registrazione immediata",
"Naam direkt-opname",
"Nome de grava<76><61>o r<>pida",
"Noms enregistr. imm<6D>diats",
@@ -4253,7 +4253,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Recording$Instant rec. time (min)",
"Dauer der Direktaufzeichnung (min)",
"<EFBFBD>as direktnega snemanja (min)",
"Tempo registrazione istantanea (min)",
"Tempo registrazione immediata (min)",
"Duur van de directe opname (min)",
"",//TODO
"Dur<EFBFBD>e enregistr. imm<6D>diat (min)",
@@ -4341,7 +4341,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Replay$Show replay mode",
"Wiedergabestatus anzeigen",
"Prika<EFBFBD>i re<72>im predvajanja",
"Modalita' di visualizz. su replay",
"Mostrare modalita' riproduzione",
"Weergave mode aangeven",
"Mostrar modo de replay",
"Affichage mode de lecture",
@@ -4363,7 +4363,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Replay$Resume ID",
"Wiedergabe-ID",
"ID za predvajanje",
"ID Ripresa",
"ID di rispristino",
"Hervattings ID",
"Resume ID",// TODO
"ID de reprise",
@@ -4385,7 +4385,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Min. event timeout (min)",
"Br<EFBFBD>ckenzeit zwischen Timern (min)",
"Najmanj<EFBFBD>i <20>as dogodka (min)",
"Periodo minimo di pausa (min)",
"Scadenza minima evento (min)",
"Minimale event time-out (min)",
"Per<EFBFBD>odo m<>nimo de pausa (min)",
"MinEventTimeout (min)",
@@ -4407,7 +4407,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Min. user inactivity (min)",
"VDR ausschalten bei Inaktivit<69>t (min)",
"Najmanj<EFBFBD>i <20>as neaktivnosti (min)",
"Periodo minimo d'inattivita' (min)",
"Periodo minimo di inattivita' (min)",
"Minimum gebruikers inactiviteit (min)",
"Per<EFBFBD>odo m<>nimo de inactividade (min)",
"Dur<EFBFBD>e minimale d'inact. (min)",
@@ -4429,7 +4429,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$SVDRP timeout (s)",
"SVDRP trennen bei Inaktivit<69>t (s)",
"SVDRP <20>as neaktivnosti (s)",
"Timeout SVDRP (s)",
"Scadenza SVDRP (s)",
"SVDRP Timeout (s)",
"Timeout SVDRP (s)",
"Temps maxi SVDRP (s)",
@@ -4451,7 +4451,7 @@ const tI18nPhrase Phrases[] = {
{ "Setup.Miscellaneous$Zap timeout (s)",
"Mindestzeit f<>r Kanalhistorie (s)",
"<EFBFBD>as ugla<6C>evanja (s)",
"Timeout Zapping",
"Scadenza Zapping (s)",
"Zap timeout (s)",
"",// TODO
"Prise en compte cha<68>ne (s)",
@@ -4585,7 +4585,7 @@ const tI18nPhrase Phrases[] = {
{ " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@",
" a<>bcdefghijklmno<6E>pqrstu<74>vwxyz0123456789-.#~,/_@",
" abc<62>defghijklmnopqrs<72>tuvwxyz<79>0123456789-.#~,/_@",
" a<>bcde<64><65>fghi<68>jklmno<6E>pqrstu<74>vwxyz0123456789-.#~,/_@",
" a<><EFBFBD>bcde<EFBFBD><EFBFBD>fghi<EFBFBD><EFBFBD>jklmno<EFBFBD>pqrstu<EFBFBD>vwxyz0123456789-.#~,/_@",
" abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"",// TODO
" a<>bc<62>de<64><65><EFBFBD>fghi<68>jklmno<6E>pqrstu<74><75>vwxyz0123456789-.#~,/_@",
@@ -4608,7 +4608,7 @@ const tI18nPhrase Phrases[] = {
{ " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9",
" 0\t-.#~,/_@1\tabc<EFBFBD>2\tdef3\tghi4\tjkl5\tmno<EFBFBD>6\tpqrs7\ttuv<EFBFBD>8\twxyz9",
" 0\t-.#~,/_@1\tabc<EFBFBD>2\tdef3\tghi4\tjkl5\tmno6\tpqrs<EFBFBD>7\ttuv8\twxyz<EFBFBD>9",
"",//TODO
" 0\t-.#~,/_@1\ta<EFBFBD>bc2\tde<EFBFBD>f3\tghi<EFBFBD>4\tjkl5\tmno<EFBFBD>6\tpqrs7\ttu<EFBFBD>v8\twxyz9",
"",//TODO
"",//TODO
" 0\t-.#~,/_@1\tabc<EFBFBD><EFBFBD><EFBFBD>2\tdef<EFBFBD><EFBFBD><EFBFBD>3\tghi<EFBFBD><EFBFBD>4\tjkl5\tmno<EFBFBD>6\tpqrs7\ttuv<EFBFBD>8\twxyz9",
@@ -4631,7 +4631,7 @@ const tI18nPhrase Phrases[] = {
{ "Learning Remote Control Keys",
"Fernbedienung anlernen",
"U<EFBFBD>enje kod upravljalca",
"Apprendimento tasti unita` remota",
"Apprendimento tasti unita' remota",
"Leren toetsen afstandsbediening",
"Aprender as teclas do telecomando",
"Apprentissage des codes de t<>l<EFBFBD>commande",
@@ -4668,14 +4668,14 @@ const tI18nPhrase Phrases[] = {
"Fase 1: Detectant el tipus de receptor",
"<EFBFBD><EFBFBD><EFBFBD> 1: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"Faza 1: detektiranje k<>da daljinskog upravlja<6A>a.",
"Aste 1: Kodeerimiss<73>steemi tuvastamine",
"Samm 1: Kodeerimiss<73>steemi tuvastamine",
"Fase 1: Detekterer fjernbetjenings-kodetype",
"F<EFBFBD>ze 1: Detekce typu k<>du",
},
{ "Press any key on the RC unit",
"Eine Taste auf der Fernbedienung dr<64>cken",
"Pritisnite tipko na upravljalcu",
"Premere un tasto dell'unita` RC",
"Premere un tasto dell'unita' RC",
"Druk op een willekeurige knop",
"Pressione qualquer tecla do telecomando",
"Appuyer sur une touche de la t<>l<EFBFBD>commande",
@@ -4756,7 +4756,7 @@ const tI18nPhrase Phrases[] = {
"Fase 2: Aprenentantge de les funcions",
"<EFBFBD><EFBFBD><EFBFBD> 2: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"Faza 2: U<>enje posebnih k<>dova",
"Aste 2: Klahvide <20>petamine",
"Samm 2: Klahvide <20>petamine",
"Fase 2: L<>r individuelle tast koder",
"F<EFBFBD>ze 2: U<>en<65> konkr<6B>tn<74>ho k<>du kl<6B>ves",
},
@@ -4910,7 +4910,7 @@ const tI18nPhrase Phrases[] = {
"Fase 3: Guardant els codis de les tecles",
"<EFBFBD><EFBFBD><EFBFBD> 3: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"Faza 3: Spremanje k<>dova tipki",
"Aste 3: Klavhikoodide salvestamine",
"Samm 3: Klavhikoodide salvestamine",
"Fase 3: Gemmer tast koder",
"F<EFBFBD>ze 3: Ulo<6C>en<65> k<>d<EFBFBD>",
},
@@ -5182,7 +5182,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Info",
"Info",
"Info",
"",//TODO
"Informazioni",
"Info",
"",//TODO
"Info",
@@ -5204,7 +5204,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Play",
"Wiedergabe",
"Predvajaj",
"Riproduci",
"Riproduzione",
"Weergeven",
"",// TODO
"Lecture",
@@ -5270,7 +5270,7 @@ const tI18nPhrase Phrases[] = {
{ "Key$Record",
"Aufnehmen",
"Snemaj",
"Registra",
"Registrazione",
"Opnemen",
"",// TODO
"Enregistrement",
@@ -5645,7 +5645,7 @@ const tI18nPhrase Phrases[] = {
{ "auto",
"auto",
"avtomatsko",
"auto",
"automatico",
"auto",
"",// TODO
"auto",
@@ -5667,7 +5667,7 @@ const tI18nPhrase Phrases[] = {
{ "top",
"oben",
"zgoraj",
"limite sup.",
"in alto",
"boven",
"topo",
"haut",
@@ -5689,7 +5689,7 @@ const tI18nPhrase Phrases[] = {
{ "bottom",
"unten",
"spodaj",
"limite inf.",
"in basso",
"onder",
"fundo",
"bas",
@@ -5799,7 +5799,7 @@ const tI18nPhrase Phrases[] = {
{ " Stop replaying", // note the leading blank!
" Wiedergabe beenden",
" Prekini predvajanje",
" Interrompi riproduzione",
" Stop riproduzione",
" Stop afspelen",
" Parar reprodu<64><75>o",
" Arr<72>ter la lecture",
@@ -5814,14 +5814,14 @@ const tI18nPhrase Phrases[] = {
" Aturar la reproducci<63>",
" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
" Prekini reprodukciju",
" L<>peta taasesitamine",
" L<>petada taasesitamine",
" Stop afspilning",
" Zastavit p<>ehr<68>v<EFBFBD>n<EFBFBD>",
},
{ " Stop recording ", // note the leading and trailing blanks!
" Aufzeichnung beenden ",
" Prekini snemanje ",
" Interrompi registrazione ",
" Stop registrazione ",
" Stop opnemen ",
" Parar grava<76><61>o ",
" Arr<72>ter l'enregistrement ",
@@ -5836,14 +5836,14 @@ const tI18nPhrase Phrases[] = {
" Aturar la gravaci<63> ",
" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ",
" Prekini snimanje ",
" L<>peta salvestamine ",
" L<>petada salvestamine ",
" Stop optagelse ",
" Zastavit nahr<68>v<EFBFBD>n<EFBFBD> ",
},
{ " Cancel editing", // note the leading blank!
" Schneiden abbrechen",
" Prekini urejanje",
" Annulla modifiche",
" Annullare modifiche",
" Bewerken afbreken",
" Anular modifica<63><61>o",
" Annuler le montage",
@@ -5858,7 +5858,7 @@ const tI18nPhrase Phrases[] = {
" Cancel<65>lar l'edici<63> ",
" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
" Prekini ure<72>ivanje",
" Katkesta monteerimine",
" Katkestada monteerimine",
" Afbryd redigering",
" Zru<72>it editaci",
},
@@ -5975,7 +5975,7 @@ const tI18nPhrase Phrases[] = {
{ "Recording started",
"Aufzeichnung gestartet",
"Snemanje se je pri<72>elo",
"Registrazione iniziata",
"Registrazione avviata",
"",//TODO
"",//TODO
"Enregistrement a commenc<6E>",
@@ -6019,7 +6019,7 @@ const tI18nPhrase Phrases[] = {
{ "Starting EPG scan",
"Aktualisiere EPG-Daten",
"Pri<EFBFBD>enjam EPG-scan",
"Scan EPG iniziato",
"Inizio scansione EPG",
"Bezig met starten EPG scan",
"",// TODO
"Mise <20> jour du guide des programmes",
@@ -6041,7 +6041,7 @@ const tI18nPhrase Phrases[] = {
{ "This plugin has no setup parameters!",
"Dieses Plugin hat keine Parameter!",
"Ta vstavek nima nastavitvenih parametrov!",
"Questo plugin non ha parametri di setup!",
"Questo plugin non ha parametri di configurazione!",
"Deze plugin heeft geen instelparameters",
"",// TODO
"Ce plugin n'a pas de param<61>tres!",
@@ -6085,7 +6085,7 @@ const tI18nPhrase Phrases[] = {
{ "ST:TNG Panels",
"ST:TNG-Konsolen",
"ST:TNG Konsola",
"Pannelli ST:TNG",
"Consolle ST:TNG",
"ST:TNG Consoles",
"",// TODO
"Consoles ST:TNG",
@@ -6107,7 +6107,7 @@ const tI18nPhrase Phrases[] = {
{ "No title",
"Kein Titel",
"Brez naziva",
"Nessun titolo",
"Senza titolo",
"Geen titel",
"",// TODO
"Sans titre",

View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 1.147 2006/04/23 10:43:06 kls Exp $
* $Id: recording.c 1.148 2006/04/29 13:22:20 kls Exp $
*/
#include "recording.h"
@@ -1436,7 +1436,7 @@ cUnbufferedFile *cFileName::Open(void)
void cFileName::Close(void)
{
if (file) {
if ((record && CloseVideoFile(file) < 0) || (!record && file->Close() < 0))
if (CloseVideoFile(file) < 0)
LOG_ERROR_STR(fileName);
file = NULL;
}

4
vdr.1
View File

@@ -8,9 +8,9 @@
.\" License as specified in the file COPYING that comes with the
.\" vdr distribution.
.\"
.\" $Id: vdr.1 1.24 2006/04/28 13:06:35 kls Exp $
.\" $Id: vdr.1 1.25 2006/04/30 08:55:12 kls Exp $
.\"
.TH vdr 1 "28 Apr 2006" "1.4.0" "Video Disk Recorder"
.TH vdr 1 "30 Apr 2006" "1.4.0" "Video Disk Recorder"
.SH NAME
vdr - the Video Disk Recorder
.SH SYNOPSIS

4
vdr.5
View File

@@ -8,9 +8,9 @@
.\" License as specified in the file COPYING that comes with the
.\" vdr distribution.
.\"
.\" $Id: vdr.5 1.58 2006/04/28 13:06:54 kls Exp $
.\" $Id: vdr.5 1.59 2006/04/30 08:55:16 kls Exp $
.\"
.TH vdr 5 "28 Apr 2006" "1.4.0" "Video Disk Recorder Files"
.TH vdr 5 "30 Apr 2006" "1.4.0" "Video Disk Recorder Files"
.SH NAME
vdr file formats - the Video Disk Recorder Files
.SH DESCRIPTION

34
vdr.c
View File

@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
* $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $
* $Id: vdr.c 1.267 2006/04/29 09:14:06 kls Exp $
*/
#include <getopt.h>
@@ -970,21 +970,23 @@ int main(int argc, char *argv[])
}
break;
// Power off:
case kPower: isyslog("Power button pressed");
DELETE_MENU;
if (!Shutdown) {
Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
break;
}
if (cRecordControls::Active()) {
if (Interface->Confirm(tr("Recording - shut down anyway?")))
ForceShutdown = true;
}
if (!cPluginManager::Active(tr("shut down anyway?")))
ForceShutdown = true;
LastActivity = 1; // not 0, see below!
UserShutdown = true;
break;
case kPower:
isyslog("Power button pressed");
DELETE_MENU;
if (!Shutdown) {
Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
break;
}
LastActivity = 1; // not 0, see below!
UserShutdown = true;
if (cRecordControls::Active()) {
if (!Interface->Confirm(tr("Recording - shut down anyway?")))
break;
}
if (cPluginManager::Active(tr("shut down anyway?")))
break;
ForceShutdown = true;
break;
default: break;
}
Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time