Changeset 16926

Timestamp:

07/01/12 13:33:34 (12 years ago)

Author:

nit

Message:

[titan] add title to description in gmultiepg

File:

• titan/titan/gmultiepg.h (modified) (6 diffs)

titan/titan/gmultiepg.h

@@ -420 +420 @@
         drawscreen(gmultiepg, 0, 0);
 }
-
-void gmultiepgfilldesc(struct skin* listbox, struct skin* epgdesc)
-{
-        char* tmpstr2 = NULL;
-
-        if(listbox->select != NULL)
-        {
-                tmpstr2 = epgdescunzip((struct epg*)listbox->select->handle1);
-                changetext(epgdesc, tmpstr2);
-                free(tmpstr2); tmpstr2 = NULL;
+                                                                                                                                                                                                                                                                                                                                :
+//flag 0: epg from listbox
+//flag 1: epg from param or aktepg
+void gmultiepgfilldesc(struct skin* listbox, struct skin* epgdesc, struct epg* epgnode, struct channel* chnode, int flag)
+{
+        char* tmpstr = NULL;
+
+        changetext(epgdesc, NULL);
+
+        if(flag == 0)
+        {
+                if(listbox->select != NULL)
+                        epgnode = (struct epg*)listbox->select->handle1;
+        }
+        else
+                if(chnode != NULL && epgnode == NULL) epgnode = getepgakt(chnode);
+
+        if(epgnode != NULL)
+        {
+                if(epgnode->title != NULL)
+                        tmpstr = ostrcat(epgnode->title, " - ", 0, 0);
+                tmpstr = ostrcat(tmpstr, epgdescunzip(epgnode), 1, 1);
+                changetext(epgdesc, tmpstr);
+                free(tmpstr); tmpstr = NULL;
         }
 }
@@ -471 +485 @@
         
         int list = ALLCHANNEL;
-        char* tmpstr = NULL, *tmpstr1 = NULL, *tmpstr2 = NULL;
+        char* tmpstr = NULL, *tmpstr1 = NULL;
         void* aktlist = NULL;
         int character = 0;
@@ -494 +508 @@
 
         if(chnode == NULL) chnode = status.aktservice->channel;
-        if(epgnode == NULL) epgnode = getepgakt(chnode);
-        tmpstr2 = epgdescunzip(epgnode);
-        changetext(epgdesc, tmpstr2);
-        free(tmpstr2); tmpstr2 = NULL;
+        gmultiepgfilldesc(listbox, epgdesc, epgnode, chnode, 1);
 
         //chalc screen, so we have all infos
@@ -747 +758 @@
                         createtimeline(gmultiepg, timeline, akttime, zoom);
                         drawscreen(gmultiepg, 2, 0);
-                        gmultiepgfilldesc(listbox, epgdesc);
+                        gmultiepgfilldesc(listbox, epgdesc, NULL, NULL, 0);
                         drawscreen(gmultiepg, 0, 0);
                         if(listbox->select != NULL)
@@ -774 +785 @@
                         createtimeline(gmultiepg, timeline, akttime, zoom);
                         drawscreen(gmultiepg, 2, 0);
-                        gmultiepgfilldesc(listbox, epgdesc);
+                        gmultiepgfilldesc(listbox, epgdesc, NULL, NULL, 0);
                         drawscreen(gmultiepg, 0, 0);
                         if(listbox->select != NULL)
@@ -789 +800 @@
                 }
 
-                gmultiepgfilldesc(listbox, epgdesc);
+                gmultiepgfilldesc(listbox, epgdesc, NULL, NULL, 0);
                 drawscreen(gmultiepg, 0, 0);
                 if(listbox->select != NULL)