[Emms-patches] darcs patch: emms-playlist-limit.el: (define-emms-pla... (and 9 more)

[Michael Olson]

Tue Jul 17 04:25:36 EDT 2007  William Xu <address@hidden>
  * emms-playlist-limit.el: (define-emms-playlist-limit) Fix prompt string bug.

Tue Jul 17 05:54:54 EDT 2007  William Xu <address@hidden>
  * emms-playlist-sort.el: Remove emms-playlist-sort-prefix to make the
  codes more clean. And steal "s" prefix key from
  `emms-playlist-mode'. (An alternative for emms-playlist-mode could be
  "v", same as XMMS)

Tue Jul 17 06:09:46 EDT 2007  William Xu <address@hidden>
  * emms-lyrics.el: Set default value for emms-lyrics-dir to ~/music/lyrics.

Tue Jul 17 09:15:38 EDT 2007  William Xu <address@hidden>
  * emms-setup.el: Enable emms-score in emms-devel.

Thu Jul 19 02:50:03 EDT 2007  William Xu <address@hidden>
  * emms-playlist-sort.el: Bind "s s" to emms-playlist-sort-by-score.

Sun Jul 22 21:57:22 EDT 2007  Michael Olson <address@hidden>
  * emms-player-mpd: Make callback arg for emms-player-mpd-sync-from-emms 
optional

Sun Jul 22 21:59:56 EDT 2007  Michael Olson <address@hidden>
  * emms-player-mpd: Fix bug with selecting an individual URL track to play 
from a streamlist

Sun Jul 22 22:03:04 EDT 2007  Michael Olson <address@hidden>
  * emms-streams: New option emms-stream-repeat-p
  
  Instead of assuming that everyone will want to automatically repeat a
  streamlist if it runs out of tracks, make this controlled by the
  `emms-stream-repeat-p' option, which defaults to nil.
  

Sun Jul 22 22:34:52 EDT 2007  Michael Olson <address@hidden>
  * emms-playlist-limit: Use standard enable/disable/toggle interface

Sun Jul 22 22:35:32 EDT 2007  Michael Olson <address@hidden>
  * Fix compiler warning in emms-setup

New patches:

[emms-playlist-limit.el: (define-emms-playlist-limit) Fix prompt string bug.
William Xu <address@hidden>**20070717082536] {
hunk ./emms-playlist-limit.el 50
+              (attr-name ,(emms-replace-regexp-in-string
+                           "info-" "" (symbol-name attribute)))
hunk ./emms-playlist-limit.el 53
-                       (format "Limit to artist (regexp = %s): " curr)
-                     (format "Limit to artist (regexp): "))))
+                       (format "Limit to %s (regexp = %s): " attr-name curr)
+                     (format "Limit to %s (regexp): " attr-name))))
}

