diff options
164 files changed, 636 insertions, 204 deletions
@@ -3,6 +3,9 @@ VDR Plugin 'epgsearch' Revision History 2008-xx-xx; Version 0.9.25 new: +- Search timers now have a new action "Ask for switching". This announces the + event via OSD right before it starts and lets you switch to its channel with 'Ok'. + Switch timers now have the same option. - new internal variables: * %day%, %month% and %year% which return the numeric day, month and year (with century) of an event @@ -3,6 +3,9 @@ VDR Plugin 'epgsearch' Revision History 2008-xx-xx; Version 0.9.25 neu: +- Suchtimer haben nun eine neue Aktion "Umschalten erfragen". Damit wird eine Sendung + via OSD kurz vor ihrem Start angekündigt. Mit 'Ok' kann zum entsprechenden Kanal + gewechselt werden. Umschalttimer haben die gleiche Option erhalten. - neue interne Variablen: * %day%, %month% und %year% liefern den numerische Tag, das Monat und das Jahr (mit Jahrhundert) einer Sendung @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/blacklist.c b/blacklist.c index 3838019..5780182 100644 --- a/blacklist.c +++ b/blacklist.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/blacklist.h b/blacklist.h index a4b189a..86fefa0 100644 --- a/blacklist.h +++ b/blacklist.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/confdloader.c b/confdloader.c index 24732bd..344eca5 100644 --- a/confdloader.c +++ b/confdloader.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/confdloader.h b/confdloader.h index 12b6909..4bd2498 100644 --- a/confdloader.h +++ b/confdloader.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/conflictcheck.c b/conflictcheck.c index 2c29b38..ccb4e9c 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/conflictcheck.h b/conflictcheck.h index 2264dcb..1f0639d 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/conflictcheck_thread.c b/conflictcheck_thread.c index 05426dc..6aaf3bb 100644 --- a/conflictcheck_thread.c +++ b/conflictcheck_thread.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/conflictcheck_thread.h b/conflictcheck_thread.h index 62ec9d2..01e73fc 100644 --- a/conflictcheck_thread.h +++ b/conflictcheck_thread.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/conflictcheckonly.c b/conflictcheckonly.c index 53c5796..10516ce 100644 --- a/conflictcheckonly.c +++ b/conflictcheckonly.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/createcats.c b/createcats.c index ec2f774..2a5a9be 100644 --- a/createcats.c +++ b/createcats.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt index f7bac61..020a2df 100644 --- a/doc-src/de/epgsearch.1.txt +++ b/doc-src/de/epgsearch.1.txt @@ -271,9 +271,11 @@ aktiv sein soll. Standard ist 'Aufnehmen', also das Erzeugen eines Timers für das Suchergebnis. Man kann aber auch wählen, dass nur eine Ankündigung -der Sendung per OSD vorgenommen werden soll. Eine weitere -Möglichkeit ist 'nur umschalten'. Dadurch wird automatisch eine -Minute vor Beginn der Sendung auf deren Kanal gewechselt. +der Sendung per OSD vorgenommen werden soll, sobald diese gefunden wird. +Eine weitere Möglichkeit ist 'nur umschalten'. Dadurch wird automatisch eine +Minute vor Beginn der Sendung auf deren Kanal gewechselt. Ebenso kann +mit 'Ankündigen und Umschalten' die Sendung vor ihrem Beginn angekündigt werden +und mit 'Ok' zum entsprechenden Kanal gewechselt werden. =item - B<Serienaufnahme:> @@ -1159,7 +1161,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearch.conf.5.txt b/doc-src/de/epgsearch.conf.5.txt index d7b6cea..c41a280 100644 --- a/doc-src/de/epgsearch.conf.5.txt +++ b/doc-src/de/epgsearch.conf.5.txt @@ -115,7 +115,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchblacklists.conf.5.txt b/doc-src/de/epgsearchblacklists.conf.5.txt index b7abddd..ec7d80d 100644 --- a/doc-src/de/epgsearchblacklists.conf.5.txt +++ b/doc-src/de/epgsearchblacklists.conf.5.txt @@ -44,7 +44,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchcats.conf.5.txt b/doc-src/de/epgsearchcats.conf.5.txt index 06c06d4..565ca60 100644 --- a/doc-src/de/epgsearchcats.conf.5.txt +++ b/doc-src/de/epgsearchcats.conf.5.txt @@ -113,7 +113,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchchangrps.conf.5.txt b/doc-src/de/epgsearchchangrps.conf.5.txt index e9593a0..8dfdc7f 100644 --- a/doc-src/de/epgsearchchangrps.conf.5.txt +++ b/doc-src/de/epgsearchchangrps.conf.5.txt @@ -45,7 +45,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchcmds.conf.5.txt b/doc-src/de/epgsearchcmds.conf.5.txt index cd6d6e9..af618fc 100644 --- a/doc-src/de/epgsearchcmds.conf.5.txt +++ b/doc-src/de/epgsearchcmds.conf.5.txt @@ -50,7 +50,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchdirs.conf.5.txt b/doc-src/de/epgsearchdirs.conf.5.txt index 64eac22..1a4a657 100644 --- a/doc-src/de/epgsearchdirs.conf.5.txt +++ b/doc-src/de/epgsearchdirs.conf.5.txt @@ -70,7 +70,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchmenu.conf.5.txt b/doc-src/de/epgsearchmenu.conf.5.txt index e914d7e..fcef430 100644 --- a/doc-src/de/epgsearchmenu.conf.5.txt +++ b/doc-src/de/epgsearchmenu.conf.5.txt @@ -105,7 +105,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchswitchtimers.conf.5.txt b/doc-src/de/epgsearchswitchtimers.conf.5.txt index fcd36a1..8a8ecaa 100644 --- a/doc-src/de/epgsearchswitchtimers.conf.5.txt +++ b/doc-src/de/epgsearchswitchtimers.conf.5.txt @@ -46,7 +46,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchtemplates.conf.5.txt b/doc-src/de/epgsearchtemplates.conf.5.txt index e3f3703..bac23c0 100644 --- a/doc-src/de/epgsearchtemplates.conf.5.txt +++ b/doc-src/de/epgsearchtemplates.conf.5.txt @@ -32,7 +32,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/de/epgsearchuservars.conf.5.txt b/doc-src/de/epgsearchuservars.conf.5.txt index 56d7afd..0984fac 100644 --- a/doc-src/de/epgsearchuservars.conf.5.txt +++ b/doc-src/de/epgsearchuservars.conf.5.txt @@ -161,7 +161,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LIZENZ -Copyright © 2004-2008 Christian Wieninger +Copyright © 2004-2009 Christian Wieninger Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation diff --git a/doc-src/en/createcats.1.txt b/doc-src/en/createcats.1.txt index 671668e..8c08c44 100644 --- a/doc-src/en/createcats.1.txt +++ b/doc-src/en/createcats.1.txt @@ -96,7 +96,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt index 6d60076..e18820a 100644 --- a/doc-src/en/epgsearch.1.txt +++ b/doc-src/en/epgsearch.1.txt @@ -270,8 +270,10 @@ or not. =item - B<Action:> Default action is creating a timer for the search results. But you can -also choose to simply announce the found event via OSD or to switch -to the event one minute before it starts. +also choose to simply announce the found event via OSD as soon as it is found +or to automatically switch to the event before it starts. It's also possible to +get an announcement via OSD before the event starts and to switch to its channel +with 'Ok'. =item - B<Serial recording:> @@ -1095,7 +1097,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt index 884685a..e70b396 100644 --- a/doc-src/en/epgsearch.4.txt +++ b/doc-src/en/epgsearch.4.txt @@ -897,7 +897,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt index 09e34d3..265bc24 100644 --- a/doc-src/en/epgsearch.conf.5.txt +++ b/doc-src/en/epgsearch.conf.5.txt @@ -123,7 +123,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchblacklists.conf.5.txt b/doc-src/en/epgsearchblacklists.conf.5.txt index ddaaf96..407ea5d 100644 --- a/doc-src/en/epgsearchblacklists.conf.5.txt +++ b/doc-src/en/epgsearchblacklists.conf.5.txt @@ -47,7 +47,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchcats.conf.5.txt b/doc-src/en/epgsearchcats.conf.5.txt index 6830294..8a07bbd 100644 --- a/doc-src/en/epgsearchcats.conf.5.txt +++ b/doc-src/en/epgsearchcats.conf.5.txt @@ -108,7 +108,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchchangrps.conf.5.txt b/doc-src/en/epgsearchchangrps.conf.5.txt index 1b50d53..9bff499 100644 --- a/doc-src/en/epgsearchchangrps.conf.5.txt +++ b/doc-src/en/epgsearchchangrps.conf.5.txt @@ -41,7 +41,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchcmds.conf.5.txt b/doc-src/en/epgsearchcmds.conf.5.txt index 786acce..37a0256 100644 --- a/doc-src/en/epgsearchcmds.conf.5.txt +++ b/doc-src/en/epgsearchcmds.conf.5.txt @@ -48,7 +48,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchdirs.conf.5.txt b/doc-src/en/epgsearchdirs.conf.5.txt index 6018792..e26bec2 100644 --- a/doc-src/en/epgsearchdirs.conf.5.txt +++ b/doc-src/en/epgsearchdirs.conf.5.txt @@ -79,7 +79,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchmenu.conf.5.txt b/doc-src/en/epgsearchmenu.conf.5.txt index 4a82294..9381011 100644 --- a/doc-src/en/epgsearchmenu.conf.5.txt +++ b/doc-src/en/epgsearchmenu.conf.5.txt @@ -119,7 +119,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchswitchtimers.conf.5.txt b/doc-src/en/epgsearchswitchtimers.conf.5.txt index 69d554f..fee0a89 100644 --- a/doc-src/en/epgsearchswitchtimers.conf.5.txt +++ b/doc-src/en/epgsearchswitchtimers.conf.5.txt @@ -48,7 +48,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchtemplates.conf.5.txt b/doc-src/en/epgsearchtemplates.conf.5.txt index ddbdb72..125c834 100644 --- a/doc-src/en/epgsearchtemplates.conf.5.txt +++ b/doc-src/en/epgsearchtemplates.conf.5.txt @@ -35,7 +35,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/epgsearchuservars.conf.5.txt b/doc-src/en/epgsearchuservars.conf.5.txt index 91fa34b..4d819e8 100644 --- a/doc-src/en/epgsearchuservars.conf.5.txt +++ b/doc-src/en/epgsearchuservars.conf.5.txt @@ -157,7 +157,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc-src/en/noannounce.conf.5.txt b/doc-src/en/noannounce.conf.5.txt index 2633365..40439d8 100644 --- a/doc-src/en/noannounce.conf.5.txt +++ b/doc-src/en/noannounce.conf.5.txt @@ -46,7 +46,7 @@ L<http://www.vdr-developer.org/mailman/listinfo/epgsearch> =head1 COPYRIGHT and LICENSE -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearch.c b/epgsearch.c index 767e8b7..1646454 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include <langinfo.h> #endif -static const char VERSION[] = "0.9.25.beta8"; +static const char VERSION[] = "0.9.25.beta9"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals @@ -353,7 +353,7 @@ bool cPluginEpgsearch::Service(const char *Id, void *Data) cSwitchTimer *lTimer = SwitchTimers.InSwitchList(serviceData->event); if (lTimer) { serviceData->switchMinsBefore = lTimer->switchMinsBefore; - serviceData->announceOnly = lTimer->announceOnly; + serviceData->mode = lTimer->mode; } // if serviceData->success=lTimer!=NULL; break; @@ -362,10 +362,10 @@ bool cPluginEpgsearch::Service(const char *Id, void *Data) cSwitchTimer *lTimer = SwitchTimers.InSwitchList(serviceData->event); if (lTimer) { lTimer->switchMinsBefore = serviceData->switchMinsBefore; - lTimer->announceOnly = serviceData->announceOnly; + lTimer->mode = serviceData->mode; } else { cMutexLock SwitchTimersLock(&SwitchTimers); - SwitchTimers.Add(new cSwitchTimer(serviceData->event,serviceData->switchMinsBefore,serviceData->announceOnly)); + SwitchTimers.Add(new cSwitchTimer(serviceData->event,serviceData->switchMinsBefore,serviceData->mode)); SwitchTimers.Save(); cSwitchTimerThread::Init(); } // if diff --git a/epgsearch.h b/epgsearch.h index 930e7b0..dbb9f57 100644 --- a/epgsearch.h +++ b/epgsearch.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchcats.c b/epgsearchcats.c index 5a6effb..e988e1d 100644 --- a/epgsearchcats.c +++ b/epgsearchcats.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchcats.h b/epgsearchcats.h index 304a5a8..9a939a3 100644 --- a/epgsearchcats.h +++ b/epgsearchcats.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchcfg.c b/epgsearchcfg.c index c72a6f3..8678ce1 100644 --- a/epgsearchcfg.c +++ b/epgsearchcfg.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchcfg.h b/epgsearchcfg.h index bbe2119..a466278 100644 --- a/epgsearchcfg.h +++ b/epgsearchcfg.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchext.c b/epgsearchext.c index 38db993..fa9ad71 100644 --- a/epgsearchext.c +++ b/epgsearchext.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchext.h b/epgsearchext.h index 6d0929e..dda5e15 100644 --- a/epgsearchext.h +++ b/epgsearchext.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -49,7 +49,8 @@ typedef enum { searchTimerActionRecord=0, searchTimerActionAnnounceOnly, - searchTimerActionSwitchOnly + searchTimerActionSwitchOnly, + searchTimerActionAnnounceAndSwitch } searchTimerAction; class cSearchExt; diff --git a/epgsearchonly.c b/epgsearchonly.c index dbd5396..0f0c077 100644 --- a/epgsearchonly.c +++ b/epgsearchonly.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchservices.h b/epgsearchservices.h index 4e26fb4..f8784a7 100644 --- a/epgsearchservices.h +++ b/epgsearchservices.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchsetup.c b/epgsearchsetup.c index 2332a94..14ae56c 100644 --- a/epgsearchsetup.c +++ b/epgsearchsetup.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchsetup.h b/epgsearchsetup.h index dc8203a..eb94c37 100644 --- a/epgsearchsetup.h +++ b/epgsearchsetup.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchsvdrp.c b/epgsearchsvdrp.c index dd29ad2..9420b46 100644 --- a/epgsearchsvdrp.c +++ b/epgsearchsvdrp.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchtools.c b/epgsearchtools.c index 13439a1..068aa39 100644 --- a/epgsearchtools.c +++ b/epgsearchtools.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/epgsearchtools.h b/epgsearchtools.h index 10b9c1a..7451b0d 100644 --- a/epgsearchtools.h +++ b/epgsearchtools.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/i18n-template.h b/i18n-template.h index d30c748..7d8197f 100644 --- a/i18n-template.h +++ b/i18n-template.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/mainmenushortcut.c b/mainmenushortcut.c index e025b15..7ef8bc4 100644 --- a/mainmenushortcut.c +++ b/mainmenushortcut.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/mainmenushortcut.h b/mainmenushortcut.h index 8451eef..237c9d4 100644 --- a/mainmenushortcut.h +++ b/mainmenushortcut.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_announcelist.c b/menu_announcelist.c index 9bd8d3e..2da6ec6 100644 --- a/menu_announcelist.c +++ b/menu_announcelist.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_announcelist.h b/menu_announcelist.h index b2ba85d..ab8a2a0 100644 --- a/menu_announcelist.h +++ b/menu_announcelist.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_blacklistedit.c b/menu_blacklistedit.c index 7dbf948..d1acdcb 100644 --- a/menu_blacklistedit.c +++ b/menu_blacklistedit.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_blacklistedit.h b/menu_blacklistedit.h index a400319..e70b9c7 100644 --- a/menu_blacklistedit.h +++ b/menu_blacklistedit.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_blacklists.c b/menu_blacklists.c index ef0fab2..783d501 100644 --- a/menu_blacklists.c +++ b/menu_blacklists.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_blacklists.h b/menu_blacklists.h index 3381669..96ab917 100644 --- a/menu_blacklists.h +++ b/menu_blacklists.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_commands.c b/menu_commands.c index 2b5069e..bf1b38d 100644 --- a/menu_commands.c +++ b/menu_commands.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_commands.h b/menu_commands.h index 3819168..9347283 100644 --- a/menu_commands.h +++ b/menu_commands.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c index b0c3f11..6b63667 100644 --- a/menu_conflictcheck.c +++ b/menu_conflictcheck.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_conflictcheck.h b/menu_conflictcheck.h index 689d800..9c4d317 100644 --- a/menu_conflictcheck.h +++ b/menu_conflictcheck.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_deftimercheckmethod.c b/menu_deftimercheckmethod.c index ac7147b..741e3fe 100644 --- a/menu_deftimercheckmethod.c +++ b/menu_deftimercheckmethod.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_deftimercheckmethod.h b/menu_deftimercheckmethod.h index 1979e6c..69e0537 100644 --- a/menu_deftimercheckmethod.h +++ b/menu_deftimercheckmethod.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_dirselect.c b/menu_dirselect.c index 8a590f9..40353ee 100644 --- a/menu_dirselect.c +++ b/menu_dirselect.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_dirselect.h b/menu_dirselect.h index 2d6d116..e1b7c32 100644 --- a/menu_dirselect.h +++ b/menu_dirselect.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_event.c b/menu_event.c index 619f772..afbf2d3 100644 --- a/menu_event.c +++ b/menu_event.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_event.h b/menu_event.h index 130c372..7fa407f 100644 --- a/menu_event.h +++ b/menu_event.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_favorites.c b/menu_favorites.c index f6ab507..b0a923f 100644 --- a/menu_favorites.c +++ b/menu_favorites.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_favorites.h b/menu_favorites.h index 01d43ac..9b45d57 100644 --- a/menu_favorites.h +++ b/menu_favorites.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_main.c b/menu_main.c index 4da04dc..e3a5e39 100644 --- a/menu_main.c +++ b/menu_main.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_main.h b/menu_main.h index 720e3e6..a68faf1 100644 --- a/menu_main.h +++ b/menu_main.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_myedittimer.c b/menu_myedittimer.c index 168a07a..6f12ab0 100644 --- a/menu_myedittimer.c +++ b/menu_myedittimer.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_myedittimer.h b/menu_myedittimer.h index 81e5896..92c3357 100644 --- a/menu_myedittimer.h +++ b/menu_myedittimer.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_quicksearch.c b/menu_quicksearch.c index af5a6b2..16e0be0 100644 --- a/menu_quicksearch.c +++ b/menu_quicksearch.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_quicksearch.h b/menu_quicksearch.h index 66911b8..0e5ffcc 100644 --- a/menu_quicksearch.h +++ b/menu_quicksearch.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_recsdone.c b/menu_recsdone.c index 9478655..558ccad 100644 --- a/menu_recsdone.c +++ b/menu_recsdone.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_recsdone.h b/menu_recsdone.h index 3fbf50f..2fce23d 100644 --- a/menu_recsdone.h +++ b/menu_recsdone.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_search.c b/menu_search.c index 04661eb..59d1f5a 100644 --- a/menu_search.c +++ b/menu_search.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_search.h b/menu_search.h index 8afe533..b273135 100644 --- a/menu_search.h +++ b/menu_search.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchactions.c b/menu_searchactions.c index 7a85994..f47acd6 100644 --- a/menu_searchactions.c +++ b/menu_searchactions.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchactions.h b/menu_searchactions.h index 231064e..965c98f 100644 --- a/menu_searchactions.h +++ b/menu_searchactions.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchedit.c b/menu_searchedit.c index e66429b..e7af17a 100644 --- a/menu_searchedit.c +++ b/menu_searchedit.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -74,6 +74,7 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem SearchTimerModes[0] = strdup(tr("Record")); SearchTimerModes[1] = strdup(tr("Announce only")); SearchTimerModes[2] = strdup(tr("Switch only")); + SearchTimerModes[3] = strdup(tr("Announce and switch")); BlacklistModes[0] = strdup(trVDR("no")); BlacklistModes[1] = strdup(tr("Selection")); @@ -304,12 +305,17 @@ void cMenuEditSearchExt::Set() Add(new cMenuEditStraItem( tr("Use as search timer"), &data.useAsSearchTimer, 3, SearchActiveModes)); if (data.useAsSearchTimer) { - Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 3, SearchTimerModes)); + Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 4, SearchTimerModes)); if (data.action == searchTimerActionSwitchOnly) { Add(new cMenuEditIntItem(IndentMenuItem(tr("Switch ... minutes before start")), &data.switchMinsBefore, 0, 99)); Add(new cMenuEditBoolItem(IndentMenuItem(tr("Unmute sound")), &data.unmuteSoundOnSwitch, trVDR("no"), trVDR("yes"))); } + if (data.action == searchTimerActionAnnounceAndSwitch) + { + Add(new cMenuEditIntItem(IndentMenuItem(tr("Ask ... minutes before start")), &data.switchMinsBefore, 0, 99)); + Add(new cMenuEditBoolItem(IndentMenuItem(tr("Unmute sound")), &data.unmuteSoundOnSwitch, trVDR("no"), trVDR("yes"))); + } if (data.action == searchTimerActionRecord) { Add(new cMenuEditBoolItem( tr(" Series recording"), &data.useEpisode, trVDR("no"), trVDR("yes"))); diff --git a/menu_searchedit.h b/menu_searchedit.h index 34505a1..7ae867c 100644 --- a/menu_searchedit.h +++ b/menu_searchedit.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -48,7 +48,7 @@ protected: char *SearchModes[6]; char *DaysOfWeek[8]; char *UseChannelSel[4]; - char *SearchTimerModes[3]; + char *SearchTimerModes[4]; char *BlacklistModes[3]; char *DelModes[3]; char *SearchActiveModes[3]; diff --git a/menu_searchresults.c b/menu_searchresults.c index 10ea447..c1aaaf7 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchresults.h b/menu_searchresults.h index 848d609..7eb2888 100644 --- a/menu_searchresults.h +++ b/menu_searchresults.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchtemplate.c b/menu_searchtemplate.c index 91ecd7b..30fdb46 100644 --- a/menu_searchtemplate.c +++ b/menu_searchtemplate.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_searchtemplate.h b/menu_searchtemplate.h index a00a873..7c13bcf 100644 --- a/menu_searchtemplate.h +++ b/menu_searchtemplate.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_switchtimers.c b/menu_switchtimers.c index 17346b7..dcea747 100644 --- a/menu_switchtimers.c +++ b/menu_switchtimers.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch // --- cMenuEditSwitchTimer -------------------------------------------------------- class cMenuEditSwitchTimer : public cOsdMenu { private: + char *SwitchModes[3]; cSwitchTimer *switchTimer; cSwitchTimer data; bool addIfConfirmed; @@ -39,12 +40,16 @@ public: cMenuEditSwitchTimer::cMenuEditSwitchTimer(cSwitchTimer* SwitchTimer, bool New) :cOsdMenu(tr("Edit entry"),30) { - switchTimer = SwitchTimer; - addIfConfirmed = New; - if (switchTimer) + SwitchModes[0] = strdup(tr("Switch")); + SwitchModes[1] = strdup(tr("Announce only")); + SwitchModes[2] = strdup(tr("Announce and switch")); + + switchTimer = SwitchTimer; + addIfConfirmed = New; + if (switchTimer) { - data = *switchTimer; - Set(); + data = *switchTimer; + Set(); } } @@ -53,13 +58,19 @@ void cMenuEditSwitchTimer::Set() int current = Current(); Clear(); - Add(new cMenuEditIntItem(tr("Switch ... minutes before start"), &data.switchMinsBefore, 0, 99)); + Add(new cMenuEditStraItem(tr("Action"), &data.mode, 3, SwitchModes)); + if (data.mode == 0) // always switch + Add(new cMenuEditIntItem(tr("Switch ... minutes before start"), &data.switchMinsBefore, 0, 99)); + if (data.mode == 1) // only announce + Add(new cMenuEditIntItem(tr("Announce ... minutes before start"), &data.switchMinsBefore, 0, 99)); + if (data.mode == 2) // ask for switching + Add(new cMenuEditIntItem(tr("Ask ... minutes before start"), &data.switchMinsBefore, 0, 99)); + cString info = cString::sprintf("%s:\t%s", tr("action at"), TIMESTRING(data.event->StartTime() - 60 * data.switchMinsBefore)); cOsdItem* pInfoItem = new cOsdItem(info); pInfoItem->SetSelectable(false); Add(pInfoItem); - Add(new cMenuEditBoolItem(tr("Announce only"), &data.announceOnly, trVDR("no"), trVDR("yes"))); Add(new cMenuEditBoolItem(tr("Unmute sound"), &data.unmute, trVDR("no"), trVDR("yes"))); SetCurrent(Get(current)); } @@ -67,9 +78,11 @@ void cMenuEditSwitchTimer::Set() eOSState cMenuEditSwitchTimer::ProcessKey(eKeys Key) { int iOldMinsBefore = data.switchMinsBefore; + int iOldMode = data.mode; eOSState state = cOsdMenu::ProcessKey(Key); - if (iOldMinsBefore != data.switchMinsBefore) + if (iOldMinsBefore != data.switchMinsBefore || + iOldMode != data.mode) { time_t now = time(NULL); if (data.event->StartTime() - 60 * data.switchMinsBefore < now) @@ -122,7 +135,7 @@ void cMenuSwitchTimerItem::Set(void) cChannel* channel = Channels.GetByChannelID(event->ChannelID(),true,true); - msprintf(&buffer, "%s\t%d\t%s\t%s\t%d\'\t%s~%s", switchTimer->announceOnly?"":">", channel?channel->Number():-1, datebuf, TIMESTRING(startTime), switchTimer->switchMinsBefore, event->Title()?event->Title():"", event->ShortText()?event->ShortText():""); + msprintf(&buffer, "%s\t%d\t%s\t%s\t%d\'\t%s~%s", switchTimer->mode==1?"":">", channel?channel->Number():-1, datebuf, TIMESTRING(startTime), switchTimer->switchMinsBefore, event->Title()?event->Title():"", event->ShortText()?event->ShortText():""); SetText(buffer, false); } @@ -231,7 +244,7 @@ eOSState cMenuSwitchTimers::ProcessKey(eKeys Key) if (CurrentSwitchTimer()) { cSwitchTimer* switchTimer = CurrentSwitchTimer(); - switchTimer->announceOnly = 1 - switchTimer->announceOnly; + switchTimer->mode = switchTimer->mode==1?2:1; cMutexLock SwitchTimersLock(&SwitchTimers); SwitchTimers.Save(); RefreshCurrent(); diff --git a/menu_switchtimers.h b/menu_switchtimers.h index db6c305..60f544d 100644 --- a/menu_switchtimers.h +++ b/menu_switchtimers.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_templateedit.c b/menu_templateedit.c index a8316ce..29d9cde 100644 --- a/menu_templateedit.c +++ b/menu_templateedit.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_templateedit.h b/menu_templateedit.h index 4b41825..dc0f414 100644 --- a/menu_templateedit.h +++ b/menu_templateedit.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_timersdone.c b/menu_timersdone.c index 2eae286..5865cc1 100644 --- a/menu_timersdone.c +++ b/menu_timersdone.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_timersdone.h b/menu_timersdone.h index f7ace24..8443261 100644 --- a/menu_timersdone.h +++ b/menu_timersdone.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/menu_whatson.c b/menu_whatson.c index 0af9cf7..cdc5b6f 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -180,7 +180,7 @@ bool cMenuMyScheduleItem::Update(bool Force) if (event && inSwitchList) { cSwitchTimer* s = SwitchTimers.InSwitchList(event); - t[0] = (s && s->announceOnly)?'s':'S'; + t[0] = (s && s->mode==1)?'s':'S'; } if (EPGSearchConfig.WarEagle && isUTF8) { diff --git a/menu_whatson.h b/menu_whatson.h index 07a721e..2b5c015 100644 --- a/menu_whatson.h +++ b/menu_whatson.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/noannounce.c b/noannounce.c index b208e9f..6ce8ed2 100644 --- a/noannounce.c +++ b/noannounce.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/noannounce.h b/noannounce.h index ebe2155..e497b03 100644 --- a/noannounce.h +++ b/noannounce.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/po/ca_ES.po b/po/ca_ES.po index 34cd9ff..4d1b512 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Jordi Vilà <jvila@tinet.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -915,6 +915,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -992,6 +995,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1109,6 +1115,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1146,6 +1158,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index d78e3d1..cbd8fa4 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 2723047..3bca8af 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index e0e4c70..94d8766 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -949,6 +949,9 @@ msgstr "Nur ankündigen" msgid "Switch only" msgstr "Nur umschalten" +msgid "Announce and switch" +msgstr "Ankündigen und Umschalten" + msgid "Selection" msgstr "Auswahl" @@ -1034,6 +1037,9 @@ msgstr "Umschalten ... Minuten vor Start" msgid "Unmute sound" msgstr "Ton anschalten" +msgid "Ask ... minutes before start" +msgstr "Nachfrage ... Minuten vor Start" + msgid " Series recording" msgstr " Serienaufnahme" @@ -1151,6 +1157,12 @@ msgstr "Vorhandene Werte überschreiben?" msgid "Edit entry" msgstr "Eintrag editieren" +msgid "Switch" +msgstr "Nur umschalten" + +msgid "Announce ... minutes before start" +msgstr "Ankündigen ... Minuten vor Start" + msgid "action at" msgstr "Ausführung um" @@ -1188,6 +1200,10 @@ msgstr "%d neue Sendung(en) gefunden! Anzeigen?" msgid "Search timer update done!" msgstr "Suchtimer-Update durchgeführt!" +#, c-format +msgid "%s starts: switch to?" +msgstr "%s startet: Umschalten?" + msgid "Programming timer failed!" msgstr "Timer-Programmierung fehlschlagen!" @@ -1202,3 +1218,6 @@ msgstr "in %02ldh" #, c-format msgid "in %02ldm" msgstr "in %02ldm" + +#~ msgid "Ask for switching" +#~ msgstr "Umschalten erfragen?" diff --git a/po/el_GR.po b/po/el_GR.po index 32935dc..8aae8c5 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 0894f2e..98bea28 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-11-18 20:09+0200\n" "Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -950,6 +950,10 @@ msgstr "Sólo avisar" msgid "Switch only" msgstr "Cambiar de canal" +#, fuzzy +msgid "Announce and switch" +msgstr "Sólo avisar" + msgid "Selection" msgstr "selección" @@ -1035,6 +1039,10 @@ msgstr "Cambiar ... minutos antes del inicio" msgid "Unmute sound" msgstr "Sonido quitar silencio" +#, fuzzy +msgid "Ask ... minutes before start" +msgstr "Cambiar ... minutos antes del inicio" + msgid " Series recording" msgstr " Grabación en serie" @@ -1152,6 +1160,14 @@ msgstr "¿Sobrescribir las entradas existentes?" msgid "Edit entry" msgstr "Editar entrada" +#, fuzzy +msgid "Switch" +msgstr "Cambiar de canal" + +#, fuzzy +msgid "Announce ... minutes before start" +msgstr "Cambiar ... minutos antes del inicio" + msgid "action at" msgstr "ejecutar a las" @@ -1189,6 +1205,10 @@ msgstr "¡%d nuevas emisiones encontradas! ¿Mostrarlas?" msgid "Search timer update done!" msgstr "¡Programación por búsqueda actualizada!" +#, fuzzy, c-format +msgid "%s starts: switch to?" +msgstr "¿Añadir a la lista de cambio?" + msgid "Programming timer failed!" msgstr "¡La programación ha fallado!" @@ -1203,3 +1223,7 @@ msgstr "en %02ldh" #, c-format msgid "in %02ldm" msgstr "en %02ldm" + +#, fuzzy +#~ msgid "Ask for switching" +#~ msgstr "¿Añadir a la lista de cambio?" diff --git a/po/et_EE.po b/po/et_EE.po index a8a48d5..df2bfef 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index b782dac..3cd4a01 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -954,6 +954,10 @@ msgstr "muistutus" msgid "Switch only" msgstr "kanavanvaihto" +#, fuzzy +msgid "Announce and switch" +msgstr "muistutus" + msgid "Selection" msgstr "valittu" @@ -1039,6 +1043,10 @@ msgstr "Vaihda ... minuuttia ennen alkua" msgid "Unmute sound" msgstr "Ota mykistys pois päältä" +#, fuzzy +msgid "Ask ... minutes before start" +msgstr "Vaihda ... minuuttia ennen alkua" + msgid " Series recording" msgstr " Sarjatallennus" @@ -1156,6 +1164,14 @@ msgstr "Kirjoitetaanko olemassaolevan päälle?" msgid "Edit entry" msgstr "Muokkaa valintaa" +#, fuzzy +msgid "Switch" +msgstr "kanavanvaihto" + +#, fuzzy +msgid "Announce ... minutes before start" +msgstr "Vaihda ... minuuttia ennen alkua" + msgid "action at" msgstr "Kellonaika kanavanvaihdolle" @@ -1193,6 +1209,10 @@ msgstr "Löydettiin %d uutta lähetystä! Näytetäänkö?" msgid "Search timer update done!" msgstr "Hakuajastimet päivitetty!" +#, fuzzy, c-format +msgid "%s starts: switch to?" +msgstr "Lisätäänkö kanavanvaihtolistalle?" + msgid "Programming timer failed!" msgstr "Ajastimen ohjelmointi epäonnistui!" @@ -1207,3 +1227,7 @@ msgstr "%02ldh" #, c-format msgid "in %02ldm" msgstr "%02ldm" + +#, fuzzy +#~ msgid "Ask for switching" +#~ msgstr "Lisätäänkö kanavanvaihtolistalle?" diff --git a/po/fr_FR.po b/po/fr_FR.po index 1fb34a7..455f0a3 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2008-04-30 08:36+0200\n" "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -949,6 +949,10 @@ msgstr "Annoncer seulement début d'une programme" msgid "Switch only" msgstr "Seulement changer de chaine" +#, fuzzy +msgid "Announce and switch" +msgstr "Annoncer seulement début d'une programme" + msgid "Selection" msgstr "Selection" @@ -1026,6 +1030,10 @@ msgstr "Changer ... minutes avant le début" msgid "Unmute sound" msgstr "Remettre le son" +#, fuzzy +msgid "Ask ... minutes before start" +msgstr "Changer ... minutes avant le début" + msgid " Series recording" msgstr " Enregistrement de serie" @@ -1143,6 +1151,14 @@ msgstr "Ecraser les informations?" msgid "Edit entry" msgstr "Editer l'entrée" +#, fuzzy +msgid "Switch" +msgstr "Seulement changer de chaine" + +#, fuzzy +msgid "Announce ... minutes before start" +msgstr "Changer ... minutes avant le début" + msgid "action at" msgstr "Effectuer à" @@ -1180,6 +1196,10 @@ msgstr "Afficher les %d nouvelles émissions trouvées?" msgid "Search timer update done!" msgstr "La mise à jours de recherche est effectuée!" +#, fuzzy, c-format +msgid "%s starts: switch to?" +msgstr "Ajouter à la liste de changement de chaine?" + msgid "Programming timer failed!" msgstr "La programmation a échoué" @@ -1194,3 +1214,7 @@ msgstr "en %02ldh" #, c-format msgid "in %02ldm" msgstr "en %02ldm" + +#, fuzzy +#~ msgid "Ask for switching" +#~ msgstr "Ajouter à la liste de changement de chaine?" diff --git a/po/hr_HR.po b/po/hr_HR.po index 7fdc07a..d86e85d 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -914,6 +914,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -991,6 +994,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1108,6 +1114,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1145,6 +1157,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index a6099a1..f1ab76d 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index f5adf66..ec17b0d 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2008-06-29 03:25+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -952,6 +952,10 @@ msgstr "Solo annuncio" msgid "Switch only" msgstr "Cambia soltanto" +#, fuzzy +msgid "Announce and switch" +msgstr "Solo annuncio" + msgid "Selection" msgstr "Selezione" @@ -1037,6 +1041,10 @@ msgstr "Cambia ... minuti prima dell'avvio" msgid "Unmute sound" msgstr "Togli suono muto" +#, fuzzy +msgid "Ask ... minutes before start" +msgstr "Cambia ... minuti prima dell'avvio" + msgid " Series recording" msgstr " Registrazione di serie" @@ -1154,6 +1162,14 @@ msgstr "Sovrascrivere valori esistenti?" msgid "Edit entry" msgstr "Modifica valore" +#, fuzzy +msgid "Switch" +msgstr "Cambia soltanto" + +#, fuzzy +msgid "Announce ... minutes before start" +msgstr "Cambia ... minuti prima dell'avvio" + msgid "action at" msgstr "azione alle" @@ -1191,6 +1207,10 @@ msgstr "%d nuove emittenti trovate! Mostrarle?" msgid "Search timer update done!" msgstr "Aggiornamento timer ricerca completato!" +#, fuzzy, c-format +msgid "%s starts: switch to?" +msgstr "Aggiungere alla lista modifiche?" + msgid "Programming timer failed!" msgstr "Programmazione timer fallito!" @@ -1205,3 +1225,7 @@ msgstr "in %02ldh" #, c-format msgid "in %02ldm" msgstr "in %02ldm" + +#, fuzzy +#~ msgid "Ask for switching" +#~ msgstr "Aggiungere alla lista modifiche?" diff --git a/po/nl_NL.po b/po/nl_NL.po index 554f1d4..65e63a4 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -947,6 +947,10 @@ msgstr "Alleen aankondigen (geen timer)" msgid "Switch only" msgstr "Alleen schakelen" +#, fuzzy +msgid "Announce and switch" +msgstr "Alleen aankondigen (geen timer)" + msgid "Selection" msgstr "Selectie" @@ -1030,6 +1034,10 @@ msgstr "Schakel ... minuten voor start" msgid "Unmute sound" msgstr "" +#, fuzzy +msgid "Ask ... minutes before start" +msgstr "Schakel ... minuten voor start" + msgid " Series recording" msgstr " Serie's opnemen" @@ -1147,6 +1155,14 @@ msgstr "Overschrijf bestaande invoer?" msgid "Edit entry" msgstr "Wijzig invoer" +#, fuzzy +msgid "Switch" +msgstr "Alleen schakelen" + +#, fuzzy +msgid "Announce ... minutes before start" +msgstr "Schakel ... minuten voor start" + msgid "action at" msgstr "actie op" @@ -1184,6 +1200,10 @@ msgstr "%d nieuwe uitzending(en) gevonden! Tonen?" msgid "Search timer update done!" msgstr "Verversen zoektimer gereed!" +#, fuzzy, c-format +msgid "%s starts: switch to?" +msgstr "Voeg toe aan schakellijst?" + msgid "Programming timer failed!" msgstr "Programmeren timer mislukt!" @@ -1198,3 +1218,7 @@ msgstr "in %02ldh" #, c-format msgid "in %02ldm" msgstr "in %02ldm" + +#, fuzzy +#~ msgid "Ask for switching" +#~ msgstr "Voeg toe aan schakellijst?" diff --git a/po/nn_NO.po b/po/nn_NO.po index 17a064c..3080e13 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 765d6c2..1aa6029 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index c1a04f4..202537d 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -912,6 +912,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -989,6 +992,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1106,6 +1112,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1143,6 +1155,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 804f651..d6a9368 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 103ddd5..60a8f1d 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -912,6 +912,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -989,6 +992,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1106,6 +1112,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1143,6 +1155,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index e988b39..e7563a1 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index f623559..1e0f3ce 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Tomas Prybil <tomas@prybil.se>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -913,6 +913,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -990,6 +993,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1107,6 +1113,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1144,6 +1156,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 1a86d2b..c5fa539 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-01-03 20:30+0100\n" +"POT-Creation-Date: 2009-01-29 18:55+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -912,6 +912,9 @@ msgstr "" msgid "Switch only" msgstr "" +msgid "Announce and switch" +msgstr "" + msgid "Selection" msgstr "" @@ -989,6 +992,9 @@ msgstr "" msgid "Unmute sound" msgstr "" +msgid "Ask ... minutes before start" +msgstr "" + msgid " Series recording" msgstr "" @@ -1106,6 +1112,12 @@ msgstr "" msgid "Edit entry" msgstr "" +msgid "Switch" +msgstr "" + +msgid "Announce ... minutes before start" +msgstr "" + msgid "action at" msgstr "" @@ -1143,6 +1155,10 @@ msgstr "" msgid "Search timer update done!" msgstr "" +#, c-format +msgid "%s starts: switch to?" +msgstr "" + msgid "Programming timer failed!" msgstr "" diff --git a/quickepgsearch.c b/quickepgsearch.c index 3076104..dfe41bc 100644 --- a/quickepgsearch.c +++ b/quickepgsearch.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/recstatus.c b/recstatus.c index dfa99b3..523e18b 100644 --- a/recstatus.c +++ b/recstatus.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/recstatus.h b/recstatus.h index e6946d1..d5249e7 100644 --- a/recstatus.h +++ b/recstatus.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/searchtimer_thread.c b/searchtimer_thread.c index 94b6c7b..6c86335 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -422,15 +422,18 @@ void cSearchTimerThread::Action(void) continue; } - if (searchExt->action == searchTimerActionSwitchOnly) // add to switch list + if (searchExt->action == searchTimerActionSwitchOnly || searchExt->action == searchTimerActionAnnounceAndSwitch) // add to switch list { time_t now = time(NULL); if (now < pEvent->StartTime()) { if (!SwitchTimers.InSwitchList(pEvent)) { - cMutexLock SwitchTimersLock(&SwitchTimers); - SwitchTimers.Add(new cSwitchTimer(pEvent, searchExt->switchMinsBefore, 0, + cMutexLock SwitchTimersLock(&SwitchTimers); + int mode = 0; + if (searchExt->action == searchTimerActionAnnounceAndSwitch) + mode = 2; + SwitchTimers.Add(new cSwitchTimer(pEvent, searchExt->switchMinsBefore, mode, searchExt->unmuteSoundOnSwitch)); SwitchTimers.Save(); cSwitchTimerThread::Init(); diff --git a/searchtimer_thread.h b/searchtimer_thread.h index 92cc6de..730229c 100644 --- a/searchtimer_thread.h +++ b/searchtimer_thread.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/svdrpclient.h b/svdrpclient.h index 15aef08..aa021a1 100644 --- a/svdrpclient.h +++ b/svdrpclient.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/switchtimer.c b/switchtimer.c index f99ec32..a112b29 100644 --- a/switchtimer.c +++ b/switchtimer.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -31,15 +31,15 @@ cSwitchTimer::cSwitchTimer(void) { event = NULL; switchMinsBefore = 1; - announceOnly = false; + mode = 0; unmute = 0; } -cSwitchTimer::cSwitchTimer(const cEvent* Event, int SwitchMinsBefore, int AnnounceOnly, int Unmute) +cSwitchTimer::cSwitchTimer(const cEvent* Event, int SwitchMinsBefore, int Mode, int Unmute) { event = Event; switchMinsBefore = SwitchMinsBefore; - announceOnly = AnnounceOnly; + mode = Mode; unmute = Unmute; } @@ -87,7 +87,7 @@ bool cSwitchTimer::Parse(const char *s) switchMinsBefore = atoi(value); break; case 5: - announceOnly = atoi(value); + mode = atoi(value); break; case 6: unmute = atoi(value); @@ -130,7 +130,7 @@ cString cSwitchTimer::ToText(bool& ignore) cString buffer = cString::sprintf("%s:%u:%ld:%d:%d:%d", CHANNELSTRING(channel), event->EventID(), event->StartTime(), switchMinsBefore, - announceOnly?1:0, unmute?1:0); + mode, unmute?1:0); return buffer; } diff --git a/switchtimer.h b/switchtimer.h index 8169ae3..89bd89a 100644 --- a/switchtimer.h +++ b/switchtimer.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -31,11 +31,11 @@ class cSwitchTimer : public cListObject public: const cEvent* event; int switchMinsBefore; - int announceOnly; + int mode; // 0 = switch, 1 = announce only, 2 = ask for switch int unmute; cSwitchTimer(void); - cSwitchTimer(const cEvent* Event, int SwitchMinsBefore=1, int announceOnly=0, int unmute=0); + cSwitchTimer(const cEvent* Event, int SwitchMinsBefore=1, int mode=0, int unmute=0); bool Parse(const char *s); cString ToText(bool& ignore); bool Save(FILE *f); diff --git a/switchtimer_thread.c b/switchtimer_thread.c index 2988498..88d4696 100644 --- a/switchtimer_thread.c +++ b/switchtimer_thread.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -88,24 +88,44 @@ void cSwitchTimerThread::Action(void) if (event && event->StartTime() - now < switchTimer->switchMinsBefore*60 + MSG_DELAY + 1) { cChannel *channel = Channels.GetByChannelID(event->ChannelID(), true, true); - bool doswitch = (switchTimer->announceOnly == 0); + bool doSwitch = (switchTimer->mode == 0); + bool doAsk = (switchTimer->mode == 2); + bool doUnmute = switchTimer->unmute; SwitchTimers.Del(switchTimer); + if (channel && (event->EndTime() >= now)) { - // announce and switch - if (doswitch) + cString Message = cString::sprintf("%s: %s - %s", event->Title(), + CHANNELNAME(channel), GETTIMESTRING(event)); + cString SwitchCmd = cString::sprintf("CHAN %d", channel->Number()); + // switch + if (doSwitch) { LogFile.Log(1,"switching to channel %d", channel->Number()); - cString cmd = cString::sprintf("CHAN %d", channel->Number()); if (cDevice::CurrentChannel() != channel->Number()) - SendViaSVDRP(cmd); + SendViaSVDRP(SwitchCmd); - if (switchTimer->unmute && cDevice::PrimaryDevice()->IsMute()) + if (doUnmute && cDevice::PrimaryDevice()->IsMute()) cDevice::PrimaryDevice()->ToggleMute(); } - cString Message = cString::sprintf("%s: %s - %s", event->Title(), - CHANNELNAME(channel), GETTIMESTRING(event)); - SendMsg(Message); + if (!doAsk) + SendMsg(Message); + + if (doAsk) + { + cString Message = cString::sprintf(tr("%s starts: switch to?"), event->Title()); + if(SendMsg(Message, true,7) == kOk) + { + LogFile.Log(1,"switching to channel %d", channel->Number()); + if (cDevice::CurrentChannel() != channel->Number()) + SendViaSVDRP(SwitchCmd); + + if (doUnmute && cDevice::PrimaryDevice()->IsMute()) + cDevice::PrimaryDevice()->ToggleMute(); + + } + } + if (m_Active) Wait.Wait(1000 * MSG_DELAY); } diff --git a/switchtimer_thread.h b/switchtimer_thread.h index 115ff0b..f743bef 100644 --- a/switchtimer_thread.h +++ b/switchtimer_thread.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/templatefile.c b/templatefile.c index d69ede5..3272182 100644 --- a/templatefile.c +++ b/templatefile.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/templatefile.h b/templatefile.h index 421f1de..c78c80a 100644 --- a/templatefile.h +++ b/templatefile.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timer_thread.c b/timer_thread.c index 9a42e68..9656a07 100644 --- a/timer_thread.c +++ b/timer_thread.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timer_thread.h b/timer_thread.h index bab13e8..a45c50b 100644 --- a/timer_thread.h +++ b/timer_thread.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timerdone.c b/timerdone.c index 189f3b5..e4ac43d 100644 --- a/timerdone.c +++ b/timerdone.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timerdone.h b/timerdone.h index 70b42b9..39cf5db 100644 --- a/timerdone.h +++ b/timerdone.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timerstatus.c b/timerstatus.c index 49ead01..d8f8f9b 100644 --- a/timerstatus.c +++ b/timerstatus.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/timerstatus.h b/timerstatus.h index db10742..ea67246 100644 --- a/timerstatus.h +++ b/timerstatus.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/varparser.c b/varparser.c index afbef49..4f3963f 100644 --- a/varparser.c +++ b/varparser.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/varparser.h b/varparser.h index 05e20cd..397c57d 100644 --- a/varparser.h +++ b/varparser.h @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2008 Christian Wieninger +Copyright (C) 2004-2009 Christian Wieninger This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License |