summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY7
-rw-r--r--command/markad-standalone.cpp9
-rw-r--r--command/markad-standalone.h1
-rw-r--r--version.h2
4 files changed, 15 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 80c3c33..ffaaaad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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
diff --git a/version.h b/version.h
index c8bc517..b0a7f9d 100644
--- a/version.h
+++ b/version.h
@@ -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