Imported Upstream version 11.2

1 files changed, 11 insertions, 14 deletions

diff --git a/marks.scm b/marks.scm
index ec06a92..22fb9ea 100644
--- a/marks.scm
+++ b/marks.scm
@@ -1,6 +1,5 @@
 ;;; examples of mark-related functions
 
-(use-modules (ice-9 format) (ice-9 common-list))
 (provide 'snd-marks.scm)
 
 ;;; Contents:
@@ -227,7 +226,7 @@
 
 ;;; -------- report-mark-names causes mark names to be posted in the minibuffer as a sound is played
 
-(if (not (provided? 'snd-hooks.scm)) (load-from-path "hooks.scm"))
+(if (not (provided? 'snd-hooks.scm)) (load "hooks.scm"))
 
 (define (report-mark-names)
   "(report-mark-names) causes mark names to be printed as they are passed while playing"
@@ -236,6 +235,7 @@
 	       (let* ((marklist (marks snd 0))
 		      (samplist (map mark-sample marklist))
 		      (samp 0))
+
 		 (define (report-mark-names-play-hook size)
 		   (set! samp (+ samp size))
 		   (if (and (not (null? samplist))
@@ -244,10 +244,11 @@
 			 (report-in-minibuffer (mark-name (car marklist)) snd)
 			 (set! marklist (cdr marklist))
 			 (set! samplist (cdr samplist)))))
+
 		 (define (report-mark-names-stop-playing-hook snd)
 		   (report-in-minibuffer "" snd)
-		   (remove-local-hook! play-hook report-mark-names-play-hook)
-		   (remove-local-hook! stop-playing-hook report-mark-names-stop-playing-hook))
+		   (remove-hook! play-hook report-mark-names-play-hook)
+		   (remove-hook! stop-playing-hook report-mark-names-stop-playing-hook))
 		 
 		 (add-hook! stop-playing-hook report-mark-names-stop-playing-hook)
 		 (add-hook! play-hook report-mark-names-play-hook)
@@ -344,8 +345,8 @@
 ;;;
 ;;; write out each section of a file between marks as a separate file
 
-(define* (mark-explode :optional (htype mus-next) (dformat mus-bfloat))
-  "(mark-explode :optional header-type data-format) splits a sound into a bunch of sounds based on mark placements"
+(define* (mark-explode (htype mus-next) (dformat mus-bfloat))
+  "(mark-explode header-type data-format) splits a sound into a bunch of sounds based on mark placements"
   (let ((start 0)
 	(file-ctr 0)
 	(snd (or (selected-sound) (car (sounds)))))
@@ -394,20 +395,16 @@
   "(save-mark-properties) sets up an after-save-state-hook function to save any mark-properties"
 
   (define (open-appending filename)
-    (if (provided? 'snd-guile)
-	(open filename (logior O_RDWR O_APPEND))
-	(open-output-file filename "a")))
+    (open-output-file filename "a"))
 
   (define (close-appending fd)
-    (if (provided? 'snd-guile)
-	(close fd)
-	(close-output-port fd)))
+    (close-output-port fd))
 
   (add-hook! after-save-state-hook 
     (lambda (filename)
       (let ((fd (open-appending filename)))
 	(format fd "~%~%;;; from remember-mark-properties in marks.scm~%")
-	(format fd "(if (not (defined? 'mark-property)) (load-from-path \"marks.scm\"))~%")
+	(format fd "(if (not (defined? 'mark-property)) (load \"marks.scm\"))~%")
 	(for-each 
 	 (lambda (snd-m)
 	   (for-each 
@@ -464,7 +461,7 @@
 	      (lambda args #f))))
 
 (define (marks->string sndf)
-  (let ((str (format #f "(if (not (provided? 'snd-marks.scm)) (load-from-path \"marks.scm\"))~%(let ((m #f))~%"))
+  (let ((str (format #f "(if (not (provided? 'snd-marks.scm)) (load \"marks.scm\"))~%(let ((m #f))~%"))
 	(chan 0))
     (for-each
      (lambda (chan-marks)