diff options
author | Jochen Dolze <vdr@dolze.de> | 2012-09-12 20:06:45 +0200 |
---|---|---|
committer | Jochen Dolze <vdr@dolze.de> | 2012-09-12 20:06:45 +0200 |
commit | 0366c2baebdc75874a00b250fa2c57873ab11a1c (patch) | |
tree | ffc69bc0e749d557e7f732dde9f0a3ac3e8aab94 | |
parent | 47b1a73b9c5fc98dcc3a9aa11283db02f6f570ab (diff) | |
download | vdr-plugin-markad-0366c2baebdc75874a00b250fa2c57873ab11a1c.tar.gz vdr-plugin-markad-0366c2baebdc75874a00b250fa2c57873ab11a1c.tar.bz2 |
New version 0.1.4v0.1.4
Added LiveRecording-flag
Updated HISTORY
-rw-r--r-- | HISTORY | 7 | ||||
-rw-r--r-- | command/markad-standalone.cpp | 9 | ||||
-rw-r--r-- | command/markad-standalone.h | 1 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 15 insertions, 4 deletions
@@ -1,5 +1,12 @@ VDR Plugin 'markad' Revision History ---------------------------------- +2012-09-14: Version 0.1.4 + +- Improved PATPMT seeker +- ReelVDR support (info.txt) +- Added manual page (contributed by marco) +- Fixed "internal structures" bug + 2012-03-01: Version 0.1.3 - Changed H264 stream frame/field processing diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index 7857e49..cb84f2b 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -1562,7 +1562,7 @@ bool cMarkAdStandalone::LoadInfo() } } } - if (line[0]=='E') + if ((line[0]=='E') && (!bLiveRecording)) { int result=sscanf(line,"%*c %*10i %20li %6i %*2x %*2x",&startTime,&length); if (result!=2) @@ -1599,7 +1599,7 @@ bool cMarkAdStandalone::LoadInfo() macontext.Video.Info.FramesPerSecond=fps; } } - if (line[0]=='X') + if ((line[0]=='X') && (!bLiveRecording)) { int stream=0,type=0; char descr[256]=""; @@ -1678,7 +1678,7 @@ bool cMarkAdStandalone::LoadInfo() } fclose(f); - if (!length) + if ((!length) && (!bLiveRecording)) { esyslog("cannot read broadcast length from info, marks can be wrong!"); macontext.Info.AspectRatio.Num=0; @@ -2118,6 +2118,9 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * { isyslog("live-recording, disabling pre-/post timer"); bIgnoreTimerInfo=true; + bLiveRecording=true; + } else { + bLiveRecording=false; } if (!CheckTS()) { diff --git a/command/markad-standalone.h b/command/markad-standalone.h index a29e5fa..0a339e7 100644 --- a/command/markad-standalone.h +++ b/command/markad-standalone.h @@ -202,6 +202,7 @@ unsigned Descriptor_Length: bool bDecodeVideo; bool bDecodeAudio; bool bIgnoreTimerInfo; + bool bLiveRecording; time_t startTime; // starttime of broadcast int length; // length of broadcast in seconds @@ -8,6 +8,6 @@ #ifndef __version_h_ #define __version_h_ -static const char *VERSION = "0.1.4pre"; +static const char *VERSION = "0.1.4"; #endif |