Change ChannelBase::GetCardID() to return uint instead of int.

MythTV · Dec 7, 2012 · b9637f8 · b9637f8
1 parent c1c09f7
commit b9637f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/mythtv/libs/libmythtv/recorders/channelbase.cpp b/mythtv/libs/libmythtv/recorders/channelbase.cpp
@@ -859,7 +859,7 @@ void ChannelBase::HandleScriptEnd(bool ok)
 /** \fn ChannelBase::GetCardID(void) const
  *  \brief Returns card id.
  */
-int ChannelBase::GetCardID(void) const
+uint ChannelBase::GetCardID(void) const
 {
     if (m_cardid > 0)
         return m_cardid;
@@ -868,10 +868,9 @@ int ChannelBase::GetCardID(void) const
         return m_pParent->GetCaptureCardNum();
 
     if (GetDevice().isEmpty())
-        return -1;
+        return 0;
 
-    uint tmpcardid = CardUtil::GetFirstCardID(GetDevice());
-    return (tmpcardid <= 0) ? -1 : tmpcardid;
+    return CardUtil::GetFirstCardID(GetDevice());
 }
 
 int ChannelBase::GetChanID() const
@@ -907,7 +906,7 @@ bool ChannelBase::InitializeInputs(void)
 {
     ClearInputMap();
 
-    uint cardid = max(GetCardID(), 0);
+    uint cardid = GetCardID();
     if (!cardid)
     {
         LOG(VB_GENERAL, LOG_ERR,

diff --git a/mythtv/libs/libmythtv/recorders/channelbase.h b/mythtv/libs/libmythtv/recorders/channelbase.h
@@ -120,7 +120,7 @@ class ChannelBase
     // \brief Set cardid for scanning
     void SetCardID(uint _cardid) { m_cardid = _cardid; }
 
-    virtual int GetCardID(void) const;
+    virtual uint GetCardID(void) const;
 
     static ChannelBase *CreateChannel(
         TVRec                    *tv_rec,

diff --git a/mythtv/libs/libmythtv/recorders/dvbchannel.cpp b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp
@@ -937,8 +937,6 @@ bool DVBChannel::ProbeTuningParams(DTVMultiplex &tuning) const
  */
 int DVBChannel::GetChanID() const
 {
-    int cardid = GetCardID();
-
     MSqlQuery query(MSqlQuery::InitCon());
 
     query.prepare("SELECT chanid "
@@ -948,7 +946,7 @@ int DVBChannel::GetChanID() const
                   "      cardinput.cardid = :CARDID");
 
     query.bindValue(":CHANNUM", m_curchannelname);
-    query.bindValue(":CARDID",  cardid);
+    query.bindValue(":CARDID", GetCardID());
 
     if (!query.exec() || !query.isActive())
     {