Permalink
Browse files

Several small fixes relating resulting from cross sourcing feature. F…

…ix sourceutil query error referencing removed cardinput.sourceid
  • Loading branch information...
1 parent 8c64088 commit c8edf14c024ec0bb20ca470ff05bd72ea61952a6 @pinkylinc committed Jun 9, 2012
Showing with 1 addition and 12 deletions.
  1. +1 −1 mythtv/libs/libmythtv/channelutil.h
  2. +0 −11 mythtv/libs/libmythtv/sourceutil.cpp
@@ -187,7 +187,7 @@ class MTV_PUBLIC ChannelUtil
{
return GetChannelsInternal(sourceid, false, true, QString(), 0);
}
- static bool GetChannelSourceID(uint &sourceid, const QString channum, const uint cardinputid, QString maptypes = "main");
+ static bool GetChannelSourceID(uint &sourceid, const QString channum, const uint cardinputid, QString maptypes = "'main'");
static vector<uint> GetChanIDs(int sourceid = -1);
static uint GetChannelCount(int sourceid = -1);
static void SortChannels(DBChanInfoList &list, const QString &order,
@@ -505,17 +505,6 @@ bool SourceUtil::DeleteSource(uint sourceid)
return false;
}
- // Delete the inputs associated with the source
- query.prepare("DELETE FROM cardinput "
- "WHERE sourceid = :SOURCEID");
- query.bindValue(":SOURCEID", sourceid);
-
- if (!query.exec() || !query.isActive())
- {
- MythDB::DBError("Deleting cardinputs", query);
- return false;
- }
-
// Delete the source itself
query.prepare("DELETE FROM videosource "
"WHERE sourceid = :SOURCEID");

0 comments on commit c8edf14

Please sign in to comment.