[Bongo-patches] Change VLC backend to look for "main playlist: nothing to play" [...]

[Daniel Brockman]

Hi,

This is my first message to this list.  I am not sure how
best to do this, but I suppose we will learn as we go along.

I have opted to send patches as standard unified diffs.
(If you want Darcs patches, just pull from my repository.)

I think everyone should feel free to comment on any patches
sent to this list.  I see no reason to keep it patch-only.
(Perhaps threads about patches should be moved to bongo-devel
if they take a turn towards design or user interface issues.)

Anyway, without further ado, let me present the first patch:

Wed Dec 27 07:50:07 CET 2006  Daniel Brockman <address@hidden>

  * Change VLC backend to look for "main playlist: nothing
    to play" instead of "status change: ( stop state: 0 )"
    in order to fix a bug that prevented one from playing
    "cdda://" with VLC (fix suggested by Daniel Jensen).

diff -rN -u old-bongo/bongo.el new-bongo/bongo.el
--- old-bongo/bongo.el  2006-12-27 09:04:57.000000000 +0100
+++ new-bongo/bongo.el  2006-12-27 09:04:57.000000000 +0100
@@ -8,7 +8,7 @@
 ;; Author: Daniel Brockman <address@hidden>
 ;; URL: http://www.brockman.se/software/bongo/
 ;; Created: September 3, 2005
-;; Updated: December 20, 2006
+;; Updated: December 27, 2006
 
 ;; This file is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -4253,13 +4253,12 @@
                             (rx line-start
                                 "status change:"
                                 (zero-or-more (or whitespace "("))
-                                (or "play" "stop") " state:"
+                                "play state:"
                                 (zero-or-more whitespace)
                                 (submatch (one-or-more digit))
                                 (zero-or-more (or whitespace ")"))
                                 line-end)))
               (case (string-to-number (match-string 1))
-                (0 (process-send-string process "quit\n"))
                 (1 (bongo-player-put player 'paused nil)
                    (bongo-player-paused/resumed player)
                    (when (null (bongo-player-get player 'timer))
@@ -4268,6 +4267,13 @@
                    (bongo-player-paused/resumed player))))
              ((looking-at (eval-when-compile
                             (rx line-start
+                                (optional "[" (zero-or-more digit) "]")
+                                (zero-or-more whitespace)
+                                "main playlist: nothing to play"
+                                line-end)))
+              (process-send-string process "quit\n"))
+             ((looking-at (eval-when-compile
+                            (rx line-start
                                 (submatch (one-or-more digit))
                                 (zero-or-more whitespace)
                                 line-end)))

-- 
Daniel Brockman <address@hidden>

P.S.  This list is in Gmane as <gmane.emacs.bongo.patches>.