diff options
| author | Andreas Mair <andreas@vdr-developer.org> | 2010-05-29 15:09:22 +0200 |
|---|---|---|
| committer | Andreas Mair <andreas@vdr-developer.org> | 2010-05-29 15:09:22 +0200 |
| commit | 4029bd046129693af722a2480ff2f23c7b1e012f (patch) | |
| tree | 96929ae4bc362b4923c600156b6354f3a018bcd2 | |
| parent | 61966ead5b86f5791e150d63386f51d58390f497 (diff) | |
| download | vdr-plugin-extrecmenu-4029bd046129693af722a2480ff2f23c7b1e012f.tar.gz vdr-plugin-extrecmenu-4029bd046129693af722a2480ff2f23c7b1e012f.tar.bz2 | |
Version 1.2-test1-am2v1.2-test1-am2
- Adapt cutter thread to VDR v1.7.3.
| -rw-r--r-- | CHANGES.AM | 6 | ||||
| -rw-r--r-- | extrecmenu.c | 2 | ||||
| -rw-r--r-- | mymenurecordings.c | 9 | ||||
| -rw-r--r-- | mymenurecordings.h | 2 | ||||
| -rw-r--r-- | po/ca_ES.po | 20 | ||||
| -rw-r--r-- | po/cs_CZ.po | 20 | ||||
| -rw-r--r-- | po/da_DK.po | 20 | ||||
| -rw-r--r-- | po/de_DE.po | 20 | ||||
| -rw-r--r-- | po/el_GR.po | 20 | ||||
| -rw-r--r-- | po/es_ES.po | 20 | ||||
| -rw-r--r-- | po/et_EE.po | 20 | ||||
| -rw-r--r-- | po/fi_FI.po | 20 | ||||
| -rw-r--r-- | po/fr_FR.po | 20 | ||||
| -rw-r--r-- | po/hr_HR.po | 20 | ||||
| -rw-r--r-- | po/hu_HU.po | 20 | ||||
| -rw-r--r-- | po/it_IT.po | 20 | ||||
| -rw-r--r-- | po/nl_NL.po | 20 | ||||
| -rw-r--r-- | po/nn_NO.po | 20 | ||||
| -rw-r--r-- | po/pl_PL.po | 20 | ||||
| -rw-r--r-- | po/pt_PT.po | 20 | ||||
| -rw-r--r-- | po/ro_RO.po | 20 | ||||
| -rw-r--r-- | po/ru_RU.po | 20 | ||||
| -rw-r--r-- | po/sl_SI.po | 20 | ||||
| -rw-r--r-- | po/sv_SE.po | 20 | ||||
| -rw-r--r-- | po/tr_TR.po | 20 | ||||
| -rw-r--r-- | tools.c | 50 |
26 files changed, 211 insertions, 278 deletions
@@ -1,3 +1,9 @@ +Changes by Andreas Mair <andreas _AT_ vdr-developer.org> + +* 1.2-test1-AM2 +- Adapt cutter thread to VDR v1.7.3. + +* 1.2-test1-AM1 - fixed wrong help keys if selected recording finishes cutting. - plugins/extrecmenu/dircmds.conf for recording directory commands (same as reccmds.conf) - "nice" the action thread. diff --git a/extrecmenu.c b/extrecmenu.c index 1df3d34..f3f59cf 100644 --- a/extrecmenu.c +++ b/extrecmenu.c @@ -11,7 +11,7 @@ using namespace std; -static const char *VERSION = "1.2-test1-am1"; +static const char *VERSION = "1.2-test1-am2"; static const char *DESCRIPTION = tr("Extended recordings menu"); static const char *MAINMENUENTRY = "ExtRecMenu"; diff --git a/mymenurecordings.c b/mymenurecordings.c index dee0276..1563395 100644 --- a/mymenurecordings.c +++ b/mymenurecordings.c @@ -146,6 +146,9 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level) dirismoving=true; name=NULL; filename=Recording->FileName(); +#if VDRVERSNUM >= 10703 + isPesRecording=Recording->IsPesRecording(); +#endif // get the level of this recording level=0; @@ -287,7 +290,7 @@ myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level) else { if(Level>level) // any other - title=""; + title=strdup(""); } } SetText(title); @@ -789,7 +792,11 @@ eOSState myMenuRecordings::Rewind() if(item&&!item->IsDirectory()) { cDevice::PrimaryDevice()->StopReplay(); +#if VDRVERSNUM >= 10703 + cResumeFile ResumeFile(item->FileName(), item->IsPesRecording()); +#else cResumeFile ResumeFile(item->FileName()); +#endif ResumeFile.Delete(); return Play(); } diff --git a/mymenurecordings.h b/mymenurecordings.h index dcbb534..2604775 100644 --- a/mymenurecordings.h +++ b/mymenurecordings.h @@ -4,6 +4,7 @@ class myMenuRecordingsItem:public cOsdItem private: bool dirismoving; bool isdvd; + bool isPesRecording; int level,isdirectory; int totalentries,newentries; char *title; @@ -16,6 +17,7 @@ class myMenuRecordingsItem:public cOsdItem const char *FileName(){return filename;} const char *Name(){return name;} bool IsDirectory(){return name!=NULL;} + bool IsPesRecording(void) const { return isPesRecording; } void IncrementCounter(bool IsNew); bool IsDVD(){return isdvd;} void SetDirIsMoving(bool moving){dirismoving=moving;} diff --git a/po/ca_ES.po b/po/ca_ES.po index c638dd5..d7f139e 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Jordi Vilŕ <jvila@tinet.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -23,9 +23,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -68,6 +65,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -80,21 +80,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -129,9 +126,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 38a9ebd..72fdfc4 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "Rozšířené menu nahrávek" msgid "Rename" msgstr "Přejmenovat" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "Chybné jméno souboru!" @@ -66,6 +63,9 @@ msgstr "Na začátek" msgid "Button$Back" msgstr "Zpět" +msgid "Name" +msgstr "" + msgid "Path" msgstr "Cesta" @@ -78,21 +78,18 @@ msgstr "Velikost" msgid "Error while mounting DVD!" msgstr "Chyba během připojování DVD!" +msgid "Button$Commands" +msgstr "Příkazy" + msgid "Button$Open" msgstr "Otevřít" msgid "Button$Edit" msgstr "Editovat" -msgid "Button$Commands" -msgstr "Příkazy" - msgid "Button$Info" msgstr "Info" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "Vložte prosím DVD %s" @@ -127,9 +124,6 @@ msgstr "Přerušit přesouvání?" msgid "Button$Rename" msgstr "Přejmenovat" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "Smazat" diff --git a/po/da_DK.po b/po/da_DK.po index 18f1426..d213ec1 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 3ba3553..d7663ca 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "Erweitertes Aufzeichnungs-Menü" msgid "Rename" msgstr "Umbenennen" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "Ungültiger Dateiname!" @@ -66,6 +63,9 @@ msgstr "Anfang" msgid "Button$Back" msgstr "Zurück" +msgid "Name" +msgstr "Name" + msgid "Path" msgstr "Pfad" @@ -78,21 +78,18 @@ msgstr "Größe" msgid "Error while mounting DVD!" msgstr "Fehler beim Einhängen der DVD!" +msgid "Button$Commands" +msgstr "Befehle" + msgid "Button$Open" msgstr "Öffnen" msgid "Button$Edit" msgstr "Editieren" -msgid "Button$Commands" -msgstr "Befehle" - msgid "Button$Info" msgstr "Info" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "Bitte DVD %s einlegen" @@ -127,9 +124,6 @@ msgstr "Verschieben abbrechen?" msgid "Button$Rename" msgstr "Umbenennen" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "Löschen" diff --git a/po/el_GR.po b/po/el_GR.po index 86e9949..9d358a2 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 3dc35c6..a9c982c 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index deb6406..a0ca66c 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 74d1af1..4e91323 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -24,9 +24,6 @@ msgstr "Laajennettu tallennevalikko" msgid "Rename" msgstr "Nimeä" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "Virheellinen tiedoston nimi!" @@ -69,6 +66,9 @@ msgstr "Alkuun" msgid "Button$Back" msgstr "Takaisin" +msgid "Name" +msgstr "" + msgid "Path" msgstr "Polku" @@ -81,21 +81,18 @@ msgstr "Koko" msgid "Error while mounting DVD!" msgstr "DVD:n avaaminen epäonnistui!" +msgid "Button$Commands" +msgstr "Komennot" + msgid "Button$Open" msgstr "Avaa" msgid "Button$Edit" msgstr "Muokkaa" -msgid "Button$Commands" -msgstr "Komennot" - msgid "Button$Info" msgstr "Tiedot" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "Laita DVD %s asemaan" @@ -130,9 +127,6 @@ msgstr "Peruutetaanko siirto?" msgid "Button$Rename" msgstr "Nimeä" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "Poista" diff --git a/po/fr_FR.po b/po/fr_FR.po index bd0bb82..b74fae8 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -24,9 +24,6 @@ msgstr "Menu enregistrement étandu" msgid "Rename" msgstr "Renommer" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "Nom de fichiers n'est pas valide'" @@ -69,6 +66,9 @@ msgstr "Début" msgid "Button$Back" msgstr "Retour" +msgid "Name" +msgstr "" + msgid "Path" msgstr "Chemin" @@ -81,21 +81,18 @@ msgstr "Taille" msgid "Error while mounting DVD!" msgstr "Erreur lors du montage du DVD!" +msgid "Button$Commands" +msgstr "Commande" + msgid "Button$Open" msgstr "Ouvrir" msgid "Button$Edit" msgstr "Éditer" -msgid "Button$Commands" -msgstr "Commande" - msgid "Button$Info" msgstr "Info" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "Mettez le DVD %s dans le lecteur" @@ -130,9 +127,6 @@ msgstr "Interrompre le déplacement?" msgid "Button$Rename" msgstr "Renommer" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "Effacer" diff --git a/po/hr_HR.po b/po/hr_HR.po index 8af3d46..222dcd6 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 4d4e503..eba5247 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index f7c9d2c..a0741ac 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Sean Carlos <seanc@libero.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -23,9 +23,6 @@ msgstr "Menu registrazioni esteso" msgid "Rename" msgstr "Rinomina" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "Nome file non valido!" @@ -68,6 +65,9 @@ msgstr "Riavvolgi" msgid "Button$Back" msgstr "Indietro" +msgid "Name" +msgstr "" + msgid "Path" msgstr "Percorso" @@ -80,21 +80,18 @@ msgstr "Dimensione" msgid "Error while mounting DVD!" msgstr "Errore durante montaggio DVD!" +msgid "Button$Commands" +msgstr "Comandi" + msgid "Button$Open" msgstr "Apri" msgid "Button$Edit" msgstr "Modifica" -msgid "Button$Commands" -msgstr "Comandi" - msgid "Button$Info" msgstr "Info" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "Per favore inserisci DVD %s" @@ -129,9 +126,6 @@ msgstr "Anullare spostamento?" msgid "Button$Rename" msgstr "Rinomina" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "Cancella" diff --git a/po/nl_NL.po b/po/nl_NL.po index cbf1cec..1db01a6 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -23,9 +23,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -68,6 +65,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -80,21 +80,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -129,9 +126,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 3a7c070..cf2acab 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index f0107fa..5d84ac6 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 797b633..83269f1 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 80716ff..5277637 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 645f222..e400c8b 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 8791794..26fa03b 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index fceda04..3be40ae 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Tomas Prybil <tomas@prybil.se>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -22,9 +22,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -67,6 +64,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -79,21 +79,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -128,9 +125,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 790e439..bb168c3 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ExtRecMenu 1.2\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2008-03-22 14:57+0100\n" +"POT-Creation-Date: 2008-08-13 08:38+0200\n" "PO-Revision-Date: 2008-03-15 16:21+0100\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -21,9 +21,6 @@ msgstr "" msgid "Rename" msgstr "" -msgid "Name" -msgstr "" - msgid "Invalid filename!" msgstr "" @@ -66,6 +63,9 @@ msgstr "" msgid "Button$Back" msgstr "" +msgid "Name" +msgstr "" + msgid "Path" msgstr "" @@ -78,21 +78,18 @@ msgstr "" msgid "Error while mounting DVD!" msgstr "" -msgid "Button$Open" +msgid "Button$Commands" msgstr "" -msgid "Button$Edit" +msgid "Button$Open" msgstr "" -msgid "Button$Commands" +msgid "Button$Edit" msgstr "" msgid "Button$Info" msgstr "" -msgid "Error while accessing recording!" -msgstr "" - #, c-format msgid "Please insert DVD %s" msgstr "" @@ -127,9 +124,6 @@ msgstr "" msgid "Button$Rename" msgstr "" -msgid "Cancel editing?" -msgstr "" - msgid "Button$Delete" msgstr "" @@ -2,6 +2,7 @@ * See the README file for copyright information and how to reach the author. */ +#include <langinfo.h> #include <string> #include <fstream> #include <iostream> @@ -376,9 +377,39 @@ void WorkerThread::Cut(string From,string To) cMarks frommarks,tomarks; cMark *mark; const char *error=NULL; - uchar filenumber,picturetype,buffer[MAXFRAMESIZE]; - int fileoffset,length,index,currentfilenumber=0,filesize=0,lastiframe=0; + uchar buffer[MAXFRAMESIZE]; + int index,currentfilenumber=0,filesize=0,lastiframe=0; bool lastmark=false,cutin=true; + off_t maxVideoFileSize=MEGABYTE(Setup.MaxVideoFileSize); + +#if VDRVERSNUM >= 10703 + bool isPesRecording; + uint16_t filenumber; + off_t fileoffset; + int length; + bool picturetype; + + cRecording Recording(From.c_str()); + isPesRecording=Recording.IsPesRecording(); + if(frommarks.Load(From.c_str(),Recording.FramesPerSecond(),isPesRecording) && frommarks.Count()) + { + fromfilename=new cFileName(From.c_str(),false,true,isPesRecording); + tofilename=new cFileName(To.c_str(),true,false,isPesRecording); + fromindex=new cIndexFile(From.c_str(),false,isPesRecording); + toindex=new cIndexFile(To.c_str(),true,isPesRecording); + tomarks.Load(To.c_str(),Recording.FramesPerSecond(),isPesRecording); + if(isPesRecording && maxVideoFileSize > MEGABYTE(MAXVIDEOFILESIZEPES)) + maxVideoFileSize=MEGABYTE(MAXVIDEOFILESIZEPES); + } + else + { + esyslog("[extrecmenu] no editing marks found for %s",From.c_str()); + return; + } +#else + uchar filenumber; + int fileoffset,length; + uchar picturetype; if(frommarks.Load(From.c_str()) && frommarks.Count()) { @@ -393,6 +424,8 @@ void WorkerThread::Cut(string From,string To) esyslog("[extrecmenu] no editing marks found for %s",From.c_str()); return; } +#endif + if((mark=frommarks.First())!=NULL) { @@ -440,11 +473,15 @@ void WorkerThread::Cut(string From,string To) error="fromfile"; break; } +#if VDRVERSNUM >= 10703 + if(picturetype) +#else if(picturetype==I_FRAME) +#endif { if(lastmark) break; - if(filesize > MEGABYTE(Setup.MaxVideoFileSize)) + if(filesize > maxVideoFileSize) { tofile=tofilename->NextFile(); if(!tofile) @@ -457,7 +494,14 @@ void WorkerThread::Cut(string From,string To) lastiframe=0; if(cutin) { +#if VDRVERSNUM >= 10703 + if(isPesRecording) + cRemux::SetBrokenLink(buffer,length); + else + TsSetTeiOnBrokenPackets(buffer,length); +#else cRemux::SetBrokenLink(buffer,length); +#endif cutin=false; } } |