[emms-playlist-sort.el: Remove emms-playlist-sort-prefix to make the
William Xu <address@hidden>**20070717095454
 codes more clean. And steal "s" prefix key from
 `emms-playlist-mode'. (An alternative for emms-playlist-mode could be
 "v", same as XMMS)
] {
hunk ./emms-playlist-sort.el 36
-;; FIXME, Should better avoid relying on setting before loading
-(defcustom emms-playlist-sort-prefix "S"
-  "Prefix key sequence for `emms-playlist-sort-map'.
-If you want to customize it, you must set this variable before
-loading `emms-playlist-sort'."
-  :type 'string
-  :group 'emms-playlist-sort)
-
hunk ./emms-playlist-sort.el 85
-(defvar emms-playlist-sort-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "n") 'emms-playlist-sort-by-name)
-    (define-key map (kbd "a") 'emms-playlist-sort-by-info-artist)
-    (define-key map (kbd "t") 'emms-playlist-sort-by-info-title)
-    (define-key map (kbd "b") 'emms-playlist-sort-by-info-album)
-    (define-key map (kbd "y") 'emms-playlist-sort-by-info-year)
-    (define-key map (kbd "o") 'emms-playlist-sort-by-info-note)
-    (define-key map (kbd "N") 'emms-playlist-sort-by-natural-order)
-    (define-key map (kbd "l") 'emms-playlist-sort-by-list)
-    map))
+(eval-after-load 'emms-playlist-mode
+  '(progn
+     ;; Steal this key from emms-playlist-mode..
+     (define-key emms-playlist-mode-map (kbd "s") nil)
hunk ./emms-playlist-sort.el 90
-(eval-after-load "emms-playlist-mode"
-  '(and (boundp 'emms-playlist-mode-map)
-        (define-key emms-playlist-mode-map
-          emms-playlist-sort-prefix
-          emms-playlist-sort-map)))
+     (define-key emms-playlist-mode-map (kbd "s n") 
'emms-playlist-sort-by-name)
+     (define-key emms-playlist-mode-map (kbd "s a") 
'emms-playlist-sort-by-info-artist)
+     (define-key emms-playlist-mode-map (kbd "s t") 
'emms-playlist-sort-by-info-title)
+     (define-key emms-playlist-mode-map (kbd "s b") 
'emms-playlist-sort-by-info-album)
+     (define-key emms-playlist-mode-map (kbd "s y") 
'emms-playlist-sort-by-info-year)
+     (define-key emms-playlist-mode-map (kbd "s o") 
'emms-playlist-sort-by-info-note)
+     (define-key emms-playlist-mode-map (kbd "s N") 
'emms-playlist-sort-by-natural-order)
+     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)))
}

[emms-lyrics.el: Set default value for emms-lyrics-dir to ~/music/lyrics.
William Xu <address@hidden>**20070717100946] {
hunk ./emms-lyrics.el 85
-(defcustom emms-lyrics-dir ""
+(defcustom emms-lyrics-dir "~/music/lyrics"
hunk ./emms-lyrics.el 143
-  (message "emms lyrics disabled."))
+  (message "EMMS lyrics disabled"))
hunk ./emms-lyrics.el 159
-       (message "Disable lyrics on minibufer."))
+       (message "Disable lyrics on minibufer"))
hunk ./emms-lyrics.el 161
-    (message "Enable lyrics on minibufer.")))
+    (message "Enable lyrics on minibufer")))
hunk ./emms-lyrics.el 170
-       (message "Disable lyrics on mode line."))
+       (message "Disable lyrics on mode line"))
hunk ./emms-lyrics.el 172
-    (message "Enable lyrics on mode line.")))
+    (message "Enable lyrics on mode line")))
hunk ./emms-lyrics.el 450
-        (when (not (string= emms-lyrics-dir ""))
+        (when (and (file-exists-p emms-lyrics-dir)
+                   (not (string= emms-lyrics-dir "")))
}

[emms-setup.el: Enable emms-score in emms-devel.
William Xu <address@hidden>**20070717131538] {
hunk ./emms-setup.el 137
+  (emms-score 1)
hunk ./emms-setup.el 140
-
}

[emms-playlist-sort.el: Bind "s s" to emms-playlist-sort-by-score.
William Xu <address@hidden>**20070719065003] {
hunk ./emms-playlist-sort.el 89
-
hunk ./emms-playlist-sort.el 96
-     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)))
+     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)
+     (define-key emms-playlist-mode-map (kbd "s s") 
'emms-playlist-sort-by-score)))
}

[emms-player-mpd: Make callback arg for emms-player-mpd-sync-from-emms optional
Michael Olson <address@hidden>**20070723015722] {
hunk ./emms-player-mpd.el 581
-       (funcall fn buffer id)))))
+       (when (functionp fn)
+         (funcall fn buffer id))))))
hunk ./emms-player-mpd.el 584
-(defun emms-player-mpd-sync-from-emms (callback)
+(defun emms-player-mpd-sync-from-emms (&optional callback)
}

[emms-player-mpd: Fix bug with selecting an individual URL track to play from a 
streamlist
Michael Olson <address@hidden>**20070723015956] {
hunk ./emms-player-mpd.el 909
-           (not (memq (emms-track-get track 'type) '(streamlist playlist)))
-           (not (string-match "\\`http://"; (emms-track-get track 'name))))
+           (not (memq (emms-track-get track 'type) '(streamlist playlist))))
}

