[mythtv] [PATCH] Backend UTF-8 fix and minor DVB CI cleanup
Jesper Sörensen
jesper at datapartner.se
Tue Sep 7 05:11:55 EDT 2004
Here are a few minor patches suggested for CVS:
- Convert log strings to local encoding instead of UTF-8.
- Disable CI debugging (I don't think this logging is needed by default
and it clutters up the logs)
- Remove hard coded override for Conax CAM in CI slot 1 (???).
The only thing that I'm not 100% sure of is the CAM patch. I don't know
why that code is there in the first place but everything works here both
with and without the patch. My Conax CAM sits in slot 0 so that code is
never triggered, but I wouldn't want that override to be triggered even
if the CAM was in slot 1, hence the patch. If there really is a need for
some kind of override/workaround this should probably be done in a more
flexible way? My guess is that this is a local tweak from Kenneth
Aafløy, but as far as I can see this shouldn't be in CVS. Does anyone
know more about it?
/JS
-------------- next part --------------
Index: libs/libmythtv/dvbdev/dvbci.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbdev/dvbci.cpp,v
retrieving revision 1.4
diff -u -r1.4 dvbci.cpp
--- libs/libmythtv/dvbdev/dvbci.cpp 10 Apr 2004 19:31:57 -0000 1.4
+++ libs/libmythtv/dvbdev/dvbci.cpp 27 Jul 2004 18:32:47 -0000
@@ -59,7 +59,7 @@
// Set these to 'true' for debug output:
static bool DumpTPDUDataTransfer = false;
-static bool DebugProtocol = true;
+static bool DebugProtocol = false;
static bool _connected = false;
#define dbgprotocol(a...) if (DebugProtocol) fprintf(stderr, a)
-------------- next part --------------
Index: libs/libmythtv/scheduledrecording.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/scheduledrecording.cpp,v
retrieving revision 1.110
diff -u -r1.110 scheduledrecording.cpp
--- libs/libmythtv/scheduledrecording.cpp 2 Sep 2004 06:07:22 -0000 1.110
+++ libs/libmythtv/scheduledrecording.cpp 4 Sep 2004 13:30:45 -0000
@@ -401,7 +401,7 @@
QString msg;
msg = QString("Finished recording %1 on channel: %2")
- .arg(proginfo.title.utf8())
+ .arg(proginfo.title.local8Bit())
.arg(proginfo.chanid);
VERBOSE(VB_GENERAL, msg);
Index: programs/mythbackend/scheduler.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythbackend/scheduler.cpp,v
retrieving revision 1.114
diff -u -r1.114 scheduler.cpp
--- programs/mythbackend/scheduler.cpp 2 Sep 2004 06:07:22 -0000 1.114
+++ programs/mythbackend/scheduler.cpp 4 Sep 2004 13:30:45 -0000
@@ -931,7 +931,7 @@
msg = QString("SUPPRESSED recording '%1' on channel"
" %2 on cardid %3, sourceid %4. Only"
" %5 Megs of disk space available.")
- .arg(nextRecording->title.utf8())
+ .arg(nextRecording->title.local8Bit())
.arg(nextRecording->chanid)
.arg(nextRecording->cardid)
.arg(nextRecording->sourceid)
@@ -950,7 +950,7 @@
msg = QString("SUPPRESSED recording \"%1\" on channel: "
"%2 on cardid: %3, sourceid %4. Tuner "
"is locked by an external application.")
- .arg(nextRecording->title.utf8())
+ .arg(nextRecording->title.local8Bit())
.arg(nextRecording->chanid)
.arg(nextRecording->cardid)
.arg(nextRecording->sourceid);
@@ -1014,7 +1014,7 @@
statuschanged = true;
msg += QString(" \"%1\" on channel: %2 on cardid: %3, "
- "sourceid %4").arg(nextRecording->title.utf8())
+ "sourceid %4").arg(nextRecording->title.local8Bit())
.arg(nextRecording->chanid)
.arg(nextRecording->cardid)
.arg(nextRecording->sourceid);
-------------- next part --------------
Index: libs/libmythtv/dvbcam.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbcam.cpp,v
retrieving revision 1.12
diff -u -r1.12 dvbcam.cpp
--- libs/libmythtv/dvbcam.cpp 26 May 2004 17:29:35 -0000 1.12
+++ libs/libmythtv/dvbcam.cpp 24 Jul 2004 23:25:13 -0000
@@ -346,9 +346,6 @@
{
if (ca_system_id == caids[i] && ca_pid != 0)
{
- if (slot == 1 && ca_system_id == 0x0B00)
- continue;
-
if (first_send)
fprintf(stderr,"Adding CA Descriptor (CASID=%0.4X, "
"CAPID=%0.4X)\n", ca_system_id, ca_pid);
More information about the mythtv-dev
mailing list