From 73b44b44a4c97653189fdcdddb78e49507b6baa7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 14 Oct 2012 23:44:49 +0200
Subject: input: minor simplification to mp_input_get_cmd()

---
 input/input.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'input')

diff --git a/input/input.c b/input/input.c
index 1ea5050031..63d8537ed3 100644
--- a/input/input.c
+++ b/input/input.c
@@ -632,11 +632,6 @@ static void queue_remove(struct cmd_queue *queue, struct mp_cmd *cmd)
     *p_prev = cmd->queue_next;
 }
 
-static void queue_pop(struct cmd_queue *queue)
-{
-    queue_remove(queue, queue->first);
-}
-
 static void queue_add(struct cmd_queue *queue, struct mp_cmd *cmd,
                       bool at_head)
 {
@@ -1529,20 +1524,20 @@ mp_cmd_t *mp_input_get_cmd(struct input_ctx *ictx, int time, int peek_only)
     if (ictx->control_cmd_queue.first || ictx->key_cmd_queue.first)
         time = 0;
     read_all_events(ictx, time);
-    struct mp_cmd *ret;
     struct cmd_queue *queue = &ictx->control_cmd_queue;
     if (!queue->first)
         queue = &ictx->key_cmd_queue;
     if (!queue->first) {
-        ret = check_autorepeat(ictx);
-        if (!ret)
-            return NULL;
-        queue_add(queue, ret, false);
-    } else
-        ret = queue->first;
+        struct mp_cmd *repeated = check_autorepeat(ictx);
+        if (repeated)
+            queue_add(queue, repeated, false);
+    }
+    struct mp_cmd *ret = queue->first;
+    if (!ret)
+        return NULL;
 
     if (!peek_only)
-        queue_pop(queue);
+        queue_remove(queue, ret);
 
     return ret;
 }
-- 
cgit v1.2.3