[vlc-commits] codec: telx: ignore subtitle flags when magazine designated

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jul 23 14:56:19 2019 +0200| [026709f443e8e60b4ca06547a028a546ef17ddea] | committer: Francois Cartegnie

codec: telx: ignore subtitle flags when magazine designated

Just like zvbi, we extract page content and display it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=026709f443e8e60b4ca06547a028a546ef17ddea
---

 modules/codec/telx.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 8a05300444..8446e1a5f4 100644
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -466,9 +466,11 @@ static bool DecodePageHeaderPacket( decoder_t *p_dec, const uint8_t *packet,
     p_sys->pi_active_national_set[magazine] =
                          ppi_national_subsets[7 & (flag >> 21)];
 
-    p_sys->b_is_subtitle[magazine] = p_sys->b_ignore_sub_flag
-                                      || ( (flag & FLAG_SUBTITLE)
-                                        && (flag & FLAG_SUPPRESS_HEADER) );
+    int subtitlesflags = FLAG_SUBTITLE;
+    if( !p_sys->b_ignore_sub_flag && p_sys->i_wanted_magazine != 0x07 )
+        subtitlesflags |= FLAG_SUPPRESS_HEADER;
+
+    p_sys->b_is_subtitle[magazine] = !((flag & subtitlesflags) != subtitlesflags);
 
     dbg(( p_dec, "FLAGS%s%s%s%s%s%s%s mag_ser %d",
           (flag & FLAG_ERASE_PAGE)     ? " erase" : "",