Ticket #1424: mplayer-shuffle.diff

playtree.c

@@ -221 +221 @@
 
 }
 
+static play_tree_t*
+play_tree_shuffle(play_tree_t* head) {
+  play_tree_t* iter;
+  play_tree_t** list;
+  int i, r;
+  int count = 1;
+
+  while (head->prev)
+    head = head->prev;
+
+  iter = head;
+  while (iter = iter->next)
+    count++;
+
+  if (count <= 1)
+    return head;
+
+  list = malloc(count * sizeof(*list));
+  if (list == NULL) {
+    mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory to shuffle playlist\n",(int)sizeof(*list) * count);
+    return head;
+  }
+
+  for (i = 0, iter = head; i < count; i++) {
+    list[i] = iter;
+    iter = iter->next;
+  }
+
+  // shuffle
+  for (i = count - 1; i > 0; i--) {
+    r = (int)((float)(i) * rand() / (RAND_MAX + 1.0));
+    iter = list[i];
+    list[i] = list[r];
+    list[r] = iter;
+  }
+
+  // rebuild playtree
+  for (i = 0; i < count; i++) {
+    list[i]->prev = NULL;
+    list[i]->next = NULL;
+  }
+
+  head = list[0];
+  for (i = 1; i < count; i++) {
+    play_tree_append_entry(head, list[i]);
+    head = list[i];
+  }
+
+  head = list[0];
+  play_tree_set_parent(head, head->parent);
+
+  free(list);
+
+  return head;
+}
+
 void
 play_tree_set_child(play_tree_t* pt, play_tree_t* child) {
   play_tree_t* iter;
@@ -517 +573 @@
   free(iter);
 }
 
-static play_tree_t*
-play_tree_rnd_step(play_tree_t* pt) {
-  int count = 0;
-  int r;
-  play_tree_t *i,*head;
 
-  // Count how many free choice we have
-  for(i = pt ; i->prev ; i = i->prev)
-    if(!(i->flags & PLAY_TREE_RND_PLAYED)) count++;
-  head = i;
-  if(!(i->flags & PLAY_TREE_RND_PLAYED)) count++;
-  for(i = pt->next ; i ; i = i->next)
-    if(!(i->flags & PLAY_TREE_RND_PLAYED)) count++;
-
-  if(!count) return NULL;
-
-  r = (int)((float)(count) * rand() / (RAND_MAX + 1.0));
-
-  for(i = head ; i  ; i=i->next) {
-    if(!(i->flags & PLAY_TREE_RND_PLAYED)) r--;
-    if(r < 0) return i;
-  }
-
-  mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Random stepping error\n");
-  return NULL;
-}
-
-
 int
 play_tree_iter_step(play_tree_iter_t* iter, int d,int with_nodes) {
-  play_tree_t* pt;
+  play_tree_t *pt, *parent;
 
   if ( !iter ) return PLAY_TREE_ITER_ENTRY;
   if ( !iter->root ) return PLAY_TREE_ITER_ENTRY;
@@ -568 +597 @@
     m_config_pop(iter->config);
   }
 
-  if(iter->tree->parent && (iter->tree->parent->flags & PLAY_TREE_RND))
-    iter->mode = PLAY_TREE_ITER_RND;
-  else
-    iter->mode = PLAY_TREE_ITER_NORMAL;
+  parent = iter->tree->parent;
+  if(parent && (parent->flags & PLAY_TREE_RND)) {
+    iter->tree = play_tree_shuffle(iter->tree);
+    parent->flags &= ~PLAY_TREE_RND;
+  }
 
   iter->file = -1;
-  if(iter->mode == PLAY_TREE_ITER_RND)
-    pt = play_tree_rnd_step(iter->tree);
-  else if( d > 0 ) {
+  pt = iter->tree;
+  if( d > 0 ) {
     int i;
-    pt = iter->tree;
     for(i = d ; i > 0 && pt ; i--)
       pt = pt->next;
     d = i ? i : 1;
   } else if(d < 0) {
     int i;
-    pt = iter->tree;
     for(i = d ; i < 0 && pt ; i++)
       pt = pt->prev;
     d = i ? i : -1;
-  } else
-    pt = iter->tree;
+  }
 
   if(pt == NULL) { // No next
     // Must we loop?
-    if (iter->mode == PLAY_TREE_ITER_RND) {
-      if (iter->root->loop == 0)
-        return PLAY_TREE_ITER_END;
-      play_tree_unset_flag(iter->root, PLAY_TREE_RND_PLAYED, -1);
-      if (iter->root->loop > 0) iter->root->loop--;
-      // try again
-      return play_tree_iter_step(iter, 0, with_nodes);
-    } else
     if(iter->tree->parent && iter->tree->parent->loop != 0 && ((d > 0 && iter->loop != 0) || ( d < 0 && (iter->loop < 0 || iter->loop < iter->tree->parent->loop) ) ) ) {
       if(d > 0) { // Go back to the first one
         for(pt = iter->tree ; pt->prev != NULL; pt = pt->prev)
@@ -650 +668 @@
   if(iter->config) {
     play_tree_iter_push_params(iter);
     iter->entry_pushed = 1;
-    if(iter->mode == PLAY_TREE_ITER_RND)
-      pt->flags |= PLAY_TREE_RND_PLAYED;
   }
 
   return PLAY_TREE_ITER_ENTRY;
@@ -717 +733 @@
   // Pop subtree params
   if(iter->config) {
     m_config_pop(iter->config);
-    if(iter->mode == PLAY_TREE_ITER_RND)
-      iter->tree->flags |= PLAY_TREE_RND_PLAYED;
   }
 
   return play_tree_iter_step(iter,d,with_nodes);