[vlc-commits] Revert "vout: show empty epg"

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May 11 11:05:20 2017 +0200| [2577acf2febf7a3a59ee26c1380aeee32050719a] | committer: Francois Cartegnie

Revert "vout: show empty epg"

This reverts commit 5b269e2292fe60104750d35db8541e5768a065af.

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

 src/video_output/video_epg.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/video_output/video_epg.c b/src/video_output/video_epg.c
index fe62c5fe50..e432ce19ec 100644
--- a/src/video_output/video_epg.c
+++ b/src/video_output/video_epg.c
@@ -161,33 +161,35 @@ static subpicture_region_t * vout_BuildOSDEpg(vlc_epg_t *epg,
                                 visible_height * EPG_NAME_SIZE,
                                 0x00ffffff);
 
-    if (*last_ptr)
-        last_ptr = &(*last_ptr)->p_next;
+    if (!*last_ptr)
+        return head;
 
     /* Display the name of the current program. */
+    last_ptr = &(*last_ptr)->p_next;
     *last_ptr = vout_OSDEpgText(epg->p_current ? epg->p_current->psz_name : NULL,
                                 x + visible_width  * (EPG_LEFT + 0.025),
                                 y + visible_height * (EPG_TOP + 0.05),
                                 visible_height * EPG_PROGRAM_SIZE,
                                 0x00ffffff);
 
-    if (*last_ptr)
-        last_ptr = &(*last_ptr)->p_next;
+    if (!*last_ptr || !epg->p_current)
+        return head;
 
-    if(epgtime && epg->p_current)
+    if(epgtime)
     {
         f_progress = (epgtime - epg->p_current->i_start) /
                      (float)epg->p_current->i_duration;
     }
 
     /* Display the current program time slider. */
+    last_ptr = &(*last_ptr)->p_next;
     *last_ptr = vout_OSDEpgSlider(x + visible_width  * EPG_LEFT,
                                   y + visible_height * (EPG_TOP + 0.1),
                                   visible_width  * (1 - 2 * EPG_LEFT),
                                   visible_height * 0.05,
                                   f_progress);
 
-    if (!*last_ptr || !epg->p_current)
+    if (!*last_ptr)
         return head;
 
     /* Format the hours of the beginning and the end of the current program. */
@@ -315,10 +317,6 @@ int vout_OSDEpg(vout_thread_t *vout, input_item_t *input)
                 epg->psz_name = strdup(tmp->psz_name);
         }
     }
-    else /* Always display something as user hotkey feedback */
-    {
-        epg = vlc_epg_New(0, 0);
-    }
     epg_time = input->i_epg_time;
     vlc_mutex_unlock(&input->lock);