[emms-help] Re: problems running emms from cvs

[Daniel Brockman]

Angelina Carlton <address@hidden> writes:

> Now however using the cvs version I get this error whenever I press
> F12 or M-x emms-play-directory, M-x emms-play-directory-tree:
>
> Symbol's function definition is void: read-directory-name

Oops, sorry, that's my fault.  I didn't realize that function was
introduced so recently.

2002-05-28  Kim F. Storm  <address@hidden>

        * files.el (read-directory-name): New function.

Try this patch:

*** emms-source-file.el 18 May 2005 16:49:47 +0200      1.27
--- emms-source-file.el 12 Jun 2005 17:35:14 +0200      
***************
*** 73,78 ****
--- 73,83 ----
    :type 'string
    :group 'emms-source-file)
  
+ ;; The `read-directory-name' function is not available in Emacs 21.
+ (defalias 'emms-read-directory-name
+   (if (fboundp 'read-directory-name)
+       #'read-directory-name #'read-file-name))
+ 
  ;;; Sources
  
  ;;;###autoload (autoload 'emms-play-file "emms-source-file" t)
***************
*** 94,103 ****
    "An EMMS source for a whole directory tree - either DIR, or queried
  from the user"
    (interactive (list
!                 (read-directory-name "Play directory: "
!                                      emms-source-file-default-directory
!                                      emms-source-file-default-directory
!                                      t)))
    (mapcar (lambda (file)
              (emms-track 'file (expand-file-name file)))
            (directory-files dir t (emms-source-file-regex))))
--- 99,108 ----
    "An EMMS source for a whole directory tree - either DIR, or queried
  from the user"
    (interactive (list
!                 (emms-read-directory-name "Play directory: "
!                                           emms-source-file-default-directory
!                                           emms-source-file-default-directory
!                                           t)))
    (mapcar (lambda (file)
              (emms-track 'file (expand-file-name file)))
            (directory-files dir t (emms-source-file-regex))))
***************
*** 108,117 ****
    "An EMMS source for multiple directory trees - either DIR, or the
  value of `emms-source-file-default-directory'."
    (interactive (list
!                 (read-directory-name "Play directory tree: "
!                                      emms-source-file-default-directory
!                                      emms-source-file-default-directory
!                                      t)))
    (mapcar (lambda (file)
              (emms-track 'file file))
            (emms-source-file-directory-tree (expand-file-name dir)
--- 113,122 ----
    "An EMMS source for multiple directory trees - either DIR, or the
  value of `emms-source-file-default-directory'."
    (interactive (list
!                 (emms-read-directory-name "Play directory tree: "
!                                           emms-source-file-default-directory
!                                           emms-source-file-default-directory
!                                           t)))
    (mapcar (lambda (file)
              (emms-track 'file file))
            (emms-source-file-directory-tree (expand-file-name dir)
***************
*** 124,133 ****
    "An EMMS source that will find files in DIR or
  `emms-source-file-default-directory' that match REGEXP."
    (interactive (list
!                 (read-directory-name "Find in directory: "
!                                      emms-source-file-default-directory
!                                      emms-source-file-default-directory
!                                      t)
                  (read-from-minibuffer "Find files matching: ")))
    (mapcar (lambda (file)
              (emms-track 'file file))
--- 129,138 ----
    "An EMMS source that will find files in DIR or
  `emms-source-file-default-directory' that match REGEXP."
    (interactive (list
!                 (emms-read-directory-name "Find in directory: "
!                                           emms-source-file-default-directory
!                                           emms-source-file-default-directory
!                                           t)
                  (read-from-minibuffer "Find files matching: ")))
    (mapcar (lambda (file)
              (emms-track 'file file))

-- 
Daniel Brockman <address@hidden>

   ``Why fix an old bug if you can write three new ones
     in the same time?'' --- David Kastrup (on emacs-devel)