mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed printing/scanning values for systems where %ld doesn't work for time_t
This commit is contained in:
Klaus Schmidinger
parent
035d5fd5b9
commit
f859b8d2ae
1
HISTORY
1
HISTORY
@ -9805,3 +9805,4 @@ Video Disk Recorder Revision History
|
||||
to Christoph Haubrich).
|
||||
- Using the frame rate parsed from the stream, with fall back to determining it from
|
||||
PTS values.
|
||||
- Fixed printing/scanning values for systems where %ld doesn't work for time_t.
|
||||
|
||||
6
eit.c
6
eit.c
@ -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 5.4 2021/12/11 20:58:51 kls Exp $
|
||||
* $Id: eit.c 5.5 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
// The various ways in which broadcasters handle (or screw up) their EPG:
|
||||
@ -469,7 +469,7 @@ cTDT::cTDT(const u_char *Data)
|
||||
timespec ts = {};
|
||||
ts.tv_sec = dvbtim;
|
||||
if (clock_settime(CLOCK_REALTIME, &ts) == 0)
|
||||
isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
|
||||
isyslog("system time changed from %s (%jd) to %s (%jd)", *TimeToString(loctim), intmax_t(loctim), *TimeToString(dvbtim), intmax_t(dvbtim));
|
||||
else
|
||||
esyslog("ERROR while setting system time: %m");
|
||||
}
|
||||
@ -479,7 +479,7 @@ cTDT::cTDT(const u_char *Data)
|
||||
delta.tv_sec = diff;
|
||||
delta.tv_usec = 0;
|
||||
if (adjtime(&delta, NULL) == 0)
|
||||
isyslog("system time adjustment initiated from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
|
||||
isyslog("system time adjustment initiated from %s (%jd) to %s (%jd)", *TimeToString(loctim), intmax_t(loctim), *TimeToString(dvbtim), intmax_t(dvbtim));
|
||||
else
|
||||
esyslog("ERROR while adjusting system time: %m");
|
||||
}
|
||||
|
||||
12
epg.c
12
epg.c
@ -7,7 +7,7 @@
|
||||
* Original version (as used in VDR before 1.3.0) written by
|
||||
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
|
||||
*
|
||||
* $Id: epg.c 5.6 2021/04/29 09:19:58 kls Exp $
|
||||
* $Id: epg.c 5.7 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
#include "epg.h"
|
||||
@ -451,7 +451,7 @@ cString cEvent::GetVpsString(void) const
|
||||
void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
|
||||
{
|
||||
if (InfoOnly || startTime + duration + EPG_LINGER_TIME >= time(NULL)) {
|
||||
fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
|
||||
fprintf(f, "%sE %u %jd %d %X %X\n", Prefix, eventID, intmax_t(startTime), duration, tableID, version);
|
||||
if (!isempty(title))
|
||||
fprintf(f, "%sT %s\n", Prefix, title);
|
||||
if (!isempty(shortText))
|
||||
@ -476,7 +476,7 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
|
||||
}
|
||||
}
|
||||
if (vps)
|
||||
fprintf(f, "%sV %ld\n", Prefix, vps);
|
||||
fprintf(f, "%sV %jd\n", Prefix, intmax_t(vps));
|
||||
if (!InfoOnly && !isempty(aux)) {
|
||||
strreplace(aux, '\n', '|');
|
||||
fprintf(f, "%s@ %s\n", Prefix, aux);
|
||||
@ -518,7 +518,7 @@ bool cEvent::Parse(char *s)
|
||||
components = new cComponents;
|
||||
components->SetComponent(components->NumComponents(), t);
|
||||
break;
|
||||
case 'V': SetVps(atoi(t));
|
||||
case 'V': SetVps(atol(t));
|
||||
break;
|
||||
case '@': strreplace(t, '|', '\n');
|
||||
SetAux(t);
|
||||
@ -541,11 +541,11 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule, int &Line)
|
||||
switch (*s) {
|
||||
case 'E': if (!Event) {
|
||||
unsigned int EventID;
|
||||
time_t StartTime;
|
||||
intmax_t StartTime; // actually time_t, but intmax_t for scanning with "%jd"
|
||||
int Duration;
|
||||
unsigned int TableID = 0;
|
||||
unsigned int Version = 0xFF; // actual value is ignored
|
||||
int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
|
||||
int n = sscanf(t, "%u %jd %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
|
||||
if (n >= 3 && n <= 5) {
|
||||
Event = (cEvent *)Schedule->GetEventByTime(StartTime);
|
||||
cEvent *newEvent = NULL;
|
||||
|
||||
8
po/ar.po
8
po/ar.po
@ -1547,15 +1547,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "اغلق الحاسوب"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "تم تسجيل %ld دقيقة سيتم الاغلاق على اى حال"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "تم تسجيل %jd دقيقة سيتم الاغلاق على اى حال"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "الاغلاق على اى حال"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s wakes up in %ld min, continue?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s wakes up in %jd min, continue?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Editing - restart anyway?"
|
||||
|
||||
@ -1546,15 +1546,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Gravant - Apagar de totes maneres?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Hi ha una gravació en %ld minuts - Apagar de totes maneres?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Hi ha una gravació en %jd minuts - Apagar de totes maneres?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "Apagar de totes maneres?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "El plugin %s s'activarà en %ld minuts, continuar?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "El plugin %s s'activarà en %jd minuts, continuar?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Editant - Reiniciar de totes maneres?"
|
||||
|
||||
@ -1546,15 +1546,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Systém nahrává - přesto vypnout?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Nahrávání začne za %ld minut - přesto vypnout?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Nahrávání začne za %jd minut - přesto vypnout?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "přesto vypnout?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Modul %s startuje za %ld min., pokračovat?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Modul %s startuje za %jd min., pokračovat?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Edituji - přesto restartovat?"
|
||||
|
||||
@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Optagelse igang - sluk alligevel?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Optagelse om %ld minutter - sluk alligevel?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Optagelse om %jd minutter - sluk alligevel?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "sluk alligevel?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s vågner om %ld min, fortsæt?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s vågner om %jd min, fortsæt?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Redigering igang - genstart alligevel?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Aufnahme läuft - trotzdem ausschalten?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Aufnahme in %ld Minuten - trotzdem ausschalten?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Aufnahme in %jd Minuten - trotzdem ausschalten?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "trotzdem ausschalten?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s wacht in %ld Min auf, weiter?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s wacht in %jd Min auf, weiter?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Bearbeitung läuft - trotzdem neu starten?"
|
||||
|
||||
@ -1543,14 +1543,14 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Ãßíåôáé åããñáöÞ - ÔåëéêÜ íá ãßíåé ôåñìáôéóìüò?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "ÁíáìÝíåôáé åããñáöÞ óÝ %ld ëåðôÜ - ÔåëéêÜ íá ôåñìáôéóôåß?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "ÁíáìÝíåôáé åããñáöÞ óÝ %jd ëåðôÜ - ÔåëéêÜ íá ôåñìáôéóôåß?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "ÔåëéêÜ íá ãßíåé ôåñìáôéóìüò?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Grabación en curso - ¿apagar igualmente?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Grabación dentro de %ld minutos, ¿apagar igualmente?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Grabación dentro de %jd minutos, ¿apagar igualmente?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "¿apagar igualmente?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s inicia en %ld min, ¿continuar?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s inicia en %jd min, ¿continuar?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Editando - ¿reiniciar igualmente?"
|
||||
|
||||
@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Salvestamine aktiivne - lülitada välja?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Salvestamine algab %ld minuti pärast - lülitada välja?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Salvestamine algab %jd minuti pärast - lülitada välja?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "lülitada välja?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s ärkab %ld minuti pärast, jätkata?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s ärkab %jd minuti pärast, jätkata?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Töötlemine aktiivne - taaskäivitada?"
|
||||
|
||||
@ -1547,15 +1547,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Tallennus kesken - sammutetaanko?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Tallennus alkaa %ld min kuluttua - sammutetaanko?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Tallennus alkaa %jd min kuluttua - sammutetaanko?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "sammutetaanko?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Laajennos %s herää %ld minuutin kuluttua - sammutetaanko?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Laajennos %s herää %jd minuutin kuluttua - sammutetaanko?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Muokkaus kesken - käynnistetäänkö uudelleen?"
|
||||
|
||||
@ -1554,15 +1554,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Enregistrement en cours - confirmer l'arrêt ?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Enregistrement dans %ld minutes - confirmer l'arrêt ?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Enregistrement dans %jd minutes - confirmer l'arrêt ?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "confirmer l'arrêt ?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Le plugin %s démarre dans %ld min, continuer ?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Le plugin %s démarre dans %jd min, continuer ?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Édition en cours - confirmer redémarrage ?"
|
||||
|
||||
@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Snimanje traje - iskljuèiti unatoè?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Snimanje za %ld minuta - iskljuèiti unatoè?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Snimanje za %jd minuta - iskljuèiti unatoè?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "svejedno iskljuèiti?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Dodatak %s se budi u %ld min, nastavi?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Dodatak %s se budi u %jd min, nastavi?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Ureðivanje u tijeku - ponovno pokreni unatoè?"
|
||||
|
||||
@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Felvétel folyamatban - mégis leállítani?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Felvétel %ld perc múlva kezdődik - mégis leállítani?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Felvétel %jd perc múlva kezdődik - mégis leállítani?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "mégis leállítani?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "A(z) %s plugin ébreszt %ld perc múlva, folytatni?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "A(z) %s plugin ébreszt %jd perc múlva, folytatni?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Szerkesztés folyamatban - mégis újraindítani?"
|
||||
|
||||
@ -1549,15 +1549,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Registrazione in corso - spegnere comunque?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Registrazione tra %ld minuti - spegnere comunque?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Registrazione tra %jd minuti - spegnere comunque?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "spegnere comunque?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Il plugin %s si ripristina tra %ld min, continuare?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Il plugin %s si ripristina tra %jd min, continuare?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Modifica in corso - riavviare comunque?"
|
||||
|
||||
@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Įrašinėjama - išjungti vistiek?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Įrašas prasidės po %ld minučių, išjungti vistiek?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Įrašas prasidės po %jd minučių, išjungti vistiek?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "išjungti bet kokiu atveju?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Įskiepas %s aktyvuosis po %ld min, tęsti toliau?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Įskiepas %s aktyvuosis po %jd min, tęsti toliau?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Koreguojama - perkrauti vistiek?"
|
||||
|
||||
@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Снимање во тек - исклучи?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Снимање уште %ld минути - исклучи?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Снимање уште %jd минути - исклучи?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "сеедно исклучи?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Додатокот %s се подига за %ld мин, продолжи?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Додатокот %s се подига за %jd мин, продолжи?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Уредување во тек - рестартирај?"
|
||||
|
||||
@ -1549,15 +1549,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Opname loopt - toch uitschakelen?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Opname in %ld minuten - toch uitschakelen?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Opname in %jd minuten - toch uitschakelen?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "toch uitschakelen?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s wordt binnen %ld min. aktief, doorgaan?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s wordt binnen %jd min. aktief, doorgaan?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Bewerken aktief - toch herstarten?"
|
||||
|
||||
@ -1544,14 +1544,14 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Gjør opptak - slå av likevel?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Skal gjøre opptak om %ld minutter - slå av likevel?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Skal gjøre opptak om %jd minutter - slå av likevel?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "slå av likevel?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
|
||||
@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Trwa nagrywanie - wyłączyć mimo to?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Nagrywanie za %ld minut - wyłączyć mimo to?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Nagrywanie za %jd minut - wyłączyć mimo to?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "wyłączyć mimo to?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Wtyczka %s obudzi się za %ld min, kontynuować?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Wtyczka %s obudzi się za %jd min, kontynuować?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Montaż w trakcie - Zrestartować mimo to?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "A gravar - desligar mesmo assim?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Gravação programada em %ld minutos - desligar mesmo assim?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Gravação programada em %jd minutos - desligar mesmo assim?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "desligar mesmo assim?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "O plugin %s acorda daqui a %ld minuots, continuar?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "O plugin %s acorda daqui a %jd minuots, continuar?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "A editar - reiniciar mesmo assim?"
|
||||
|
||||
@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Tocmai se înregistrează - închid, totuşi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Înregistrez peste %ld minute - închid, totuşi?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Înregistrez peste %jd minute - închid, totuşi?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "închid, totuşi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin-ul %s se va trezi +n %ld min, continui?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin-ul %s se va trezi +n %jd min, continui?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Editarea tocmai se efectuează - repornesc, totuşi?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Идёт запись - действительно выключить?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Через %ld минут начнётся запись - действительно выключить?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Через %jd минут начнётся запись - действительно выключить?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "действительно выключить?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s проснется через %ld минут - продолжить?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s проснется через %jd минут - продолжить?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Процесс монтажа - действительно перезапустить?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Nahráva - aj tak vypnú»?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Nahrávanie zaène za %ld minút - aj tak vypnú»?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Nahrávanie zaène za %jd minút - aj tak vypnú»?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "Urèite vypnú»?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Modul %s sa prebudí za %ld min., pokraèova»?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Modul %s sa prebudí za %jd min., pokraèova»?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Upravuje sa - aj tak re¹tartova»?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Snemanje - zares izklopi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Snemanje èez %ld minut, zares izklopi?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Snemanje èez %jd minut, zares izklopi?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "zares izklopi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Vstavek %s se zbudi v %ld min, nadaljuj?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Vstavek %s se zbudi v %jd min, nadaljuj?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Urejanje - zares ponoven zagon?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Snimanje u toku - svejedno iskljuèi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Snimanje za %ld minuta - svejedno iskljuèi?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Snimanje za %jd minuta - svejedno iskljuèi?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "svejedno iskljuèi?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Dodatak %s se budi za %ld min, nastavi?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Dodatak %s se budi za %jd min, nastavi?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Ureðivanje u toku - svejedno ponovno pokreni?"
|
||||
|
||||
@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Inspelning pågår, vill du avsluta ändå?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Inspelning startar om %ld minuter, vill du avsluta ändå?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Inspelning startar om %jd minuter, vill du avsluta ändå?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "vill du avsluta ändå?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Plugin %s aktiv om %ld min, vill du fortsätta?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Plugin %s aktiv om %jd min, vill du fortsätta?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Editering pågår, vill du starta om ändå?"
|
||||
|
||||
@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Kayýt ediliyor - buna raðmen kapat?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Kayýt %ld dakikada baþlýyor - buna raðmen kapat?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Kayýt %jd dakikada baþlýyor - buna raðmen kapat?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "buna raðmen kapat?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Eklenti %s %ld dakikada açýlýyor, devam et?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Eklenti %s %jd dakikada açýlýyor, devam et?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Kesim aktif - buna raðmen yeniden baþlat?"
|
||||
|
||||
@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "Йде запис - дійсно виключити?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "Через %ld хвилин почнеться запис - дійсно виключити?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "Через %jd хвилин почнеться запис - дійсно виключити?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "дійсно виключити?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "Модуль %s включиться через %ld хвилин - продовжити?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "Модуль %s включиться через %jd хвилин - продовжити?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "Процес монтажу - дійсно перезапустити?"
|
||||
|
||||
@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?"
|
||||
msgstr "录像中,是否立即关机?"
|
||||
|
||||
#, c-format
|
||||
msgid "Recording in %ld minutes, shut down anyway?"
|
||||
msgstr "录像已有 %ld 分钟，立即关机?"
|
||||
msgid "Recording in %jd minutes, shut down anyway?"
|
||||
msgstr "录像已有 %jd 分钟，立即关机?"
|
||||
|
||||
msgid "shut down anyway?"
|
||||
msgstr "是否立即关机?"
|
||||
|
||||
#, c-format
|
||||
msgid "Plugin %s wakes up in %ld min, continue?"
|
||||
msgstr "插件 %s 唤醒在 %ld 分钟，是否继续?"
|
||||
msgid "Plugin %s wakes up in %jd min, continue?"
|
||||
msgstr "插件 %s 唤醒在 %jd 分钟，是否继续?"
|
||||
|
||||
msgid "Editing - restart anyway?"
|
||||
msgstr "编辑中,是否现在重启?"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: recording.c 5.17 2022/11/13 15:20:42 kls Exp $
|
||||
* $Id: recording.c 5.18 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
#include "recording.h"
|
||||
@ -485,11 +485,11 @@ bool cRecordingInfo::Read(FILE *f)
|
||||
break;
|
||||
case 'E': {
|
||||
unsigned int EventID;
|
||||
time_t StartTime;
|
||||
intmax_t StartTime; // actually time_t, but intmax_t for scanning with "%jd"
|
||||
int Duration;
|
||||
unsigned int TableID = 0;
|
||||
unsigned int Version = 0xFF;
|
||||
int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
|
||||
int n = sscanf(t, "%u %jd %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version);
|
||||
if (n >= 3 && n <= 5) {
|
||||
ownEvent->SetEventID(EventID);
|
||||
ownEvent->SetStartTime(StartTime);
|
||||
|
||||
10
shutdown.c
10
shutdown.c
@ -6,7 +6,7 @@
|
||||
*
|
||||
* Original version written by Udo Richter <udo_richter@gmx.de>.
|
||||
*
|
||||
* $Id: shutdown.c 4.2 2018/03/23 15:39:21 kls Exp $
|
||||
* $Id: shutdown.c 5.1 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
#include "shutdown.h"
|
||||
@ -113,7 +113,7 @@ void cShutdownHandler::CheckManualStart(int ManualStart)
|
||||
}
|
||||
else {
|
||||
// Set inactive from now on
|
||||
dsyslog("scheduled wakeup time in %ld minutes, assuming automatic start of VDR", Delta / 60);
|
||||
dsyslog("scheduled wakeup time in %jd minutes, assuming automatic start of VDR", intmax_t(Delta / 60));
|
||||
SetUserInactiveTimeout(-3, true);
|
||||
}
|
||||
}
|
||||
@ -127,7 +127,7 @@ void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand)
|
||||
void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const char *File, bool UserShutdown)
|
||||
{
|
||||
time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0;
|
||||
cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\\\"$"), UserShutdown);
|
||||
cString cmd = cString::sprintf("%s %jd %jd %d \"%s\" %d", shutdownCommand, intmax_t(WakeupTime), intmax_t(Delta), Channel, *strescape(File, "\\\"$"), UserShutdown);
|
||||
isyslog("executing '%s'", *cmd);
|
||||
int Status = SystemExec(cmd, true);
|
||||
if (!WIFEXITED(Status) || WEXITSTATUS(Status))
|
||||
@ -183,7 +183,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive)
|
||||
// Timer within Min Event Timeout
|
||||
if (!Interactive)
|
||||
return false;
|
||||
cString buf = cString::sprintf(tr("Recording in %ld minutes, shut down anyway?"), Delta / 60);
|
||||
cString buf = cString::sprintf(tr("Recording in %jd minutes, shut down anyway?"), intmax_t(Delta / 60));
|
||||
if (!Interface->Confirm(buf))
|
||||
return false;
|
||||
}
|
||||
@ -198,7 +198,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive)
|
||||
// Plugin wakeup within Min Event Timeout
|
||||
if (!Interactive)
|
||||
return false;
|
||||
cString buf = cString::sprintf(tr("Plugin %s wakes up in %ld min, continue?"), Plugin->Name(), Delta / 60);
|
||||
cString buf = cString::sprintf(tr("Plugin %s wakes up in %jd min, continue?"), Plugin->Name(), intmax_t(Delta / 60));
|
||||
if (!Interface->Confirm(buf))
|
||||
return false;
|
||||
}
|
||||
|
||||
6
svdrp.c
6
svdrp.c
@ -10,7 +10,7 @@
|
||||
* and interact with the Video Disk Recorder - or write a full featured
|
||||
* graphical interface that sits on top of an SVDRP connection.
|
||||
*
|
||||
* $Id: svdrp.c 5.5 2022/11/19 15:49:27 kls Exp $
|
||||
* $Id: svdrp.c 5.6 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
#include "svdrp.h"
|
||||
@ -2230,9 +2230,9 @@ void cSVDRPServer::CmdNEXT(const char *Option)
|
||||
if (!*Option)
|
||||
Reply(250, "%d %s", Id, *TimeToString(Start));
|
||||
else if (strcasecmp(Option, "ABS") == 0)
|
||||
Reply(250, "%d %ld", Id, Start);
|
||||
Reply(250, "%d %jd", Id, intmax_t(Start));
|
||||
else if (strcasecmp(Option, "REL") == 0)
|
||||
Reply(250, "%d %ld", Id, Start - time(NULL));
|
||||
Reply(250, "%d %jd", Id, intmax_t(Start - time(NULL)));
|
||||
else
|
||||
Reply(501, "Unknown option: \"%s\"", Option);
|
||||
}
|
||||
|
||||
4
tools.c
4
tools.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: tools.c 5.6 2022/11/04 14:30:01 kls Exp $
|
||||
* $Id: tools.c 5.7 2022/11/22 14:33:48 kls Exp $
|
||||
*/
|
||||
|
||||
#include "tools.h"
|
||||
@ -767,7 +767,7 @@ uint64_t cTimeMs::Now(void)
|
||||
esyslog("cTimeMs: clock_gettime(CLOCK_MONOTONIC) failed");
|
||||
}
|
||||
else
|
||||
dsyslog("cTimeMs: not using monotonic clock - resolution is too bad (%ld s %ld ns)", tp.tv_sec, tp.tv_nsec);
|
||||
dsyslog("cTimeMs: not using monotonic clock - resolution is too bad (%jd s %ld ns)", intmax_t(tp.tv_sec), tp.tv_nsec);
|
||||
}
|
||||
else
|
||||
esyslog("cTimeMs: clock_getres(CLOCK_MONOTONIC) failed");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user