1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

An ongoing editing process is now canceled if either the original or the edited version of the recording is deleted from the Recordings menu

This commit is contained in:
Klaus Schmidinger 2012-02-16 12:20:46 +01:00
parent 3432b2638c
commit 26d2fe51d1
33 changed files with 156 additions and 48 deletions

View File

@ -6847,7 +6847,7 @@ Video Disk Recorder Revision History
- Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4 - Fixed cRecordings::DelByName() to avoid compilation errors with gcc 4.4
(backport from version 1.7.9, thanks to Ralf Schueler). (backport from version 1.7.9, thanks to Ralf Schueler).
2012-02-15: Version 1.7.24 2012-02-16: Version 1.7.24
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received. - Fixed a high load in case a transponder can't be received.
@ -6877,3 +6877,5 @@ Video Disk Recorder Revision History
(reported by Uwe Scheffler). (reported by Uwe Scheffler).
- Removed superfluous calls to SetVideoFormat() from device constructors. This - Removed superfluous calls to SetVideoFormat() from device constructors. This
function is called in cDevice::SetPrimaryDevice(), anyway. function is called in cDevice::SetPrimaryDevice(), anyway.
- An ongoing editing process is now canceled if either the original or the edited
version of the recording is deleted from the Recordings menu.

View File

@ -4,10 +4,11 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: cutter.c 2.10 2011/12/04 12:55:53 kls Exp $ * $Id: cutter.c 2.11 2012/02/16 12:08:39 kls Exp $
*/ */
#include "cutter.h" #include "cutter.h"
#include "menu.h"
#include "recording.h" #include "recording.h"
#include "remux.h" #include "remux.h"
#include "videodir.h" #include "videodir.h"
@ -197,7 +198,8 @@ void cCuttingThread::Action(void)
// --- cCutter --------------------------------------------------------------- // --- cCutter ---------------------------------------------------------------
cMutex cCutter::mutex; cMutex cCutter::mutex;
char *cCutter::editedVersionName = NULL; cString cCutter::originalVersionName;
cString cCutter::editedVersionName;
cCuttingThread *cCutter::cuttingThread = NULL; cCuttingThread *cCutter::cuttingThread = NULL;
bool cCutter::error = false; bool cCutter::error = false;
bool cCutter::ended = false; bool cCutter::ended = false;
@ -208,6 +210,7 @@ bool cCutter::Start(const char *FileName)
if (!cuttingThread) { if (!cuttingThread) {
error = false; error = false;
ended = false; ended = false;
originalVersionName = FileName;
cRecording Recording(FileName); cRecording Recording(FileName);
cMarks FromMarks; cMarks FromMarks;
@ -229,7 +232,7 @@ bool cCutter::Start(const char *FileName)
} }
free(s); free(s);
// XXX // XXX
editedVersionName = strdup(evn); editedVersionName = evn;
Recording.WriteInfo(); Recording.WriteInfo();
Recordings.AddByName(editedVersionName, false); Recordings.AddByName(editedVersionName, false);
cuttingThread = new cCuttingThread(FileName, editedVersionName); cuttingThread = new cCuttingThread(FileName, editedVersionName);
@ -246,27 +249,29 @@ void cCutter::Stop(void)
const char *Error = cuttingThread ? cuttingThread->Error() : NULL; const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
delete cuttingThread; delete cuttingThread;
cuttingThread = NULL; cuttingThread = NULL;
if ((Interrupted || Error) && editedVersionName) { if ((Interrupted || Error) && *editedVersionName) {
if (Interrupted) if (Interrupted)
isyslog("editing process has been interrupted"); isyslog("editing process has been interrupted");
if (Error) if (Error)
esyslog("ERROR: '%s' during editing process", Error); esyslog("ERROR: '%s' during editing process", Error);
RemoveVideoFile(editedVersionName); //XXX what if this file is currently being replayed? if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), editedVersionName) == 0)
cControl::Shutdown();
RemoveVideoFile(editedVersionName);
Recordings.DelByName(editedVersionName); Recordings.DelByName(editedVersionName);
} }
} }
bool cCutter::Active(void) bool cCutter::Active(const char *FileName)
{ {
cMutexLock MutexLock(&mutex); cMutexLock MutexLock(&mutex);
if (cuttingThread) { if (cuttingThread) {
if (cuttingThread->Active()) if (cuttingThread->Active())
return true; return !FileName || strcmp(FileName, originalVersionName) == 0 || strcmp(FileName, editedVersionName) == 0;
error = cuttingThread->Error(); error = cuttingThread->Error();
Stop(); Stop();
if (!error) if (!error)
cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName); cRecordingUserCommand::InvokeCommand(RUC_EDITEDRECORDING, editedVersionName);
free(editedVersionName); originalVersionName = NULL;
editedVersionName = NULL; editedVersionName = NULL;
ended = true; ended = true;
} }

View File

@ -4,27 +4,32 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: cutter.h 2.2 2010/08/29 13:32:33 kls Exp $ * $Id: cutter.h 2.3 2012/02/16 12:05:33 kls Exp $
*/ */
#ifndef __CUTTER_H #ifndef __CUTTER_H
#define __CUTTER_H #define __CUTTER_H
#include "thread.h" #include "thread.h"
#include "tools.h"
class cCuttingThread; class cCuttingThread;
class cCutter { class cCutter {
private: private:
static cMutex mutex; static cMutex mutex;
static char *editedVersionName; static cString originalVersionName;
static cString editedVersionName;
static cCuttingThread *cuttingThread; static cCuttingThread *cuttingThread;
static bool error; static bool error;
static bool ended; static bool ended;
public: public:
static bool Start(const char *FileName); static bool Start(const char *FileName);
static void Stop(void); static void Stop(void);
static bool Active(void); static bool Active(const char *FileName = NULL);
///< Returns true if the cutter is currently active.
///< If a FileName is given, true is only returned if either the
///< original or the edited file name is equal to FileName.
static bool Error(void); static bool Error(void);
static bool Ended(void); static bool Ended(void);
}; };

14
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 2.35 2012/01/14 13:06:03 kls Exp $ * $Id: menu.c 2.36 2012/02/16 11:57:51 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2383,9 +2383,19 @@ eOSState cMenuRecordings::Delete(void)
} }
cRecording *recording = GetRecording(ri); cRecording *recording = GetRecording(ri);
if (recording) { if (recording) {
if (cCutter::Active(ri->FileName())) {
if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
cCutter::Stop();
recording = Recordings.GetByName(ri->FileName()); // cCutter::Stop() might have deleted it if it was the edited version
// we continue with the code below even if recording is NULL,
// in order to have the menu updated etc.
}
else
return osContinue;
}
if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0) if (cReplayControl::NowReplaying() && strcmp(cReplayControl::NowReplaying(), ri->FileName()) == 0)
cControl::Shutdown(); cControl::Shutdown();
if (recording->Delete()) { if (!recording || recording->Delete()) {
cReplayControl::ClearLastReplayed(ri->FileName()); cReplayControl::ClearLastReplayed(ri->FileName());
Recordings.DelByName(ri->FileName()); Recordings.DelByName(ri->FileName());
cOsdMenu::Del(Current()); cOsdMenu::Del(Current());

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.0\n" "Project-Id-Version: VDR 1.7.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n" "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n" "Language-Team: Arabic <ar@li.org>\n"
@ -756,6 +756,9 @@ msgstr "حدث خطاء عند محاولة الوصول لتسجيلات"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "حذف التسجيل" msgstr "حذف التسجيل"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "حدث خطاء عند محاولة حذف التسجيل" msgstr "حدث خطاء عند محاولة حذف التسجيل"

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "Error a l'accedir a la gravaci
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Esborrar gravació?" msgstr "Esborrar gravació?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Error a l'esborrar la gravació!" msgstr "Error a l'esborrar la gravació!"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.14\n" "Project-Id-Version: VDR 1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n" "Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n" "Language-Team: Czech <vdr@linuxtv.org>\n"
@ -746,6 +746,9 @@ msgstr "Chyba při přístupu k nahrávkám!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Smazat nahrávku?" msgstr "Smazat nahrávku?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Chyba při mazání nahrávky!" msgstr "Chyba při mazání nahrávky!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n" "Language-Team: Danish <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Fejl ved l
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Slet optagelse?" msgstr "Slet optagelse?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Fejl ved sletning af optagelse!" msgstr "Fejl ved sletning af optagelse!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n" "PO-Revision-Date: 2010-01-16 16:46+0100\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n" "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Fehler beim Ansprechen der Aufzeichnung!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Aufzeichnung löschen?" msgstr "Aufzeichnung löschen?"
msgid "Recording is being edited - really delete?"
msgstr "Aufzeichnung wird geschnitten - trotzdem löschen?"
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Fehler beim Löschen der Aufzeichnung!" msgstr "Fehler beim Löschen der Aufzeichnung!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n" "Language-Team: Greek <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "
msgid "Delete recording?" msgid "Delete recording?"
msgstr "ÄéáãñáöÞ åããñáöÞò?" msgstr "ÄéáãñáöÞ åããñáöÞò?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "ËÜèïò êáôÜ ôÞí äéáãñáöÞ ôïõ áñ÷åßïõ!" msgstr "ËÜèïò êáôÜ ôÞí äéáãñáöÞ ôïõ áñ÷åßïõ!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "
msgid "Delete recording?" msgid "Delete recording?"
msgstr "¿Eliminar grabacion?" msgstr "¿Eliminar grabacion?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "¡Error al borrar la grabación!" msgstr "¡Error al borrar la grabación!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Salvestuse taasesitus nurjus!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Kustutada salvestus?" msgstr "Kustutada salvestus?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Salvestuse kustutamine nurjus!" msgstr "Salvestuse kustutamine nurjus!"

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "Tallenteen toistaminen epäonnistui!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Poistetaanko tallenne?" msgstr "Poistetaanko tallenne?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Tallenteen poistaminen epäonnistui!" msgstr "Tallenteen poistaminen epäonnistui!"

View File

@ -13,7 +13,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-02-27 18:14+0100\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n"
"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n" "Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
"Language-Team: French <vdr@linuxtv.org>\n" "Language-Team: French <vdr@linuxtv.org>\n"
@ -750,6 +750,9 @@ msgstr "Impossible d'acc
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Supprimer l'enregistrement ?" msgstr "Supprimer l'enregistrement ?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Erreur de suppression de l'enregistrement !" msgstr "Erreur de suppression de l'enregistrement !"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n" "Language-Team: Croatian <vdr@linuxtv.org>\n"
@ -746,6 +746,9 @@ msgstr "Gre
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Obrisati snimku?" msgstr "Obrisati snimku?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Gre¹ka pri brisanju snimke!" msgstr "Gre¹ka pri brisanju snimke!"

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2012-01-02 11:54+0200\n" "PO-Revision-Date: 2012-01-02 11:54+0200\n"
"Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "Hiba a felv
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Felvétel törlése?" msgstr "Felvétel törlése?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Hiba a felvétel törlésénél!" msgstr "Hiba a felvétel törlésénél!"

View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2012-01-15 19:11+0100\n" "PO-Revision-Date: 2012-01-15 19:11+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n" "Language-Team: Italian <vdr@linuxtv.org>\n"
@ -751,6 +751,9 @@ msgstr "Errore accesso alla registrazione!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Eliminare la registrazione?" msgstr "Eliminare la registrazione?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Errore eliminazione registrazione!" msgstr "Errore eliminazione registrazione!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.16\n" "Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-10-30 11:55+0200\n" "PO-Revision-Date: 2010-10-30 11:55+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Klaida atidarant įrašą!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Ištrinti įrašą?" msgstr "Ištrinti įrašą?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Klaida trinant įrašą!" msgstr "Klaida trinant įrašą!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR-1.7.14\n" "Project-Id-Version: VDR-1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-03-11 00:54+0100\n" "PO-Revision-Date: 2010-03-11 00:54+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n" "Language-Team: Macedonian <en@li.org>\n"
@ -745,6 +745,9 @@ msgstr "Грешка при пристап до снимката!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Избриши снимка?" msgstr "Избриши снимка?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Грешка при бришење на снимката!" msgstr "Грешка при бришење на снимката!"

View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n" "Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n"
@ -748,6 +748,9 @@ msgstr "Fout bij lezen opname!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Opname verwijderen?" msgstr "Opname verwijderen?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Fout bij verwijderen opname!" msgstr "Fout bij verwijderen opname!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n" "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "Feil under lesing av opptak!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Slette opptak?" msgstr "Slette opptak?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Feil under sletting av opptak!" msgstr "Feil under sletting av opptak!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n" "Language-Team: Polish <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "Bl
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Usun±æ nagranie?" msgstr "Usun±æ nagranie?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Bl±d podczas usuwania nagrania!" msgstr "Bl±d podczas usuwania nagrania!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.15\n" "Project-Id-Version: VDR 1.7.15\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n" "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n" "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "Erro a aceder
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Eliminar gravação?" msgstr "Eliminar gravação?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Erro a eliminar gravação!" msgstr "Erro a eliminar gravação!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.12\n" "Project-Id-Version: VDR 1.7.12\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2011-03-10 23:52+0100\n" "PO-Revision-Date: 2011-03-10 23:52+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "Eroare la accesarea
msgid "Delete recording?" msgid "Delete recording?"
msgstr "ªterg înregistrarea?" msgstr "ªterg înregistrarea?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Eroare la ºtergerea înregistrãrii!" msgstr "Eroare la ºtergerea înregistrãrii!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-12-15 14:37+0100\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n" "Language-Team: Russian <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "
msgid "Delete recording?" msgid "Delete recording?"
msgstr "ÁâÕàÕâì ×ÐßØáì?" msgstr "ÁâÕàÕâì ×ÐßØáì?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "¾èØÑÚÐ ãÔÐÛÕÝØï ×ÐßØáØ!" msgstr "¾èØÑÚÐ ãÔÐÛÕÝØï ×ÐßØáØ!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.16\n" "Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2011-02-15 16:29+0100\n" "PO-Revision-Date: 2011-02-15 16:29+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Chyba pri pr
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Zmaza» nahrávku?" msgstr "Zmaza» nahrávku?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Pri vymazávaní nahrávky pri¹lo k chybe!" msgstr "Pri vymazávaní nahrávky pri¹lo k chybe!"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-02-28 19:44+0100\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@ -745,6 +745,9 @@ msgstr "Napaka pri dostopu do posnetka!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Izbri¹i posnetek?" msgstr "Izbri¹i posnetek?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Napaka pri brisanju posnetka!" msgstr "Napaka pri brisanju posnetka!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.1\n" "Project-Id-Version: VDR 1.7.1\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2011-01-09 15:57+0100\n" "PO-Revision-Date: 2011-01-09 15:57+0100\n"
"Last-Translator: Milan Cvijanoviæ <elcom_cvijo@hotmail.com>\n" "Last-Translator: Milan Cvijanoviæ <elcom_cvijo@hotmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n"
@ -753,6 +753,9 @@ msgstr "Gre
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Obri¹i snimku?" msgstr "Obri¹i snimku?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Gre¹ka prilikom brisanja snimke!" msgstr "Gre¹ka prilikom brisanja snimke!"

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-03-12 18:25+0100\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n"
"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n" "Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "Inspelningen g
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Ta bort inspelningen?" msgstr "Ta bort inspelningen?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Inspelningen går inte att ta bort!" msgstr "Inspelningen går inte att ta bort!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Kay
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Kayýtý sil?" msgstr "Kayýtý sil?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Kayýt silme hatasý!" msgstr "Kayýt silme hatasý!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.7.7\n" "Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2010-04-25 16:35+0200\n" "PO-Revision-Date: 2010-04-25 16:35+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@ -744,6 +744,9 @@ msgstr "Помилка доступу до запису!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "Витерти запис?" msgstr "Витерти запис?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "Помилка видалення запису!" msgstr "Помилка видалення запису!"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.6.0\n" "Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2012-01-14 14:06+0100\n" "POT-Creation-Date: 2012-02-16 13:18+0100\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n" "PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n" "Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n" "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@ -747,6 +747,9 @@ msgstr "存取录像错误!"
msgid "Delete recording?" msgid "Delete recording?"
msgstr "是否删除录像?" msgstr "是否删除录像?"
msgid "Recording is being edited - really delete?"
msgstr ""
msgid "Error while deleting recording!" msgid "Error while deleting recording!"
msgstr "删除录像错误!" msgstr "删除录像错误!"

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: recording.c 2.47 2012/02/13 11:49:43 kls Exp $ * $Id: recording.c 2.48 2012/02/16 11:53:13 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -1217,11 +1217,13 @@ void cRecordings::DelByName(const char *FileName)
char *ext = strrchr(recording->fileName, '.'); char *ext = strrchr(recording->fileName, '.');
if (ext) { if (ext) {
strncpy(ext, DELEXT, strlen(ext)); strncpy(ext, DELEXT, strlen(ext));
if (access(recording->FileName(), F_OK) == 0) {
recording->fileSizeMB = DirSizeMB(recording->FileName()); recording->fileSizeMB = DirSizeMB(recording->FileName());
recording->deleted = time(NULL); recording->deleted = time(NULL);
DeletedRecordings.Add(recording); DeletedRecordings.Add(recording);
recording = NULL; // to prevent it from being deleted below
}
} }
else
delete recording; delete recording;
ChangeState(); ChangeState();
TouchUpdate(); TouchUpdate();