frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

No longer starting the editing process if no marks have been set

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-05-16 12:46:15 +02:00
parent 6702994adc
commit 7399d8eff4
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -655,3 +655,6 @@ Juri Haberland <juri@koschikode.com>
Alfred Zastrow <vdr@zastrow4u.de> Alfred Zastrow <vdr@zastrow4u.de>
for suggesting to implement separate PausePriority and PauseLifetime parameters for for suggesting to implement separate PausePriority and PauseLifetime parameters for
the recordings created when pausing live video the recordings created when pausing live video
Matthias Raus <matthias-raus@web.de>
for reporting a problem with starting the editing process if no marks have been set

2
HISTORY
View File

@ -2152,3 +2152,5 @@ Video Disk Recorder Revision History
waiting functionality it can call the new SetTimeouts() function. waiting functionality it can call the new SetTimeouts() function.
- Moved the call to cPlugin::Start() further up in vdr.c, to make sure it gets - Moved the call to cPlugin::Start() further up in vdr.c, to make sure it gets
called before trying to learn the keys (problem reported by Oliver Endriss). called before trying to learn the keys (problem reported by Oliver Endriss).
- No longer starting the editing process if no marks have been set (thanks to
Matthias Raus for reporting this one).

18
i18n.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: i18n.c 1.108 2003/05/11 13:54:23 kls Exp $ * $Id: i18n.c 1.109 2003/05/16 12:44:43 kls Exp $
* *
* Translations provided by: * Translations provided by:
* *
@ -1548,6 +1548,22 @@ const tI18nPhrase Phrases[] = {
"Nu pot porni Modul de Transfer!", "Nu pot porni Modul de Transfer!",
"Transfer-Mode nem indítható!", "Transfer-Mode nem indítható!",
}, },
{ "No editing marks defined!",
"Keine Schnittmarken gesetzt!",
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
"",//TODO
},
{ "Can't start editing process!", { "Can't start editing process!",
"Schnitt kann nicht gestartet werden!", "Schnitt kann nicht gestartet werden!",
"Ne morem zaceti urejanja!", "Ne morem zaceti urejanja!",

6
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 1.244 2003/05/11 16:06:05 kls Exp $ * $Id: menu.c 1.245 2003/05/16 12:40:12 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -3494,7 +3494,9 @@ void cReplayControl::EditCut(void)
if (fileName) { if (fileName) {
Hide(); Hide();
if (!cCutter::Active()) { if (!cCutter::Active()) {
if (!cCutter::Start(fileName)) if (!marks.Count())
Interface->Error(tr("No editing marks defined!"));
else if (!cCutter::Start(fileName))
Interface->Error(tr("Can't start editing process!")); Interface->Error(tr("Can't start editing process!"));
else else
Interface->Info(tr("Editing process started")); Interface->Info(tr("Editing process started"));