File modified: lisp/emacs.d/ivan-dired.el lisp/emacs.d/ivan-emms.el
Change290 at Mon May 03 21:57:38 2010 +0200 by Ivan Kanis <ivan@tao>
diff -r e847a9660649 -r 2ff53df95f93 lisp/emacs.d/ivan-emms.el --- a/lisp/emacs.d/ivan-emms.el Mon May 03 21:41:35 2010 +0200 +++ b/lisp/emacs.d/ivan-emms.el Mon May 03 21:57:38 2010 +0200 @@ -14,10 +14,8 @@ (require 'ivan-face) (require 'ivan-fun) (require 'emms-lastfm) - (require 'emms-lyrics) (require 'emms-playing-time) - (require 'emms-playlist-mode) - (require 'later-do)) + (require 'emms-playlist-mode)) (defvar ivan-emms-dir nil "List of directories to look for music.") @@ -25,20 +23,6 @@ (defvar ivan-emms-shuffle nil "t when playlist is shuffled.") -(defun ivan-emms-init () - (if (not (fboundp 'emms-playlist-mode-go)) - (progn - (require 'emms-playlist-mode) - (require 'emms-browser) - (require 'emms-setup) - (require 'emms-tag-editor) - (require 'emms-lyrics) - (require 'url-util) - (require 'emms-playlist-mode) - (emms-minimalistic) - (setq emms-player-list - (list 'emms-player-mplayer-playlist 'emms-player-mplayer))))) - (defun ivan-emms-add-and-shuffle () (interactive) (ivan-emms-init) @@ -50,15 +34,45 @@ (emms-start)) (message "You need to parameter variable ivan-emms-dir"))) +(defun ivan-emms-add-dir (dir) + (and (file-directory-p dir) + (emms-add-directory-tree dir))) + +(defun ivan-emms-add-dired () + (interactive) + (ivan-emms-init) + (emms-add-dired)) + +(defun ivan-emms-init () + (if (not (fboundp 'emms-playlist-mode-go)) + (progn + (require 'emms-playlist-mode) + (require 'emms-browser) + (require 'emms-setup) + (require 'emms-tag-editor) + (require 'url-util) + (require 'emms-playlist-mode) + (emms-minimalistic)))) + +(defun ivan-emms-message-info () + (interactive) + (let ((track (emms-playlist-current-selected-track))) + (emms-info-really-initialize-track track) + (message (emms-info-track-description track)))) + +(add-hook 'emms-playlist-selection-changed-hook + 'ivan-emms-message-info) + +(defun ivan-emms-play-dired () + (interactive) + (ivan-emms-init) + (emms-play-dired)) + (defun ivan-emms-playlist-mode-go () (require 'emms-playlist-mode) (setq emms-playlist-default-major-mode 'emms-playlist-mode) (emms-playlist-mode-go)) -(defun ivan-emms-add-dir (dir) - (and (file-directory-p dir) - (emms-add-directory-tree dir))) - (defun ivan-emms-toggle-shuffle () (interactive) (if ivan-emms-shuffle @@ -68,20 +82,10 @@ (emms-shuffle) (setq ivan-emms-shuffle t))) -(defun ivan-emms-message-info () - (interactive) - (let ((track (emms-playlist-current-selected-track))) - (emms-info-really-initialize-track track) - (message (emms-info-track-description track)))) - -(add-hook 'emms-playlist-selection-changed-hook - 'ivan-emms-message-info) - (setq emms-info-asynchronously nil - emms-lyrics-scroll-p nil - emms-playing-time-display-format "" - later-do-interval 5) + emms-player-list (list 'emms-player-mplayer-playlist 'emms-player-mplayer) + emms-playing-time-display-format "") (ivan-face emms-browser-year/genre-face yellow