Add ToMap() functions to ChannelInfo and DBChannelInfo

Author: stuartm

mythtv/libs/libmythbase/mythversion.h

@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20110716-1"
+#define MYTH_BINARY_VERSION "0.25.20110717-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

mythtv/libs/libmythtv/dbchannelinfo.cpp

@@ -14,6 +14,8 @@
 #include "mythdirs.h"
 #include "mpegstreamdata.h" // for CryptStatus
 #include "remotefile.h"
+#include "channelgroup.h"
+#include "sourceutil.h"
 
 DBChannel::DBChannel(const DBChannel &other)
 {
@@ -55,6 +57,22 @@ DBChannel &DBChannel::operator=(const DBChannel &other)
     return *this;
 }
 
+void DBChannel::ToMap(InfoMap& infoMap) const
+{
+    infoMap["channelnumber"] = channum;
+    infoMap["callsign"] = callsign;
+    infoMap["channelname"] = name;
+    infoMap["channelicon"] = icon;
+    infoMap["channelid"] = QString().setNum(chanid);
+    infoMap["majorchan"] = QString().setNum(major_chan);
+    infoMap["minorchan"] = QString().setNum(minor_chan);
+    infoMap["mplexid"] = QString().setNum(mplexid);
+    infoMap["channelvisible"] = visible ? QObject::tr("Yes") : QObject::tr("No");
+    
+    infoMap["channelgroupname"] = ChannelGroup::GetChannelGroupName(grpid);
+    infoMap["channelsourcename"] = SourceUtil::GetSourceName(sourceid);
+}
+
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 
@@ -72,6 +90,17 @@ QString ChannelInfo::GetFormatted(const QString &format) const
     return tmp;
 }
 
+void ChannelInfo::ToMap(InfoMap& infoMap) const
+{
+    infoMap["callsign"] = callsign;
+    infoMap["channelicon"] = iconpath;
+    infoMap["chanstr"] = chanstr;
+    infoMap["channelname"] = channame;
+    infoMap["channelid"] = QString().setNum(chanid);
+    infoMap["channelsourcename"] = sourcename;
+    infoMap["channelrecpriority"] = recpriority;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 

mythtv/libs/libmythtv/dbchannelinfo.h

@@ -15,6 +15,7 @@ using namespace std;
 
 // MythTV headers
 #include "mythtvexp.h" 
+#include "programtypes.h"
 
 // TODO: Refactor DBChannel, PixmapChannel and ChannelInfo into a single class
 
@@ -31,6 +32,8 @@ class MTV_PUBLIC DBChannel
 
     bool operator == (uint _chanid) const
         { return chanid == _chanid; }
+        
+    void ToMap(InfoMap &infoMap) const;
 
   public:
     QString channum;
@@ -53,7 +56,8 @@ class MTV_PUBLIC ChannelInfo
  public:
     ChannelInfo() : chanid(-1), sourceid(-1), favid(-1) {}
     QString GetFormatted(const QString &format) const;
-
+    void ToMap(InfoMap &infoMap) const;
+    
     QString callsign;
     QString iconpath;
     QString chanstr;