The new MSqlQuery changes left some typos and search-and-replace errors in the code so that MythTV does not currently compile with DVB enabled.
The attached patch fixes these problems.
-- Daniel
Index: channeleditor.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/channeleditor.cpp,v
retrieving revision 1.16
diff -r1.16 channeleditor.cpp
342c342
< ScanWizard scanwizard();
---
> ScanWizard scanwizard;
Index: dvbchannel.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbchannel.h,v
retrieving revision 1.17
diff -r1.17 dvbchannel.h
17a18
> #include "mythdbcon.h"
Index: dvbtransporteditor.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbtransporteditor.cpp,v
retrieving revision 1.4
diff -r1.4 dvbtransporteditor.cpp
36d35
<
170,172c169,171
< QSstring querystr = QString("DELETE FROM dtv_multiplex "
< "WHERE mplexid ='%1'").arg(m_nID));
< query.prepare(querystr):
---
> QString querystr = QString("DELETE FROM dtv_multiplex "
> "WHERE mplexid ='%1'").arg(m_nID);
> query.prepare(querystr);
452c451
< " AND capturecard.cardtype=\"DVB\"").arg(_nVideoSourceID));
---
> " AND capturecard.cardtype=\"DVB\"").arg(_nVideoSourceID);
Index: siscan.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/siscan.cpp,v
retrieving revision 1.7
diff -r1.7 siscan.cpp
889,891c889,892
< QString theQuery = QString("select max(chanid) as maxchan from channel
where sourceid=%1")
< .arg(sourceID);
< query.prepare(query);
---
> QString theQuery =
> QString("SELECT max(chanid) as maxchan "
> "FROM channel WHERE sourceid=%1").arg(sourceID);
> query.prepare(theQuery);
_______________________________________________ mythtv-dev mailing list [email protected] http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
