PKGBUILD

 # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
 pkgname=lektor
-pkgver=mk7.818.a4f399d
+pkgver=mk7.957.7f1fbc7
 pkgrel=1
 pkgdesc="The lektor kara player, from the Bakaclub"
 arch=(x86_64 i686)

inc/lektor/database.h

@@ -55,6 +55,7 @@ void database_update_touch        (volatile sqlite3 *db, int id);
 
 /* Control the content of the queue. */
 bool database_queue_add_uri(volatile sqlite3 *db, struct lkt_uri *uri, int priority);
+bool database_queue_add_id(volatile sqlite3 *db, int id, int priority);
 bool database_queue_del_id (volatile sqlite3 *db, int id);
 bool database_queue_del_pos(volatile sqlite3 *db, int pos);
 bool database_queue_clear  (volatile sqlite3 *db);

inc/lektor/uri.h

@@ -17,7 +17,11 @@ enum lkt_uri_type {
 
 struct lkt_uri {
     enum lkt_uri_type type;
-    void *value;
+    union {
+        void *value;
+        size_t id;
+    };
+
 
     bool _allocated;
 };

src/commands.c

@@ -247,7 +247,9 @@ command_stop(volatile sqlite3 *db, struct lkt_win *win, mpd_idle_flag *watch_mas
 }
 
 bool
-command_add(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr, int priority)
+command_add(volatile sqlite3 *db, struct lkt_win *win,
+            char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr,
+            int priority)
 {
     RETURN_UNLESS(args, "Invalid argument", false);
     *watch_mask_ptr |= MPD_IDLE_PLAYLIST;
@@ -264,18 +266,19 @@ command_add(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_AR
 }
 
 bool
-command_addid(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr)
+command_addid(volatile sqlite3 *db, struct lkt_win *win,
+              char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr)
 {
     UNUSED(win);
     RETURN_UNLESS(args, "Invalid argument", false);
-    long id;
-    char *endptr = NULL, err = 0;
+    errno = 0;
+    int i;
     struct lkt_uri uri = { .type = uri_id };
+    for (i = 0; (uri.id = strtol(args[i], NULL, 0)) && ! errno; ++i) {
+        errno |= database_queue_add_id(db, uri.id, 1);
+    }
     *watch_mask_ptr |= MPD_IDLE_PLAYLIST;
-    STRTOL(id, args[0], endptr, err);
-    RETURN_IF(err, "STRTOL failed", false);
-    uri.value = (void *) (size_t) id;
-    return database_queue_add_uri(db, &uri, 1);
+    return ! errno;
 }
 
 inline bool

src/database/queue.c

@@ -266,7 +266,7 @@ database_queue_add_uri(volatile sqlite3 *db, struct lkt_uri *uri, int priority)
         return queue_add_with_col_like_str(db, LKT_DATABASE_KARA_ALL,
                                            uri->value, priority);
     case uri_id:
-        return database_queue_add_id(db, *(int *) uri->value, priority);
+        return database_queue_add_id(db, uri->id, priority);
     case uri_type:
         return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KTYPE,
                                            uri->value, priority);

src/mkv/mkv.c

@@ -403,6 +403,8 @@ mkv_seek_tags(struct bufferfd *bf, size_t header_len)
 
     while (seekhead_len > 0) {
         struct mkv_seek s;
+        s.id = 0;
+        s.pos = 0;
         uint32_t eid;
         ssize_t n;
 

src/net/listen.c

@@ -223,11 +223,11 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
             err = !command_help(srv, c);
 
         else if (STR_MATCH(cmd.name, "__insert"))
-            err = !command_add((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events, 5);
+            err = ! command_add((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events, 5);
         else if (STR_MATCH(cmd.name, "searchadd") || STR_MATCH(cmd.name, "findadd") || STR_MATCH(cmd.name, "add"))
-            err = !command_add((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events, 1);
+            err = ! command_add((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events, 1);
         else if (STR_MATCH(cmd.name, "addid"))
-            err = !command_addid((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events);
+            err = ! command_addid((sqlite3 *) srv->db, &srv->win, cmd.args, &srv->mpd_idle_events);
         else if (STR_MATCH(cmd.name, "deleteid"))
             err = ! (cmd.args[0] != NULL &&
                      command_delid((sqlite3 *) srv->db, &srv->win, cmd.args[0], &srv->mpd_idle_events));