[mythtv] [PATCH] MythDialog/lirc keybinding fix

Jason Hoos jhoos at thwack.net
Wed Nov 26 12:59:33 EST 2003


Attached is a fix for a slight glitch in last night's CVS commits.
Some references to the 'ignore_lirc_keys' member in MythDialog.cpp
didn't get prefixed with 'd->', but they only caused issues if the 
LIRC stuff was enabled.  Apparently I updated too soon. :)

Also included is a fix for some stuff in libavformat that breaks if you
have DEBUG_SI turned on (for some debugging stuff in mpegts.c).

Jason

-------------- next part --------------
Index: libs/libavformat/mpegts.c
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libavformat/mpegts.c,v
retrieving revision 1.14
diff -u -r1.14 mpegts.c
--- libs/libavformat/mpegts.c	12 Nov 2003 06:13:40 -0000	1.14
+++ libs/libavformat/mpegts.c	26 Nov 2003 07:57:17 -0000
@@ -355,7 +355,7 @@
     
 #ifdef DEBUG_SI
     printf("PMT:\n");
-    av_hex_dump((uint8_t *)section, section_len);
+    av_hex_dump(stdout, (uint8_t *)section, section_len);
 #endif
     p_end = section + section_len - 4;
     p = section;
@@ -427,7 +427,7 @@
 
 #ifdef DEBUG_SI
     printf("PAT:\n");
-    av_hex_dump((uint8_t *)section, section_len);
+    av_hex_dump(stdout, (uint8_t *)section, section_len);
 #endif
     p_end = section + section_len - 4;
     p = section;
@@ -476,7 +476,7 @@
 
 #ifdef DEBUG_SI
     printf("PAT:\n");
-    av_hex_dump((uint8_t *)section, section_len);
+    av_hex_dump(stdout, (uint8_t *)section, section_len);
 #endif
     p_end = section + section_len - 4;
     p = section;
@@ -537,7 +537,7 @@
 
 #ifdef DEBUG_SI
     printf("SDT:\n");
-    av_hex_dump((uint8_t *)section, section_len);
+    av_hex_dump(stdout, (uint8_t *)section, section_len);
 #endif
 
     p_end = section + section_len - 4;
@@ -690,7 +690,7 @@
                 /* we got all the PES or section header. We can now
                    decide */
 #if 0
-                av_hex_dump(pes->header, pes->data_index);
+                av_hex_dump(stdout, pes->header, pes->data_index);
 #endif
                 if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
                     pes->header[2] == 0x01) {
Index: libs/libmyth/mythdialogs.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/mythdialogs.cpp,v
retrieving revision 1.30
diff -u -r1.30 mythdialogs.cpp
--- libs/libmyth/mythdialogs.cpp	25 Nov 2003 23:13:51 -0000	1.30
+++ libs/libmyth/mythdialogs.cpp	26 Nov 2003 07:57:19 -0000
@@ -336,7 +336,7 @@
         QApplication::sendEvent(key_target, &key);
     }
 #ifdef USE_LIRC
-    else if (ce->type() == kLircKeycodeEventType && !ignore_lirc_keys) 
+    else if (ce->type() == kLircKeycodeEventType && !d->ignore_lirc_keys) 
     {
         LircKeycodeEvent *lke = (LircKeycodeEvent *)ce;
         int keycode = lke->getKeycode();
@@ -372,7 +372,7 @@
     else if (ce->type() == kLircMuteEventType)
     {
         LircMuteEvent *lme = (LircMuteEvent *)ce;
-        ignore_lirc_keys = lme->eventsMuted();
+        d->ignore_lirc_keys = lme->eventsMuted();
     }
 #endif
 }


More information about the mythtv-dev mailing list