[Emms-patches] darcs patch: Rename emms-mp3tag.el to emms-tag-editor.el (and 2 more)

[Michael Olson]

Thu Dec  7 09:19:45 EST 2006  Michael Olson <address@hidden>
  * Rename emms-mp3tag.el to emms-tag-editor.el

Thu Dec  7 09:23:10 EST 2006  Michael Olson <address@hidden>
  * emms-tag-editor: Rename functions to match file name

Thu Dec  7 09:35:11 EST 2006  Michael Olson <address@hidden>
  * Fix various byte-compiler warnings throughout

New patches:

[Rename emms-mp3tag.el to emms-tag-editor.el
Michael Olson <address@hidden>**20061207141945] {
move ./emms-mp3tag.el ./emms-tag-editor.el
}

[emms-tag-editor: Rename functions to match file name
Michael Olson <address@hidden>**20061207142310] {
hunk ./emms-tag-editor.el 1
-;;; emms-mp3tag.el --- Edit track tags.
+;;; emms-tag-editor.el --- Edit track tags.
hunk ./emms-tag-editor.el 28
-;;   (require 'emms-mp3tag)
+;;   (require 'emms-tag-editor)
hunk ./emms-tag-editor.el 32
-(provide 'emms-mp3tag)
+(provide 'emms-tag-editor)
hunk ./emms-tag-editor.el 41
-(defvar emms-mp3tag-tags
+(defvar emms-tag-editor-tags
hunk ./emms-tag-editor.el 52
-(defvar emms-mp3tag-edit-buffer "*EMMS-TAGS*"
-  "Buffer name to edit mp3 tags")
-(defvar emms-mp3tag-log-buffer "*EMMS-LOG*"
-  "Buffer name of mp3tag edit log")
+(defvar emms-tag-editor-edit-buffer "*EMMS-TAGS*"
+  "Buffer name to edit tags")
+(defvar emms-tag-editor-log-buffer "*EMMS-LOG*"
+  "Buffer name of tag edit log")
hunk ./emms-tag-editor.el 57
-(defun emms-mp3tag-make-format (tags)
+(defun emms-tag-editor-make-format (tags)
hunk ./emms-tag-editor.el 63
-                     "%" (cdr (assoc tag emms-mp3tag-tags))))
+                     "%" (cdr (assoc tag emms-tag-editor-tags))))
hunk ./emms-tag-editor.el 66
-(defvar emms-mp3tag-formats
-  (let* ((tags (mapcar 'car emms-mp3tag-tags))
-         (default (emms-mp3tag-make-format (remove 'info-date tags))))
+(defvar emms-tag-editor-formats
+  (let* ((tags (mapcar 'car emms-tag-editor-tags))
+         (default (emms-tag-editor-make-format (remove 'info-date tags))))
hunk ./emms-tag-editor.el 70
-      ("ogg" . ,(emms-mp3tag-make-format (remove 'info-year tags)))
+      ("ogg" . ,(emms-tag-editor-make-format (remove 'info-year tags)))
hunk ./emms-tag-editor.el 85
-You can add new specification in `emms-mp3tag-tags' and use
-`emms-mp3tag-make-format' to help create a new format.
+You can add new specification in `emms-tag-editor-tags' and use
+`emms-tag-editor-make-format' to help create a new format.
hunk ./emms-tag-editor.el 89
-track, and should return a string to insert to `emms-mp3tag-edit-buffer'.
+track, and should return a string to insert to `emms-tag-editor-edit-buffer'.
hunk ./emms-tag-editor.el 92
-(defvar emms-mp3tag-get-format-function 'emms-mp3tag-get-format
+(defvar emms-tag-editor-get-format-function 'emms-tag-editor-get-format
hunk ./emms-tag-editor.el 95
-(defvar emms-mp3tag-parse-function 'emms-mp3tag-default-parser
-  "Function to parse tags in `emms-mp3tag-edit-buffer'. It should find
+(defvar emms-tag-editor-parse-function 'emms-tag-editor-default-parser
+  "Function to parse tags in `emms-tag-editor-edit-buffer'. It should find
hunk ./emms-tag-editor.el 102
-See also `emms-mp3tag-default-parser'.")
+See also `emms-tag-editor-default-parser'.")
hunk ./emms-tag-editor.el 104
-(defvar emms-mp3tag-tagfile-functions
+(defvar emms-tag-editor-tagfile-functions
hunk ./emms-tag-editor.el 113
-    ("ogg" . emms-mp3tag-tag-ogg))
+    ("ogg" . emms-tag-editor-tag-ogg))
hunk ./emms-tag-editor.el 121
-See also `emms-mp3tag-tag-file' and `emms-mp3tag-tag-ogg'.
+See also `emms-tag-editor-tag-file' and `emms-tag-editor-tag-ogg'.
hunk ./emms-tag-editor.el 124
-(defun emms-mp3tag-tag-ogg (track)
+(defun emms-tag-editor-tag-ogg (track)
hunk ./emms-tag-editor.el 135
-(defun emms-mp3tag-tag-file (track program tags)
-  "Change tag in FILE use PROGRAM. The TAGS is given in 
`emms-mp3tag-tagfile-functions'."
+(defun emms-tag-editor-tag-file (track program tags)
+  "Change tag in FILE use PROGRAM. The TAGS is given in 
`emms-tag-editor-tagfile-functions'."
hunk ./emms-tag-editor.el 146
-(defun emms-mp3tag-get-format (track)
+(defun emms-tag-editor-get-format (track)
hunk ./emms-tag-editor.el 149
-                emms-mp3tag-formats)))
+                emms-tag-editor-formats)))
hunk ./emms-tag-editor.el 152
-      (cdr (assoc "default" emms-mp3tag-formats)))))
+      (cdr (assoc "default" emms-tag-editor-formats)))))
hunk ./emms-tag-editor.el 154
-(defun emms-mp3tag-format-track (track)
-  (let ((format (funcall emms-mp3tag-get-format-function track)))
+(defun emms-tag-editor-format-track (track)
+  (let ((format (funcall emms-tag-editor-get-format-function track)))
hunk ./emms-tag-editor.el 169
-                             emms-mp3tag-tags)))))))
+                             emms-tag-editor-tags)))))))
hunk ./emms-tag-editor.el 171
-(defun emms-mp3tag-track-at (&optional pos)
+(defun emms-tag-editor-track-at (&optional pos)
hunk ./emms-tag-editor.el 180
-(defsubst emms-mp3tag-erase-buffer (&optional buf)
+(defsubst emms-tag-editor-erase-buffer (&optional buf)
hunk ./emms-tag-editor.el 186
-(defsubst emms-mp3tag-insert-track (track)
+(defsubst emms-tag-editor-insert-track (track)
hunk ./emms-tag-editor.el 188
-       (insert (emms-mp3tag-format-track track))))
+       (insert (emms-tag-editor-format-track track))))
hunk ./emms-tag-editor.el 190
-(defsubst emms-mp3tag-display-log-buffer-maybe ()
-  (if (> (buffer-size (get-buffer emms-mp3tag-log-buffer)) 0)
-      (display-buffer emms-mp3tag-log-buffer)))
+(defsubst emms-tag-editor-display-log-buffer-maybe ()
+  (if (> (buffer-size (get-buffer emms-tag-editor-log-buffer)) 0)
+      (display-buffer emms-tag-editor-log-buffer)))
hunk ./emms-tag-editor.el 194
-(defun emms-mp3tag-insert-tracks (tracks)
+(defun emms-tag-editor-insert-tracks (tracks)
hunk ./emms-tag-editor.el 196
-    (emms-mp3tag-erase-buffer emms-mp3tag-log-buffer)
-    (emms-mp3tag-erase-buffer emms-mp3tag-edit-buffer)
-    (set-buffer (get-buffer emms-mp3tag-edit-buffer))
-    (mapc 'emms-mp3tag-insert-track tracks)
-    (emms-mp3tag-mode)
+    (emms-tag-editor-erase-buffer emms-tag-editor-log-buffer)
+    (emms-tag-editor-erase-buffer emms-tag-editor-edit-buffer)
+    (set-buffer (get-buffer emms-tag-editor-edit-buffer))
+    (mapc 'emms-tag-editor-insert-track tracks)
+    (emms-tag-editor-mode)
hunk ./emms-tag-editor.el 203
-    (emms-mp3tag-display-log-buffer-maybe)))
+    (emms-tag-editor-display-log-buffer-maybe)))
hunk ./emms-tag-editor.el 205
-(defun emms-mp3tag-edit-track (track)
-  (interactive (list (emms-mp3tag-track-at)))
+(defun emms-tag-editor-edit-track (track)
+  (interactive (list (emms-tag-editor-track-at)))
hunk ./emms-tag-editor.el 209
-    (emms-mp3tag-insert-tracks (list track))))
+    (emms-tag-editor-insert-tracks (list track))))
hunk ./emms-tag-editor.el 211
-(defun emms-mp3tag-edit-marked-tracks ()
+(defun emms-tag-editor-edit-marked-tracks ()
hunk ./emms-tag-editor.el 213
-  (let ((tracks (emms-mark-mapcar-marked-track 'emms-mp3tag-track-at t)))
+  (let ((tracks (emms-mark-mapcar-marked-track 'emms-tag-editor-track-at t)))
hunk ./emms-tag-editor.el 216
-      (emms-mp3tag-insert-tracks tracks))))
+      (emms-tag-editor-insert-tracks tracks))))
hunk ./emms-tag-editor.el 218
-(defun emms-mp3tag-edit ()
+(defun emms-tag-editor-edit ()
hunk ./emms-tag-editor.el 222
-      (emms-mp3tag-edit-marked-tracks)
-    (emms-mp3tag-edit-track (emms-mp3tag-track-at))))
+      (emms-tag-editor-edit-marked-tracks)
+    (emms-tag-editor-edit-track (emms-tag-editor-track-at))))
hunk ./emms-tag-editor.el 225
-(defvar emms-mp3tag-mode-map
+(defvar emms-tag-editor-mode-map
hunk ./emms-tag-editor.el 227
-    (define-key map [tab] 'emms-mp3tag-next-field)
-    (define-key map [backtab] 'emms-mp3tag-prev-field)
-    (define-key map "\C-c\C-n" 'emms-mp3tag-next-track)
-    (define-key map "\C-c\C-p" 'emms-mp3tag-prev-track)
-    (define-key map "\C-c\C-c" 'emms-mp3tag-submit-and-exit)
-    (define-key map "\C-c\C-s" 'emms-mp3tag-submit)
-    (define-key map "\C-c\C-r" 'emms-mp3tag-replace-all)
+    (define-key map [tab] 'emms-tag-editor-next-field)
+    (define-key map [backtab] 'emms-tag-editor-prev-field)
+    (define-key map "\C-c\C-n" 'emms-tag-editor-next-track)
+    (define-key map "\C-c\C-p" 'emms-tag-editor-prev-track)
+    (define-key map "\C-c\C-c" 'emms-tag-editor-submit-and-exit)
+    (define-key map "\C-c\C-s" 'emms-tag-editor-submit)
+    (define-key map "\C-c\C-r" 'emms-tag-editor-replace-all)
hunk ./emms-tag-editor.el 235
-(define-key emms-playlist-mode-map "E" 'emms-mp3tag-edit)
+(define-key emms-playlist-mode-map "E" 'emms-tag-editor-edit)
hunk ./emms-tag-editor.el 237
-(define-derived-mode emms-mp3tag-mode text-mode "Mp3tag"
+(define-derived-mode emms-tag-editor-mode text-mode "Tag-Edit"
hunk ./emms-tag-editor.el 239
-\\{emms-mp3tag-mode-map}")
+\\{emms-tag-editor-mode-map}")
hunk ./emms-tag-editor.el 241
-(defun emms-mp3tag-replace-all (name value)
+(defun emms-tag-editor-replace-all (name value)
hunk ./emms-tag-editor.el 246
-                          emms-mp3tag-tags nil t)
+                          emms-tag-editor-tags nil t)
hunk ./emms-tag-editor.el 258
-(defun emms-mp3tag-next-field (arg)
+(defun emms-tag-editor-next-field (arg)
hunk ./emms-tag-editor.el 262
-    (emms-mp3tag-prev-field (- arg))))
+    (emms-tag-editor-prev-field (- arg))))
hunk ./emms-tag-editor.el 264
-(defun emms-mp3tag-prev-field (arg)
+(defun emms-tag-editor-prev-field (arg)
hunk ./emms-tag-editor.el 267
-      (emms-mp3tag-next-field (- arg))
+      (emms-tag-editor-next-field (- arg))
hunk ./emms-tag-editor.el 272
-(defun emms-mp3tag-prev-track ()
+(defun emms-tag-editor-prev-track ()
hunk ./emms-tag-editor.el 286
-(defun emms-mp3tag-next-track ()
+(defun emms-tag-editor-next-track ()
hunk ./emms-tag-editor.el 299
-(defun emms-mp3tag-submit (arg)
+(defun emms-tag-editor-submit (arg)
hunk ./emms-tag-editor.el 303
-  (let ((tracks (funcall emms-mp3tag-parse-function))
+  (let ((tracks (funcall emms-tag-editor-parse-function))
hunk ./emms-tag-editor.el 307
-      (emms-mp3tag-erase-buffer emms-mp3tag-log-buffer)
+      (emms-tag-editor-erase-buffer emms-tag-editor-log-buffer)
hunk ./emms-tag-editor.el 329
-            (dolist (tag emms-mp3tag-tags)
+            (dolist (tag emms-tag-editor-tags)
hunk ./emms-tag-editor.el 335
-                       (setq func (assoc (file-name-extension filename) 
emms-mp3tag-tagfile-functions)))
+                       (setq func (assoc (file-name-extension filename) 
emms-tag-editor-tagfile-functions)))
hunk ./emms-tag-editor.el 339
-                      (emms-mp3tag-tag-file track (cadr func) (nth 2 func))))
+                      (emms-tag-editor-tag-file track (cadr func) (nth 2 
func))))
hunk ./emms-tag-editor.el 342
-                (emms-mp3tag-log "Change tags of %s failed with exit value %d" 
filename exit)))
+                (emms-tag-editor-log "Change tags of %s failed with exit value 
%d" filename exit)))
hunk ./emms-tag-editor.el 353
-      (emms-mp3tag-display-log-buffer-maybe)
+      (emms-tag-editor-display-log-buffer-maybe)
hunk ./emms-tag-editor.el 357
-(defun emms-mp3tag-submit-and-exit ()
+(defun emms-tag-editor-submit-and-exit ()
hunk ./emms-tag-editor.el 359
-  (emms-mp3tag-submit t))
+  (emms-tag-editor-submit t))
hunk ./emms-tag-editor.el 361
-(defun emms-mp3tag-default-parser ()
+(defun emms-tag-editor-default-parser ()
hunk ./emms-tag-editor.el 395
-(defun emms-mp3tag-log (&rest args)
-  (with-current-buffer (get-buffer-create emms-mp3tag-log-buffer)
+(defun emms-tag-editor-log (&rest args)
+  (with-current-buffer (get-buffer-create emms-tag-editor-log-buffer)
hunk ./emms-tag-editor.el 400
-;;; emms-mp3tagedit.el ends here
+;;; emms-tag-editor.el ends here
}

[Fix various byte-compiler warnings throughout
Michael Olson <address@hidden>**20061207143511] {
hunk ./emms-history.el 49
-        (dolist (buf (remove-if-not 'buffer-live-p
-                                    (emms-playlist-buffer-list)))
+        (dolist (buf (emms-playlist-buffer-list))
hunk ./emms-i18n.el 48
+;; TODO: Change these to use defcustom
+
+(defvar emms-nerver-used-coding-system
+  '(raw-text undecided)
+  "If the `emms-coding-dectect-functions' return coding system in
+this list, use `emms-default-coding-system' instead.")
+
+(defvar emms-coding-system-for-read 'utf-8
+  "If coding detect failed, use this for decode")
+
+(defvar emms-default-coding-system nil
+  "If non-nil, used for decode and encode")
+
+(defvar emms-coding-dectect-functions nil
+  "A list of function to call to detect codings")
+
+(defvar emms-detect-max-size 10000
+  "Max bytes to detect coding system. Nil mean scan whole buffer.")
+
hunk ./emms-i18n.el 140
-  
-(defvar emms-nerver-used-coding-system
-  '(raw-text undecided)
-  "If the `emms-coding-dectect-functions' return coding system in
-this list, use `emms-default-coding-system' instead.")
-
-(defvar emms-coding-system-for-read 'utf-8
-  "If coding detect failed, use this for decode")
-
-(defvar emms-default-coding-system nil
-  "If non-nil, used for decode and encode")
-
-(defvar emms-coding-dectect-functions nil
-  "A list of function to call to detect codings")
-
-(defvar emms-detect-max-size 10000
-  "Max bytes to detect coding system. Nil mean scan whole buffer.")
hunk ./emms-lastfm.el 49
+(require 'emms)
hunk ./emms-lastfm.el 66
+(defvar emms-lastfm-process nil "-- only used internally --")
hunk ./emms-lastfm.el 162
-                   (message "EMMS: Handshake failed: %s.") response)
+                   (message "EMMS: Handshake failed: %s." response))
hunk ./emms-mark.el 34
+(require 'emms-playlist-mode)
hunk ./emms-mark.el 70
-     (dolist (buf (remove-if-not 'buffer-live-p
-                                 (emms-playlist-buffer-list)))
+     (dolist (buf (emms-playlist-buffer-list))
hunk ./emms-playlist-mode.el 503
-  (let ((playlists (remove-if-not 'buffer-live-p
-                                  (emms-playlist-buffer-list)))
+  (let ((playlists (emms-playlist-buffer-list))
hunk ./emms-tag-editor.el 351
-      (if (and need-sync (y-or-n-p "You have change some track names, sync the 
cache? "))
-          (emms-cache-sync))
+      (if (and (featurep 'emms-cache)
+               need-sync
+               (y-or-n-p "You have change some track names, sync the cache? "))
+          (and (fboundp 'emms-cache-sync) ; silence byte-compiler
+               (emms-cache-sync)))
}

Context:

[emms.el: Improve `emms-uniq-list' to not use cl.el.
address@hidden 
[emms-i18n changes, add playlist navigate command, uniq playlist command
Ye Wenbin <address@hidden>**20061207063510] 
[emms-mp3tag support ogg, add more documentation. fix some error
Ye Wenbin <address@hidden>**20061206153528] 
[emms-lastfm.dpatch
Tassilo Horn <address@hidden>**20061206112823
 
 This patch adds emms-lastfm.el, its setup to emms-setup.el and myself
 to AUTHORS.
] 
[Fix a silly bug in emms-mp3tag. Remove timestamp.
Ye Wenbin <address@hidden>**20061206020710] 
[AUTHORS: Added Ye Wenbin
address@hidden 
[Fix lyrics minibuffer display. Amixer display playback and more useful commands
Wenbin Ye <address@hidden>**20061127154113] 
[Edit all track, set tag to file for mp3
Wenbin Ye <address@hidden>**20061205112209] 
[Add emms-mp3tag and emms-i18n
Wenbin Ye <address@hidden>**20061205065407] 
[Add emms-mark and emms-history
address@hidden 
[emms-info-mp3info.el: Replace `emms-iconv' with decode-coding-string and
address@hidden
 encode-coding-string.
] 
[emms.el: Fix bug introduced by recent changes to 
emms-playlist-set-playlist-buffer
Michael Olson <address@hidden>**20061119204738] 
[Default to current buffer when setting the current EMMS playlist buffer.
Michael Olson <address@hidden>**20061119053410] 
[manual: Add documentation for new emms-playlist-mode keybindings
Michael Olson <address@hidden>**20061119052935] 
[emms-playlist-mode: Bind "b" key to emms-playlist-set-playlist-buffer.
Michael Olson <address@hidden>**20061119052907] 
[emms-playlist-mode: Implement adding the thing at point to the current 
playlist.  If it is a playlist, add its contents instead.  Map this to the "a" 
key.
Michael Olson <address@hidden>**20061119052254] 
[emms.el: In emms-playlist-set-playlist-buffer, prompt user from available EMMS 
playlist buffers rather than all buffers, and display feedback upon setting the 
current buffer, since this is not an easy change to see
Michael Olson <address@hidden>**20061119052023] 
[emms.el: Fix compiler warning
Michael Olson <address@hidden>**20061119051946] 
[Don't add subdirectories for directory and playlist-directory source insert 
methods
Michael Olson <address@hidden>**20061119041900] 
[emms-playing-time.el: New variable `emms-playing-time-style', it
address@hidden
 supports two styles at present, `time' and `bar'.
] 
[bind SPC to `scroll-up' in emms-playlist-mode and update manual.
address@hidden 
[emms.el: Move macros to the top of the file.
address@hidden 
[emms-player-mpd: Deal with change in output when getting supported file types
Michael Olson <address@hidden>**20061028042119] 
[NEWS: Add entry for recent emms-player-mpd change
Michael Olson <address@hidden>**20061023125738] 
[NEWS: Version 2 is version 2.0
address@hidden 
[emms-player-mpd: Handle errors that occur when we begin playback
Michael Olson <address@hidden>**20061022215310] 
[emms-playlist-mode: Handle case where selection has not been set but user 
wants to delete a region
Michael Olson <address@hidden>**20061022201724] 
[emms-player-mplayer.el: Mplayer also supports .vob files.
address@hidden 
[FluidSynth midi file player
address@hidden 
[Added delYsid
address@hidden 
[jackd-support-for-emacs
address@hidden
 jackd is a pro-audio server which can be used as a backend for
 alsaplayer, mplayer, and lots of other linux audio apps.
 This module allows to start jackd from within emacs, and
 connect/disconnect jack client ports.
] 
[browser: ensure the RNG is seeded before use
Damien Elmes <address@hidden>**20061011151535] 
[browser: require sort (fixes bug with sort-fold-case being void)
Damien Elmes <address@hidden>**20061010125718] 
[emms-playlist-mode: Fix typo in hook name
Michael Olson <address@hidden>**20061022022812] 
[emms-player-mpd: Update version recommendation
Michael Olson <address@hidden>**20061022012223] 
[emms-player-mpd: Work properly with tracks inserted by emms-browser
Michael Olson <address@hidden>**20061022011050] 
[Add NEWS items since version 2.1
Michael Olson <address@hidden>**20061017222117] 
[emms-player-mpd: When using the emms-volume interface, allow the user to 
specify the amount of change in the volume
Michael Olson <address@hidden>**20061017220404] 
[Documentation cleanups in emms-player-mpd and emms-source-playlist
Michael Olson <address@hidden>**20061017215345] 
[Since emms-player-seeked-to-functions and emms-player-time-set-functions hooks 
do the same thing, replace the former with the latter
Michael Olson <address@hidden>**20061017210238] 
[emms-browser: Fix compiler warning
Michael Olson <address@hidden>**20061017205310] 
[emms-player-mpd: Implement seek-to support
Michael Olson <address@hidden>**20061017205106] 
[fix faulty emms-playlist-mode keybinding, fix due to William and Damien.
address@hidden 
[Added seeking to the playlist keymap, and updated the manual.
address@hidden 
[emms-player-mpd: Only display error if we are certain that url.el is not 
up-to-date
Michael Olson <address@hidden>**20061004032213] 
[seek-for-alsaplayer
address@hidden
 Add relative seek support for alsaplayer
] 
[midi-files-via-timidity
address@hidden
 A simple-player definition for timidity
] 
[emms-playing-time.el: Minor cleanups.
address@hidden 
[emms-lyrics.el: Minor Cleanups.
address@hidden 
[pause-for-alsaplayer
address@hidden
 Get pause/resume working for alsaplayer
] 
[mms-for-mplayer
address@hidden
 mplayer also supports mms:// URLs
] 
[DoTheRightThing with player pausing and emms-bookmarks.el
address@hidden 
[Added emms-bookmarks.el
address@hidden 
[Added `emms-pause' to emms-playlist-mode.el bound to to ``P''.
address@hidden 
[browser: add deletion started/finished message
Damien Elmes <address@hidden>**20060923051128] 
[Added a link to the online version of the manual.
address@hidden 
[emms-playing-time.el now works with `seek-to'.
address@hidden 
[Added `seek-to' to emms.el and emms-player-mplayer.el.
address@hidden 
[browser/cache: support deleting files, make emms-cache-dirty a defsubst
Damien Elmes <address@hidden>**20060922090553] 
[TAG 2.1
address@hidden 
Patch bundle hash:
b5d6b4dec3ec7f021a44762e9363c8f033757ac8