One more "Remove useless test before free"

[vlc] / modules / demux / smf.c

diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index 4ed43136cea245fb1c8a488e4e9be1e927c816ce..26a6e0e944b9c584943c55a050b58b710f23f4a1 100644 (file)
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -444,7 +444,7 @@ int HandleMessage (demux_t *p_demux, mtrk_t *tr)
                 case 0xFF: /* SMF Meta Event */
                     if (HandleMeta (p_demux, tr))
                         return -1;
-                    /* We MUST NOT pass this event to forward. It would be
+                    /* We MUST NOT pass this event forward. It would be
                      * confused as a MIDI Reset real-time event. */
                     goto skip;
                 case 0xF1:
@@ -573,5 +573,22 @@ static int Demux (demux_t *p_demux)
  *****************************************************************************/
 static int Control (demux_t *p_demux, int i_query, va_list args)
 {
-    return demux2_vaControlHelper (p_demux->s, 0, -1, 0, 1, i_query, args);
+    demux_sys_t *p_sys = p_demux->p_sys;
+
+    switch (i_query)
+    {
+        case DEMUX_GET_TIME:
+        {
+            *(va_arg (args, int64_t *)) = date_Get (&p_sys->pts);
+            return 0;
+        }
+#if 0
+        /* TODO: */
+        case DEMUX_SET_TIME:
+        case DEMUX_GET_POSITION:
+        case DEMUX_SET_POSITION:
+        case DEMUX_GET_LENGTH:
+#endif
+    }
+    return VLC_EGENERIC;
 }