Rename `mime-playback-entity' -> `mime-raw-play-entity'.
[elisp/semi.git] / mime-play.el
index 435aa46..25443c0 100644 (file)
 ;;; @ content decoder
 ;;;
 
-(defvar mime-preview/after-decoded-position nil)
+(defvar mime-preview-after-decoded-position nil)
 
-(defun mime-view-play-current-entity (&optional mode)
+(defun mime-preview-play-current-entity (&optional mode)
   "Play current entity.
 It decodes current entity to call internal or external method.  The
 method is selected from variable `mime-acting-condition'.
 If MODE is specified, play as it.  Default MODE is \"play\"."
   (interactive)
   (or mode
-      (setq mode "play")
-      )
-  (let ((cinfo (get-text-property (point) 'mime-view-cinfo)))
-    (if cinfo
+      (setq mode "play"))
+  (let ((entity-info (get-text-property (point) 'mime-view-entity-info)))
+    (if entity-info
        (let ((the-buf (current-buffer))
-             (raw-buffer (get-text-property (point) 'mime-view-raw-buffer))
-             )
-         (setq mime-preview/after-decoded-position (point))
+             (raw-buffer (get-text-property (point) 'mime-view-raw-buffer)))
+         (setq mime-preview-after-decoded-position (point))
          (set-buffer raw-buffer)
-         (mime-playback-entity cinfo mode)
-         (if (eq (current-buffer) raw-buffer)
-             (progn
-               (set-buffer the-buf)
-               (goto-char mime-preview/after-decoded-position)
-               ))
-         ))))
-
-(defun mime-playback-entity (cinfo &optional mode)
-  (let ((beg (mime-entity-info-point-min cinfo))
-       (end (mime-entity-info-point-max cinfo))
-       (c-type (mime-entity-info-media-type cinfo))
-       (c-subtype (mime-entity-info-media-subtype cinfo))
-       (params (mime-entity-info-parameters cinfo))
-       (encoding (mime-entity-info-encoding cinfo))
+         (mime-raw-play-entity entity-info mode)
+         (when (eq (current-buffer) raw-buffer)
+           (set-buffer the-buf)
+           (goto-char mime-preview-after-decoded-position)
+           )))))
+
+(defun mime-raw-play-entity (entity-info &optional mode)
+  "Play entity specified by ENTITY-INFO.
+It decodes the entity to call internal or external method.  The method
+is selected from variable `mime-acting-condition'.  If MODE is
+specified, play as it.  Default MODE is \"play\"."
+  (let ((beg (mime-entity-info-point-min entity-info))
+       (end (mime-entity-info-point-max entity-info))
+       (c-type (mime-entity-info-media-type entity-info))
+       (c-subtype (mime-entity-info-media-subtype entity-info))
+       (params (mime-entity-info-parameters entity-info))
+       (encoding (mime-entity-info-encoding entity-info))
        )
     (or c-type
        (setq c-type 'text
@@ -121,7 +121,7 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
       (narrow-to-region beg end)
       (goto-char beg)
       (let ((method (cdr (assoc 'method cal)))
-           (name (mime-article/get-filename cal))
+           (name (mime-raw-get-filename cal))
            )
        (if method
            (let ((file (make-temp-name
@@ -196,7 +196,7 @@ window.")
                 (setq win (get-buffer-window bbdb-buffer-name))
                 )
            (set-window-buffer win mime-echo-buffer-name)
-         (select-window (get-buffer-window mime-view-buffer))
+         (select-window (get-buffer-window mime-preview-buffer))
          (setq win (split-window-vertically
                     (- (window-height)
                        (if (functionp mime-echo-window-height)
@@ -227,8 +227,8 @@ window.")
   (concat (regexp-* mime-view-file-name-char-regexp)
          "\\(\\." mime-view-file-name-char-regexp "+\\)*"))
 
-(defun mime-article/get-original-filename (param &optional encoding)
-  (or (mime-article/get-uu-filename param encoding)
+(defun mime-raw-get-original-filename (param &optional encoding)
+  (or (mime-raw-get-uu-filename param encoding)
       (let (ret)
        (or (if (or (and (setq ret (mime/Content-Disposition))
                         (setq ret (assoc "filename" (cdr ret)))
@@ -248,8 +248,8 @@ window.")
            ))
       ))
 
-(defun mime-article/get-filename (param)
-  (replace-as-filename (mime-article/get-original-filename param))
+(defun mime-raw-get-filename (param)
+  (replace-as-filename (mime-raw-get-original-filename param))
   )
 
 
@@ -261,7 +261,7 @@ window.")
   (let* ((name
          (save-restriction
            (narrow-to-region beg end)
-           (mime-article/get-filename cal)
+           (mime-raw-get-filename cal)
            ))
         (encoding (cdr (assq 'encoding cal)))
         (filename
@@ -293,18 +293,18 @@ window.")
   "Quitting method for mime-view.
 It is registered to variable `mime-view-quitting-method-alist'."
   (let ((mother mime-mother-buffer)
-       (win-conf mime::preview/original-window-configuration)
+       (win-conf mime-preview-original-window-configuration)
        )
     (kill-buffer mime-raw-buffer)
-    (mime-view-kill-buffer)
+    (mime-preview-kill-buffer)
     (set-window-configuration win-conf)
     (pop-to-buffer mother)
     ))
 
 (defun mime-method-to-display-message/rfc822 (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-to-entity-number beg))
         (new-name (format "%s-%s" (buffer-name) cnum))
-        (mother mime-view-buffer)
+        (mother mime-preview-buffer)
         (text-decoder
          (cdr (or (assq major-mode mime-text-decoder-alist)
                   (assq t mime-text-decoder-alist))))
@@ -326,7 +326,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
 ;;; @ message/partial
 ;;;
 
-(defvar mime-article/coding-system-alist
+(defvar mime-raw-coding-system-alist
   (list '(mh-show-mode . no-conversion)
        (cons t (mime-charset-to-coding-system default-mime-charset))
        ))
@@ -334,8 +334,8 @@ It is registered to variable `mime-view-quitting-method-alist'."
 (defun mime-article::write-region (start end file)
   (let ((coding-system-for-write
         (cdr
-         (or (assq major-mode mime-article/coding-system-alist)
-             (assq t mime-article/coding-system-alist)
+         (or (assq major-mode mime-raw-coding-system-alist)
+             (assq t mime-raw-coding-system-alist)
              ))))
     (write-region start end file)
     ))
@@ -349,7 +349,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
         (number (cdr (assoc "number" cal)))
         (total (cdr (assoc "total" cal)))
         file
-        (mother mime-view-buffer)
+        (mother mime-preview-buffer)
          )
     (or (file-exists-p root-dir)
        (make-directory root-dir)
@@ -375,7 +375,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
          (set-window-buffer pwin
                             (save-excursion
                               (set-buffer full-buf)
-                              mime-view-buffer))
+                              mime-preview-buffer))
          (select-window pwin)
          )
       (re-search-forward "^$")
@@ -449,7 +449,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
                                ))
                      (pbuf (save-excursion
                              (set-buffer full-buf)
-                             mime-view-buffer)))
+                             mime-preview-buffer)))
                  (set-window-buffer pwin pbuf)
                  (select-window pwin)
                  )))))
@@ -459,14 +459,14 @@ It is registered to variable `mime-view-quitting-method-alist'."
 ;;; @ message/external-body
 ;;;
 
-(defvar mime-article/dired-function
+(defvar mime-raw-dired-function
   (if mime/use-multi-frame
       (function dired-other-frame)
-    (function mime-article/dired-function-for-one-frame)
+    (function mime-raw-dired-function-for-one-frame)
     ))
 
-(defun mime-article/dired-function-for-one-frame (dir)
-  (let ((win (or (get-buffer-window mime-view-buffer)
+(defun mime-raw-dired-function-for-one-frame (dir)
+  (let ((win (or (get-buffer-window mime-preview-buffer)
                 (get-largest-window))))
     (select-window win)
     (dired dir)
@@ -480,7 +480,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
         (pathname (concat "/anonymous@" site ":" directory))
         )
     (message (concat "Accessing " (expand-file-name name pathname) "..."))
-    (funcall mime-article/dired-function pathname)
+    (funcall mime-raw-dired-function pathname)
     (goto-char (point-min))
     (search-forward name)
     ))
@@ -491,10 +491,10 @@ It is registered to variable `mime-view-quitting-method-alist'."
 
 (defun mime-method-to-display-caesar (start end cal)
   "Internal method for mime-view to display ROT13-47-48 message."
-  (let* ((cnum (mime-article/point-content-number start))
+  (let* ((cnum (mime-raw-point-to-entity-number start))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (the-buf (current-buffer))
-        (mother mime-view-buffer)
+        (mother mime-preview-buffer)
         (charset (cdr (assoc "charset" cal)))
         (encoding (cdr (assq 'encoding cal)))
         (mode major-mode)