[emms-streams: New option emms-stream-repeat-p
Michael Olson <address@hidden>**20070723020304
 
 Instead of assuming that everyone will want to automatically repeat a
 streamlist if it runs out of tracks, make this controlled by the
 `emms-stream-repeat-p' option, which defaults to nil.
 
] {
hunk ./emms-streams.el 91
+(defcustom emms-stream-repeat-p nil
+  "*If non-nil, try to repeat a streamlist if it gets disconnected."
+  :set (function
+        (lambda (sym val)
+          (when (buffer-live-p emms-stream-playlist-buffer)
+            (with-current-buffer emms-stream-playlist-buffer
+              (setq emms-repeat-playlist val)))
+          (set sym val)))
+  :type 'boolean
+  :group 'emms-stream)
+
hunk ./emms-streams.el 253
-      ;; make sure that we continue to play the station, even if
-      ;; briefly disconnected
-      (set (make-local-variable 'emms-repeat-playlist) t))))
+      ;; if emms-stream-repeat-p is non-nil, make sure that we
+      ;; continue to play the station, even if briefly disconnected
+      (set (make-local-variable 'emms-repeat-playlist)
+           emms-stream-repeat-p))))
}

[emms-playlist-limit: Use standard enable/disable/toggle interface
Michael Olson <address@hidden>**20070723023452] {
hunk ./emms-playlist-limit.el 29
-;;;###autoload
+(defvar emms-playlist-limit-enabled-p nil
+  "If non-nil, emms playlist limit is enabled.")
+
hunk ./emms-playlist-limit.el 33
-  "Turn on emms limit if ARG is positive, off otherwise."
+  "Turn on emms playlist limit if ARG is positive, off otherwise."
hunk ./emms-playlist-limit.el 36
-      (add-hook 'emms-playlist-source-inserted-hook
-                'emms-playlist-limit-insert)
+      (progn
+        (setq emms-playlist-limit-enabled-p t)
+        (add-hook 'emms-playlist-source-inserted-hook
+                  'emms-playlist-limit-insert))
+    (setq emms-playlist-limit-enabled-p nil)
hunk ./emms-playlist-limit.el 44
+;;;###autoload
+(defun emms-playlist-limit-enable ()
+  "Turn on emms playlist limit."
+  (interactive)
+  (emms-playlist-limit 1)
+  (message "emms playlist limit enabled"))
+
+;;;###autoload
+(defun emms-playlist-limit-disable ()
+  "Turn off emms playlist limit."
+  (interactive)
+  (emms-playlist-limit -1)
+  (message "emms playlist limit disabled"))
+
+;;;###autoload
+(defun emms-playlist-limit-toggle ()
+  "Toggle emms playlist limit."
+  (interactive)
+  (if emms-playlist-limit-enabled-p
+      (emms-playlist-limit-disable)
+    (emms-playlist-limit-enable)))
+
}

[Fix compiler warning in emms-setup
Michael Olson <address@hidden>**20070723023532] {
hunk ./emms-setup.el 76
-  (require 'emms-playlist-mode)
-  (require 'emms-info)
-  (require 'emms-info-mp3info)
-  (require 'emms-info-ogginfo)
-  (require 'emms-cache)
+  (eval-and-compile
+    (require 'emms-playlist-mode)
+    (require 'emms-info)
+    (require 'emms-info-mp3info)
+    (require 'emms-info-ogginfo)
+    (require 'emms-cache))
hunk ./emms-setup.el 125
-  (require 'emms-metaplaylist-mode)
-  (require 'emms-stream-info)
-  (require 'emms-score)
-  (require 'emms-last-played)
-  (require 'emms-bookmarks)
-  (require 'emms-history)
-  (require 'emms-mark)
-  (require 'emms-i18n)
-  (require 'emms-tag-editor)
-  (require 'emms-volume)
-  (require 'emms-playlist-limit)
+  (eval-and-compile
+    (require 'emms-metaplaylist-mode)
+    (require 'emms-stream-info)
+    (require 'emms-score)
+    (require 'emms-last-played)
+    (require 'emms-bookmarks)
+    (require 'emms-history)
+    (require 'emms-mark)
+    (require 'emms-i18n)
+    (require 'emms-tag-editor)
+    (require 'emms-volume)
+    (require 'emms-playlist-limit))
}

Context:

[make-number-of-secs-to-seek-configurable.dpatch
Tassilo Horn <address@hidden>**20070712062052
 
 Patch sent by "Alfred M. Szmidt" <address@hidden> in
 <address@hidden> on the emms-users list (with
 slight modifications).
] 
[Avoid even the most remote possibility of a conflict with color-theme.el and 
its very bad replace-in-string function
Michael Olson <address@hidden>**20070712211444] 
[emms-playlist-limit.el: Add missing line: (define-emms-playlist-limit 
info-title).
William Xu <address@hidden>**20070711071022] 
[emms-playlist-limit.el: Minor updates.
William Xu <address@hidden>**20070709103714] 
[emms-playlist-limit.el: Update Copyright to GPLv3.
William Xu <address@hidden>**20070708140012] 
[emms-playlist-sort.el: Minor updates.
William Xu <address@hidden>**20070708120050] 
[emms-playlist-limit.el: Redefine functions emms-playlist-limit-to-* with
William Xu <address@hidden>**20070708115907
 macro: define-emms-playlist-limit.
] 
[emms-playlist-limit.el: Add default value based on track at point for
William Xu <address@hidden>**20070708040809
 emms-playlist-limit-to-*.
] 
[New file: emms-playlist-limit.el. And minor updates to emms-playlist-sort.
William Xu <address@hidden>**20070705160221] 
[emms-player-mplayer.el: Add "eng.srt", "chs.srt", "cht.srt" to
William Xu <address@hidden>**20070630124728
 emms-player-mplayer-subtitle-extensions.
] 
[Updated NEWS for post-3.0
address@hidden 
[TAG 3.0
address@hidden 
Patch bundle hash:
ec3d138724c77921fa219ecf69779743c78e3b2a