[vlc-devel] commit: Display EPG description if available ( Marian Ďurkovič )

[git version control]

vlc | branch: 1.0-bugfix | Marian Ďurkovič <md at bts.sk> | Mon Sep 14 08:19:12 2009 +0200| [852533b7643d34abc6f81d33b6a03fa6ef5652a9] | committer: Marian Ďurkovič 

Display EPG description if available
(cherry picked from commit be9458e0463bef78129bda6e040a67fc36130c50)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=852533b7643d34abc6f81d33b6a03fa6ef5652a9
---

 modules/demux/ts.c |    3 ++-
 src/input/item.c   |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 1564c2b..9f16acd 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -2999,7 +2999,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
 
         /* */
         if( i_start > 0 )
-            vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra );
+            vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
+                              *psz_extra ? psz_extra : NULL );
 
         /* Update "now playing" field */
         if( p_evt->i_running_status == 0x04 && i_start > 0 )
diff --git a/src/input/item.c b/src/input/item.c
index 13c9d59..7349d9e 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -726,10 +726,11 @@ void input_item_SetEpg( input_item_t *p_item,
                   1900 + tm_start.tm_year, 1 + tm_start.tm_mon, tm_start.tm_mday,
                   tm_start.tm_hour, tm_start.tm_min, tm_start.tm_sec );
         if( p_evt->psz_short_description || p_evt->psz_description )
-            InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d) - %s",
+            InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d) - %s %s",
                               p_evt->psz_name,
                               p_evt->i_duration/60/60, (p_evt->i_duration/60)%60,
-                              p_evt->psz_short_description ? p_evt->psz_short_description : p_evt->psz_description );
+                              p_evt->psz_short_description ? p_evt->psz_short_description : "" ,
+                              p_evt->psz_description ? p_evt->psz_description : "" );
         else
             InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d)",
                               p_evt->psz_name,