[vdr] 01/01: Version 2.0.4 VDR version 2.0.4 is now available at
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sun Aug 30 16:18:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag vdr-2.0.4
in repository vdr.
commit 3e5d127ad7e15f179ed866d3ae19bfe63b455242
Author: Klaus Schmidinger <Klaus (dot) Schmidinger (at) tvdr (dot) de>
Date: Wed Oct 23 11:42:00 2013 +0200
Version 2.0.4
VDR version 2.0.4 is now available at
ftp://ftp.tvdr.de/vdr/vdr-2.0.4.tar.bz2
A 'diff' against the previous version is available at
ftp://ftp.tvdr.de/vdr/Developer/vdr-2.0.3-2.0.4.diff
MD5 checksums:
8effb19fe09eb6c057ce354fe8f6be9f vdr-2.0.4.tar.bz2
9667e098f2cb3016f1005833bb192fa9 vdr-2.0.3-2.0.4.diff
This version fixes a few minor bugs that came up after the release of
version 2.0.3.
From the HISTORY file:
- Unified the internal sequence of actions when pressing the Blue and the Back key,
respectively, during replay (reported by Thomas Maass).
- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
is set to "do not pause live video" (suggested by Ulf Kiener).
- Fixed writing group separators to channels.conf that contain a comma (reported by
Eike Edener).
- Now also checking the source (in addition to the transponder) when setting the
system time from the TDT, which avoids problems in case devices are tuned to the
same transponder on different sources, and these broadcast different time data
(reported by Torsten Lang).
- Changed cRecorder::Action() to use cTimeMs instead of time() to avoid problems with
unjustified "video data stream broken" errors in case the system time is changed
while a recording is active (reported by Torsten Lang).
- Fixed an inconsistent behavior between opening the Recordings menu manually via the
main menu and by pressing the Recordings key. In the latter case it automatically
opened all sub folders to position the cursor to the last replayed recording, which
is unexpected at this point (reported by Helmut Auer). You can still navigate to
the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
menu.
---
CONTRIBUTORS | 16 ++++++++++++++++
HISTORY | 22 ++++++++++++++++++++++
channels.c | 16 +++++++++-------
config.h | 6 +++---
dvbdevice.c | 2 +-
eit.c | 4 ++--
menu.c | 16 +++++++---------
menu.h | 4 ++--
recorder.c | 12 ++++++------
vdr.c | 4 ++--
10 files changed, 70 insertions(+), 32 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b749d08..58a7a3e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -618,6 +618,8 @@ Helmut Auer <vdr at helmutauer.de>
for suggesting to read the epg.data file in a separate thread
for some improvements to allowing the parameters PATH and NAME to the --dirnames
command line option to be left empty to use the default values if only ENC shall be set
+ for reporting an inconsistent behavior between opening the Recordings menu manually
+ via the main menu and by pressing the Recordings key
Jeremy Hall <jhall at UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c
@@ -2544,6 +2546,8 @@ Ulf Kiener <webmaster at ulf-kiener.de>
for suggesting to add user defined key kUser0
for suggesting to perform absolute jumps when replaying a recording (via the Red key)
only if an actual value has been entered
+ for suggesting to make the Yellow button in the main menu not act as "Pause" if
+ "Pause key handling" is set to "do not pause live video"
J�rg Wendel <vdr-ml at jwendel.de>
for reporting that cPlugin::Active() was called too often
@@ -3006,6 +3010,11 @@ Torsten Lang <info at torstenlang.de>
for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
buffer to 20MB to better handle HD recordings
for fixing setting the video format in the dvbhdffdevice
+ for reporting a problem with setting the system time from the TDT in case devices
+ are tuned to the same transponder on different sources, and these broadcast different
+ time data
+ for reporting a problem with unjustified "video data stream broken" errors in case
+ the system time is changed while a recording is active
Christian Ruppert <idl0r at gentoo.org>
for some improvements to the Makefiles
@@ -3163,3 +3172,10 @@ Dominique Dumont <domi.dumont at free.fr>
Manfred V�lkel <mvoelkel at digitaldevices.de>
for suggesting to make all bonded devices (except for the master) turn off their LNB
power completely to avoid problems when receiving vertically polarized transponders
+
+Thomas Maass <mase at setho.org>
+ for reporting a difference in the internal sequence of actions when pressing the Blue
+ and the Back key, respectively, during replay
+
+Eike Edener <eike at edener.de>
+ for reporting a bug in writing group separators to channels.conf that contain a comma
diff --git a/HISTORY b/HISTORY
index 0510953..e67eec1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7831,3 +7831,25 @@ Video Disk Recorder Revision History
Manfred V�lkel and Oliver Endriss).
- Fixed cleaning up old EPG events in case no epg data file is given (reported by
Dave Pickles).
+
+2013-10-23: Version 2.0.4
+
+- Unified the internal sequence of actions when pressing the Blue and the Back key,
+ respectively, during replay (reported by Thomas Maass).
+- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
+ is set to "do not pause live video" (suggested by Ulf Kiener).
+- Fixed writing group separators to channels.conf that contain a comma (reported by
+ Eike Edener).
+- Now also checking the source (in addition to the transponder) when setting the
+ system time from the TDT, which avoids problems in case devices are tuned to the
+ same transponder on different sources, and these broadcast different time data
+ (reported by Torsten Lang).
+- Changed cRecorder::Action() to use cTimeMs instead of time() to avoid problems with
+ unjustified "video data stream broken" errors in case the system time is changed
+ while a recording is active (reported by Torsten Lang).
+- Fixed an inconsistent behavior between opening the Recordings menu manually via the
+ main menu and by pressing the Recordings key. In the latter case it automatically
+ opened all sub folders to position the cursor to the last replayed recording, which
+ is unexpected at this point (reported by Helmut Auer). You can still navigate to
+ the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
+ menu.
diff --git a/channels.c b/channels.c
index 4c04608..67245ac 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.24 2012/07/14 12:34:47 kls Exp $
+ * $Id: channels.c 2.24.1.1 2013/10/11 11:40:02 kls Exp $
*/
#include "channels.h"
@@ -503,12 +503,14 @@ cString cChannel::ToText(const cChannel *Channel)
char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia
char *q = FullName;
q += sprintf(q, "%s", Channel->name);
- if (!isempty(Channel->shortName))
- q += sprintf(q, ",%s", Channel->shortName);
- else if (strchr(Channel->name, ','))
- q += sprintf(q, ",");
- if (!isempty(Channel->provider))
- q += sprintf(q, ";%s", Channel->provider);
+ if (!Channel->groupSep) {
+ if (!isempty(Channel->shortName))
+ q += sprintf(q, ",%s", Channel->shortName);
+ else if (strchr(Channel->name, ','))
+ q += sprintf(q, ",");
+ if (!isempty(Channel->provider))
+ q += sprintf(q, ";%s", Channel->provider);
+ }
*q = 0;
strreplace(FullName, ':', '|');
cString buffer;
diff --git a/config.h b/config.h
index f646f79..4c08842 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.76.1.3 2013/08/21 13:44:59 kls Exp $
+ * $Id: config.h 2.76.1.4 2013/09/07 10:25:10 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,8 +22,8 @@
// VDR's own version number:
-#define VDRVERSION "2.0.3"
-#define VDRVERSNUM 20003 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "2.0.4"
+#define VDRVERSNUM 20004 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
diff --git a/dvbdevice.c b/dvbdevice.c
index 0c9f8eb..0ccd162 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 2.88.1.2 2013/08/23 09:52:14 kls Exp $
+ * $Id: dvbdevice.c 2.88.1.4 2013/10/21 09:01:21 kls Exp $
*/
#include "dvbdevice.h"
diff --git a/eit.c b/eit.c
index 73c4fa9..5ebbfc4 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider at web.de> and Rolf Hakenes <hakenes at hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg at gmx.de>.
*
- * $Id: eit.c 2.23 2012/12/04 11:10:10 kls Exp $
+ * $Id: eit.c 2.23.1.1 2013/10/12 11:24:51 kls Exp $
*/
#include "eit.h"
@@ -404,7 +404,7 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
break;
case 0x14: {
- if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
+ if (Setup.SetSystemTime && Setup.TimeSource == Source() && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
cTDT TDT(Data);
}
break;
diff --git a/menu.c b/menu.c
index f43dec5..44f0055 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 2.82.1.2 2013/04/27 10:32:28 kls Exp $
+ * $Id: menu.c 2.82.1.5 2013/10/16 09:46:24 kls Exp $
*/
#include "menu.h"
@@ -3364,7 +3364,7 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
cOsdObject *cMenuMain::pluginOsdObject = NULL;
-cMenuMain::cMenuMain(eOSState State)
+cMenuMain::cMenuMain(eOSState State, bool OpenSubMenus)
:cOsdMenu("")
{
SetMenuCategory(mcMain);
@@ -3381,7 +3381,7 @@ cMenuMain::cMenuMain(eOSState State)
case osSchedule: AddSubMenu(new cMenuSchedule); break;
case osChannels: AddSubMenu(new cMenuChannels); break;
case osTimers: AddSubMenu(new cMenuTimers); break;
- case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
+ case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break;
case osSetup: AddSubMenu(new cMenuSetup); break;
case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
default: break;
@@ -3448,7 +3448,7 @@ bool cMenuMain::Update(bool Force)
stopReplayItem = NULL;
}
// Color buttons:
- SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
+ SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
result = true;
}
@@ -3543,7 +3543,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
}
break;
case kYellow: if (!HadSubMenu)
- state = replaying ? osContinue : osPause;
+ state = replaying || !Setup.PauseKeyHandling ? osContinue : osPause;
break;
case kBlue: if (!HadSubMenu)
state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings;
@@ -4968,10 +4968,8 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
else
Show();
break;
- case kBack: if (Setup.DelTimeshiftRec) {
- cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
- return rc && rc->InstantId() ? osEnd : osRecordings;
- }
+ case kBack: Hide();
+ Stop();
return osRecordings;
default: return osUnknown;
}
diff --git a/menu.h b/menu.h
index 196c038..1a76b41 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.h 2.13 2012/12/07 13:44:13 kls Exp $
+ * $Id: menu.h 2.13.1.1 2013/10/16 09:46:15 kls Exp $
*/
#ifndef __MENU_H
@@ -107,7 +107,7 @@ private:
void Set(void);
bool Update(bool Force = false);
public:
- cMenuMain(eOSState State = osUnknown);
+ cMenuMain(eOSState State = osUnknown, bool OpenSubMenus = false);
virtual eOSState ProcessKey(eKeys Key);
static cOsdObject *PluginOsdObject(void);
};
diff --git a/recorder.c b/recorder.c
index a9cc8c9..88c52d9 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recorder.c 2.17 2012/09/22 11:53:57 kls Exp $
+ * $Id: recorder.c 2.17.1.1 2013/10/12 12:10:05 kls Exp $
*/
#include "recorder.h"
@@ -14,7 +14,7 @@
// The maximum time we wait before assuming that a recorded video data stream
// is broken:
-#define MAXBROKENTIMEOUT 30 // seconds
+#define MAXBROKENTIMEOUT 30000 // milliseconds
#define MINFREEDISKSPACE (512) // MB
#define DISKCHECKINTERVAL 100 // seconds
@@ -117,7 +117,7 @@ void cRecorder::Receive(uchar *Data, int Length)
void cRecorder::Action(void)
{
- time_t t = time(NULL);
+ cTimeMs t(MAXBROKENTIMEOUT);
bool InfoWritten = false;
bool FirstIframeSeen = false;
while (Running()) {
@@ -160,16 +160,16 @@ void cRecorder::Action(void)
break;
}
fileSize += Count;
- t = time(NULL);
+ t.Set(MAXBROKENTIMEOUT);
}
}
ringBuffer->Del(Count);
}
}
- if (time(NULL) - t > MAXBROKENTIMEOUT) {
+ if (t.TimedOut()) {
esyslog("ERROR: video data stream broken");
ShutdownHandler.RequestEmergencyExit();
- t = time(NULL);
+ t.Set(MAXBROKENTIMEOUT);
}
}
}
diff --git a/vdr.c b/vdr.c
index c63eeca..dceabbd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 2.57 2013/03/15 10:44:54 kls Exp $
+ * $Id: vdr.c 2.57.1.1 2013/10/16 09:46:36 kls Exp $
*/
#include <getopt.h>
@@ -1234,7 +1234,7 @@ int main(int argc, char *argv[])
case osRecordings:
DELETE_MENU;
cControl::Shutdown();
- Menu = new cMenuMain(osRecordings);
+ Menu = new cMenuMain(osRecordings, true);
break;
case osReplay: DELETE_MENU;
cControl::Shutdown();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list