- Bug fix: Could miss to display subtitles on channels with "Parallel Magazine"v0.0.2

  transmission. Thanks to Antti Lammi!

5 files changed, 18 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index 954350d..bfc7f9a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
 VDR Plugin 'ttxtsubs' Revision History
 --------------------------------------
 
+2003-05-05: Version 0.0.2
+- Bug fix: Could miss to display subtitles on channels with "Parallel Magazine"
+  transmission. Thanks to Antti Lammi!
+
 2003-04-28: Version 0.0.1b
 - Timeout on SI table reads
 
diff --git a/Makefile b/Makefile
index 9f9c5fa..c78186c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.16 2003/03/07 03:01:17 ragge Exp $
+# $Id: Makefile,v 1.17 2003/05/02 04:11:20 ragge Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -96,7 +96,8 @@ bup: clean patch
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
 
-ci: patch	
+#ci: patch	
+ci:
 	ci -u $(SOURCEFILES)
 
 patch:
diff --git a/siinfo.c b/siinfo.c
index 8e91069..04ed7a6 100644
--- a/siinfo.c
+++ b/siinfo.c
@@ -515,7 +515,7 @@ struct ttxtpidinfo *FindSubs(struct ttxtinfo *info, char *lang, int HI, int *pid
 	if(page < 0x100)
 	  page += 0x800;
 	fprintf(stderr, "          %03x: %c%c%c %s\n", page, info->p[i].i[j].lang[0], info->p[i].i[j].lang[1], info->p[i].i[j].lang[2],
-		type == TTXT_INITIAL_PAGE ? "(Initial Page)" :
+		type == TTXT_INITIAL_PAGE ? "(Initial Page (The teletext start page, not a subtitles page!))" :
 		type == TTXT_SUBTITLE_PAGE ? "(Subtitles)" :
 		type == TTXT_ADDITIONAL_INFO_PAGE ? "(Additional Info Page)" :
 		type == TTXT_PROGRAMME_SCHEDULE_PAGE ? "(Programme Schedule Page)" :
diff --git a/ttxtsubs.c b/ttxtsubs.c
index 8b76848..379246e 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: ttxtsubs.c,v 1.11 2003/03/07 05:52:58 ragge Exp ragge $
+ * $Id: ttxtsubs.c,v 1.13 2003/05/04 22:38:35 ragge Exp $
  */
 
 #include <vdr/plugin.h>
@@ -18,7 +18,7 @@
 #include "siinfo.h"
 #include "ttxtsubs.h"
 
-static const char *VERSION        = "0.0.1b";
+static const char *VERSION        = "0.0.2";
 static const char *DESCRIPTION    = "Teletext subtitles";
 //static const char *MAINMENUENTRY  = "Ttxtsubs";
 
diff --git a/ttxtsubsdisplay.c b/ttxtsubsdisplay.c
index 370b4c9..d44729e 100644
--- a/ttxtsubsdisplay.c
+++ b/ttxtsubsdisplay.c
@@ -118,13 +118,15 @@ void cTtxtSubsDisplay::TtxtData(const uint8_t *Data)
     for(i = 0; i < 8; i++)
       fi[i] = invtab[d->data[i]];
 
-    if(mPageState == collecting) {
-      mPageState = finished;
-      ClearOSD();
-      ShowOSD();
+    if(mag == mMag) { /* XXX: && ! magazine_serial */
+      if(mPageState == collecting) {
+	mPageState = finished;
+	ClearOSD();
+	ShowOSD();
+      }
+      if(mPageState == interimshow)
+	mPageState = finished;
     }
-    if(mPageState == interimshow)
-      mPageState = finished;
 
     no = unham(fi[0], fi[1]);