Ticket #2521: mythtv_fix_bell_eit_enc.patch

libs/libmythtv/eithelper.cpp

@@ -268 +268 @@
                     list, DescriptorID::short_event, languagePreferences);
 
             unsigned char enc_ch[1] = { 0x05 };
-            const unsigned char *enc =
-                (fix & EITFixUp::kEFixPro7Sat) ? enc_ch : NULL;
+            unsigned char enc_bev[3] = { 0x10, 0x00, 0x01 };
+            int enc_len = 0;
+            const unsigned char *enc = NULL;
+            if ( fix & EITFixUp::kEFixPro7Sat )
+            {
+                enc = enc_ch;
+                enc_len = sizeof(enc_ch);
+            }
+            // Is BellExpressVU?  Use an encoding over-ride of
+            // ISO 8859-1 (Latin1)
+            if ( fix & EITFixUp::kFixBell )
+            {
+              enc = enc_bev;
+              enc_len = sizeof(enc_bev);
+            }
 
             if (bestShortEvent)
             {
                 ShortEventDescriptor sed(bestShortEvent);
                 if (enc)
                 {
-                    title    = sed.EventName(enc, 1);
-                    subtitle = sed.Text(enc, 1);
+                    title    = sed.EventName(enc, enc_len);
+                    subtitle = sed.Text(enc, enc_len);
                 }
                 else
                 {
@@ -301 +314 @@
 
                 ExtendedEventDescriptor eed(bestExtendedEvents[j]);
                 if (enc)
-                    description += eed.Text(enc, 1);
+                    description += eed.Text(enc, enc_len);
                 else
                     description += eed.Text();
             }