[vlc-commits] gme: provide test-and-clear-flags control

Rémi Denis-Courmont git at videolan.org
Sun Jan 28 15:18:32 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 17 21:44:23 2017 +0200| [cadf225b6edf8dda5865a79d4af4ffa2031f9a1e] | committer: Rémi Denis-Courmont

gme: provide test-and-clear-flags control

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

 modules/demux/gme.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/demux/gme.c b/modules/demux/gme.c
index 368c583b8e..6154ed9581 100644
--- a/modules/demux/gme.c
+++ b/modules/demux/gme.c
@@ -59,6 +59,7 @@ struct demux_sys_t
 
     input_title_t **titlev;
     unsigned        titlec;
+    bool            title_changed;
 };
 
 
@@ -154,6 +155,7 @@ static int Open (vlc_object_t *obj)
              title->psz_name = strdup (infos->song);
          gme_free_info (infos);
     }
+    sys->title_changed = false;
 
     /* Callbacks */
     demux->pf_demux = Demux;
@@ -210,7 +212,7 @@ static int Demux (demux_t *demux)
         if (++sys->track_id >= (unsigned)gme_track_count (sys->emu))
             return 0;
 
-        demux->info.i_update |= INPUT_UPDATE_TITLE;
+        sys->title_changed = true;
         gme_start_track (sys->emu, sys->track_id);
     }
 
@@ -325,11 +327,23 @@ static int Control (demux_t *demux, int query, va_list args)
             if (track_id >= gme_track_count (sys->emu))
                 break;
             gme_start_track (sys->emu, track_id);
-            demux->info.i_update |= INPUT_UPDATE_TITLE;
+            sys->title_changed = true;
             sys->track_id = track_id;
             return VLC_SUCCESS;
         }
 
+        case DEMUX_TEST_AND_CLEAR_FLAGS:
+        {
+            unsigned *restrict flags = va_arg(args, unsigned *);
+
+            if ((*flags & INPUT_UPDATE_TITLE) && sys->title_changed) {
+                *flags = INPUT_UPDATE_TITLE;
+                sys->title_changed = false;
+            } else
+                *flags = 0;
+            return VLC_SUCCESS;
+        }
+
         case DEMUX_GET_TITLE:
             *va_arg(args, int *) = sys->track_id;
             return VLC_SUCCESS;



More information about the vlc-commits mailing list