[SCM] snd/master: Imported Debian patch 11.7-3

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Mon Jan 25 11:18:37 UTC 2016


The following commit has been merged in the master branch:
commit 9ad6c38cfcdfcd998baf42c2d05edf15c2020bd2
Author: Colin Watson <cjwatson at debian.org>
Date:   Wed May 8 11:38:08 2013 +0100

    Imported Debian patch 11.7-3

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1be94dc..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.pc
-*~
diff --git a/debian/changelog b/debian/changelog
index 5788b9d..b9d8e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+snd (11.7-3) unstable; urgency=low
+
+  * QA upload.
+  * Convert to dh-autoreconf.
+  * Pass -ldl in LIBS, not LDFLAGS (closes: #641442).
+  * Link with -ldl in some more cases.
+
+ -- Colin Watson <cjwatson at debian.org>  Wed, 08 May 2013 11:38:08 +0100
+
 snd (11.7-2) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/control b/debian/control
index ad5015a..1f2b056 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  ladspa-sdk,
  xutils-dev,
  libgsl0-dev (>= 1.1.1),
+ dh-autoreconf,
  autotools-dev (>= 20100122.1~),
  libfftw3-dev (>= 2.1.3),
  libgtk2.0-dev (>= 2.0.6),
diff --git a/debian/patches/07-link-order.diff b/debian/patches/07-link-order.diff
new file mode 100644
index 0000000..4df6ae7
--- /dev/null
+++ b/debian/patches/07-link-order.diff
@@ -0,0 +1,53 @@
+Description: Pass -ldl in LIBS, not LDFLAGS
+Author: Colin Watson <cjwatson at debian.org>
+Forwarded: no
+Last-Update: 2013-05-08
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1579,7 +1579,7 @@
+         LDSO_FLAGS="-shared"
+         LIBS="$LIBS -lm"
+ 	if test "$ac_cv_header_dlfcn_h" = yes ; then 
+-	  LDFLAGS="$LDFLAGS -ldl" 
++	  LIBS="$LIBS -ldl" 
+ 	fi 
+ 	if test "$GCC" = yes ; then
+ 	  SO_FLAGS="-fPIC $SO_FLAGS"
+@@ -1658,7 +1658,7 @@
+         LDSO_FLAGS="-shared"
+         LIBS="$LIBS -lm"
+         if test "$ac_cv_header_dlfcn_h" = yes ; then
+-          LDFLAGS="$LDFLAGS -ldl"
++          LIBS="$LIBS -ldl"
+         fi
+         if test "$GCC" = yes ; then
+           SO_FLAGS="-fPIC $SO_FLAGS"
+@@ -1688,7 +1688,7 @@
+         LDSO_FLAGS="-shared"
+         LIBS="$LIBS -lm"
+         if test "$ac_cv_header_dlfcn_h" = yes ; then
+-          LDFLAGS="$LDFLAGS -ldl"
++          LIBS="$LIBS -ldl"
+         fi
+         if test "$GCC" = yes ; then
+           SO_FLAGS="-fPIC $SO_FLAGS"
+@@ -2146,14 +2146,14 @@
+ if test "$ac_snd_have_extension_language" = no ; then
+   if test "$ac_snd_have_gui" = no ; then
+     if test "$ac_cv_header_dlfcn_h" = yes ; then
+-      LDFLAGS="$LDFLAGS -ldl"
++      LIBS="$LIBS -ldl"
+     fi
+     AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both.  As currently configured, this version of Snd is useless.])
+   fi
+ fi
+ 
+ if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_snd_have_gui" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
+-  LDFLAGS="$LDFLAGS -ldl"
++  LIBS="$LIBS -ldl"
+ fi
+ 
+ AC_SUBST(CFLAGS)
diff --git a/debian/patches/08-link-dl-harder.diff b/debian/patches/08-link-dl-harder.diff
new file mode 100644
index 0000000..d38bbc6
--- /dev/null
+++ b/debian/patches/08-link-dl-harder.diff
@@ -0,0 +1,21 @@
+Description: Link with -ldl in more cases
+ Duplicate -ldl isn't a problem, but missing -ldl may be.  (For example,
+ with_audio is set to the empty string in the PulseAudio build pass, not
+ "no".)
+Author: Colin Watson <cjwatson at debian.org>
+Forwarded: no
+Last-Update: 2013-05-08
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -2152,7 +2152,7 @@
+   fi
+ fi
+ 
+-if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_snd_have_gui" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
++if test "$ac_snd_have_extension_language" = yes && test "$ac_cv_header_dlfcn_h" = yes ; then
+   LIBS="$LIBS -ldl"
+ fi
+ 
diff --git a/debian/patches/99-autoconf-hurd.diff b/debian/patches/99-autoconf-hurd.diff
deleted file mode 100644
index e4ad1e8..0000000
--- a/debian/patches/99-autoconf-hurd.diff
+++ /dev/null
@@ -1,39 +0,0 @@
----
- configure |   26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
---- snd.orig/configure
-+++ snd/configure
-@@ -10818,6 +10818,32 @@ $as_echo "$alsa_ok" >&6; }
-                 ;;
-         esac
-         ;;
-+    *-*-hurd*)
-+        LDSO_FLAGS="-shared"
-+        LIBS="$LIBS -lm"
-+        if test "$ac_cv_header_dlfcn_h" = yes ; then
-+          LDFLAGS="$LDFLAGS -ldl"
-+        fi
-+        if test "$GCC" = yes ; then
-+          SO_FLAGS="-fPIC $SO_FLAGS"
-+        fi
-+
-+        AUDIO_SYSTEM=OSS
-+
-+        if test "$with_jack" = yes ; then
-+               if test "$with_oss" != yes ; then
-+                 AUDIO_SYSTEM=JACK
-+               fi
-+        fi
-+
-+        case $AUDIO_SYSTEM in
-+            OSS)
-+                $as_echo "#define HAVE_OSS 1" >>confdefs.h
-+
-+                AUDIO_SYSTEM=OSS
-+                ;;
-+        esac
-+        ;;
-     *-*-sunos4*)
-         $as_echo "#define MUS_SUN 1" >>confdefs.h
- 
diff --git a/debian/patches/99-autoconf.diff b/debian/patches/99-autoconf.diff
deleted file mode 100644
index f0c6c95..0000000
--- a/debian/patches/99-autoconf.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-
-  rerun autoconf after change of confugure.ac in kfreebsd.diff
-
----
- configure |   33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
---- snd.orig/configure
-+++ snd/configure
-@@ -10785,6 +10785,39 @@ $as_echo "$alsa_ok" >&6; }
- 		;;
- 	esac
- 	;;
-+    *-*-kfreebsd*)
-+        LDSO_FLAGS="-shared"
-+        LIBS="$LIBS -lm"
-+        if test "$ac_cv_header_dlfcn_h" = yes ; then
-+          LDFLAGS="$LDFLAGS -ldl"
-+        fi
-+        if test "$GCC" = yes ; then
-+          SO_FLAGS="-fPIC $SO_FLAGS"
-+        fi
-+
-+        AUDIO_SYSTEM=OSS
-+
-+        if test "$with_jack" = yes ; then
-+               if test "$with_oss" != yes ; then
-+                 AUDIO_SYSTEM=JACK
-+               fi
-+        fi
-+
-+        case $AUDIO_SYSTEM in
-+            JACK)
-+                $as_echo "#define HAVE_JACK_IN_LINUX 1" >>confdefs.h
-+
-+                $as_echo "#define HAVE_OSS 1" >>confdefs.h
-+
-+                AUDIO_LIB="-lsamplerate"
-+                ;;
-+            OSS)
-+                $as_echo "#define HAVE_OSS 1" >>confdefs.h
-+
-+                AUDIO_SYSTEM=OSS
-+                ;;
-+        esac
-+        ;;
-     *-*-sunos4*)
-         $as_echo "#define MUS_SUN 1" >>confdefs.h
- 
diff --git a/debian/patches/series b/debian/patches/series
index 30db91f..57c61e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,5 @@
 04-gcc_warnings.diff
 05-kfreebsd.diff
 06-hurd.diff
-99-autoconf.diff
-99-autoconf-hurd.diff
+07-link-order.diff
+08-link-dl-harder.diff
diff --git a/debian/rules b/debian/rules
index a6cd4c0..00b996b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,14 @@ EXTRA_CONFIGURE_ARGS=--with-oss
 endif
 
 %:
-	dh --with=autotools_dev $@
+	dh $@ --with=autoreconf
+
+autoreconf:
+	autoreconf -f -i
+	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
+
+override_dh_autoreconf:
+	AUTOHEADER=true dh_autoreconf debian/rules -- autoreconf
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes
diff --git a/tutorial/1_intro_and_build_snd.html b/tutorial/1_intro_and_build_snd.html~
similarity index 99%
copy from tutorial/1_intro_and_build_snd.html
copy to tutorial/1_intro_and_build_snd.html~
index 998223d..33bb087 100644
--- a/tutorial/1_intro_and_build_snd.html
+++ b/tutorial/1_intro_and_build_snd.html~
@@ -71,7 +71,7 @@ To build the version of Snd presented in this article you will need to install t
   OpenMotif 2.1
   ALSA 0.9.x with OSS emulation enabled
   LADSPA and its various plugins
-  the Scheme customization files included in the snd-6/dlp directory
+  the Scheme customization files included in the snd-5/contrib/dlp directory
 </pre>
 <p>
 
diff --git a/tutorial/files/misc.scm.txt b/tutorial/files/misc.scm.txt~
similarity index 52%
copy from tutorial/files/misc.scm.txt
copy to tutorial/files/misc.scm.txt~
index 56cf3b9..acd3941 100644
--- a/tutorial/files/misc.scm.txt
+++ b/tutorial/files/misc.scm.txt~
@@ -24,8 +24,8 @@
 (check-for-unsaved-edits #t)
 (add-hook! after-open-hook show-disk-space)
 
-;(define wd (make-pixmap (Widget (cadr (main-widgets))) rough))
-;(for-each-child (Widget (cadr (main-widgets))) (lambda (w) (XtSetValues w (list XmNbackgroundPixmap wd))))
+(define wd (make-pixmap (|Widget (cadr (main-widgets))) rough))
+(for-each-child (|Widget (cadr (main-widgets))) (lambda (w) (|XtSetValues w (list |XmNbackgroundPixmap wd))))
 
 ;;; uncomment the next line to add meters to the main window
 ;;; (with-level-meters 2)
@@ -45,14 +45,8 @@
 (add-sound-file-extension "W08")
 (add-sound-file-extension "W09")
 
-;;;
-;;; disable original Play radio button
-;;;
-
-;(add-hook! after-open-hook
-;           (lambda (snd)
-;             (XtUnmanageChild (find-child (Widget (list-ref (sound-widgets snd) 2)) "play"))))
-
+;;; I might eventually use these for cursor control
+;;; (add-very-useful-icons)
 
 ;;;
 ;;; main menu additions
@@ -64,7 +58,7 @@
   (add-to-menu 0 "Delete" ; add Delete option to File menu
 	       (lambda ()
 		 ;; close current sound and delete it (after requesting confirmation)
-		 (if (selected-sound)
+		 (if (>= (selected-sound) 0)
 		     (let ((filename (file-name)))
 		       (close-sound)
 		       (if (yes-or-no? (format #f "delete ~S?" filename))
@@ -79,84 +73,84 @@
 	;; open dialog to get new name, save-as that name, open
 	(if (not rename-dialog)
 	    ;; make a standard dialog
-	    (let* ((xdismiss (XmStringCreate "Dismiss" XmFONTLIST_DEFAULT_TAG))
-		   (xhelp (XmStringCreate "Help" XmFONTLIST_DEFAULT_TAG))
-		   (xok (XmStringCreate "DoIt" XmFONTLIST_DEFAULT_TAG))
-		   (titlestr (XmStringCreate "Rename" XmFONTLIST_DEFAULT_TAG))
-		   (new-dialog (XmCreateTemplateDialog
-				 (Widget (cadr (main-widgets))) "Rename"
-				 (list XmNcancelLabelString   xdismiss
-				       XmNhelpLabelString     xhelp
-				       XmNokLabelString       xok
-				       XmNautoUnmanage        #f
-				       XmNdialogTitle         titlestr
-				       XmNresizePolicy        XmRESIZE_GROW
-				       XmNnoResize            #f
-				       XmNbackground          (basic-color)
-				       XmNtransient           #f))))
+	    (let* ((xdismiss (|XmStringCreate "Dismiss" |XmFONTLIST_DEFAULT_TAG))
+		   (xhelp (|XmStringCreate "Help" |XmFONTLIST_DEFAULT_TAG))
+		   (xok (|XmStringCreate "DoIt" |XmFONTLIST_DEFAULT_TAG))
+		   (titlestr (|XmStringCreate "Rename" |XmFONTLIST_DEFAULT_TAG))
+		   (new-dialog (|XmCreateTemplateDialog
+				 (|Widget (cadr (main-widgets))) "Rename"
+				 (list |XmNcancelLabelString   xdismiss
+				       |XmNhelpLabelString     xhelp
+				       |XmNokLabelString       xok
+				       |XmNautoUnmanage        #f
+				       |XmNdialogTitle         titlestr
+				       |XmNresizePolicy        |XmRESIZE_GROW
+				       |XmNnoResize            #f
+				       |XmNbackground          (|Pixel (snd-pixel (basic-color)))
+				       |XmNtransient           #f))))
 	      (for-each
 	       (lambda (button)
-		 (XtVaSetValues
-		   (XmMessageBoxGetChild new-dialog button)
-		   (list XmNarmColor   (pushed-button-color)
-			 XmNbackground (basic-color))))
-	       (list XmDIALOG_HELP_BUTTON XmDIALOG_CANCEL_BUTTON XmDIALOG_OK_BUTTON))
+		 (|XtVaSetValues
+		   (|XmMessageBoxGetChild new-dialog button)
+		   (list |XmNarmColor   (|Pixel (snd-pixel (pushed-button-color)))
+			 |XmNbackground (|Pixel (snd-pixel (basic-color))))))
+	       (list |XmDIALOG_HELP_BUTTON |XmDIALOG_CANCEL_BUTTON |XmDIALOG_OK_BUTTON))
     
-	      (XtAddCallback new-dialog XmNcancelCallback 
-			      (lambda (w c i) (XtUnmanageChild w)))
+	      (|XtAddCallback new-dialog |XmNcancelCallback 
+			      (lambda (w c i) (|XtUnmanageChild w)))
 	      
-	      (XtAddCallback new-dialog XmNhelpCallback 
+	      (|XtAddCallback new-dialog |XmNhelpCallback 
 			      (lambda (w c i)
 				(help-dialog "Rename" "Give a new file name to rename the currently selected sound.")))
 
-	      (XtAddCallback new-dialog XmNokCallback 
+	      (|XtAddCallback new-dialog |XmNokCallback 
 			      (lambda (w c i)
-				(let ((new-name (XmTextFieldGetString rename-text)))
+				(let ((new-name (|XmTextFieldGetString rename-text)))
 				  (if (and (string? new-name)
 					   (> (string-length new-name) 0)
-					   (selected-sound))
+					   (>= (selected-sound) 0))
 				      (let ((current-name (file-name)))
 					(save-sound-as new-name)
 					(close-sound)
 					(rename-file current-name new-name)
 					(open-sound new-name)
-					(XtUnmanageChild w))))))
-	      (XmStringFree xhelp)
-	      (XmStringFree xok)
-	      (XmStringFree xdismiss)
-	      (XmStringFree titlestr)
+					(|XtUnmanageChild w))))))
+	      (|XmStringFree xhelp)
+	      (|XmStringFree xok)
+	      (|XmStringFree xdismiss)
+	      (|XmStringFree titlestr)
 	      (set! rename-dialog new-dialog)
-	      (let* ((mainform (XtCreateManagedWidget "formd" xmRowColumnWidgetClass rename-dialog
-				     (list XmNleftAttachment      XmATTACH_FORM
-					   XmNrightAttachment     XmATTACH_FORM
-					   XmNtopAttachment       XmATTACH_FORM
-					   XmNbottomAttachment    XmATTACH_WIDGET
-					   XmNbottomWidget        (XmMessageBoxGetChild rename-dialog XmDIALOG_SEPARATOR)
-					   XmNorientation         XmVERTICAL
-					   XmNbackground          (basic-color))))
-		     (label (XtCreateManagedWidget "new name:" xmLabelWidgetClass mainform
-				     (list XmNleftAttachment      XmATTACH_FORM
-					   XmNrightAttachment     XmATTACH_NONE
-					   XmNtopAttachment       XmATTACH_FORM
-					   XmNbottomAttachment    XmATTACH_FORM
-					   XmNbackground          (basic-color)))))
+	      (let* ((mainform (|XtCreateManagedWidget "formd" |xmRowColumnWidgetClass rename-dialog
+				     (list |XmNleftAttachment      |XmATTACH_FORM
+					   |XmNrightAttachment     |XmATTACH_FORM
+					   |XmNtopAttachment       |XmATTACH_FORM
+					   |XmNbottomAttachment    |XmATTACH_WIDGET
+					   |XmNbottomWidget        (|XmMessageBoxGetChild rename-dialog |XmDIALOG_SEPARATOR)
+					   |XmNorientation         |XmVERTICAL
+					   |XmNbackground          (|Pixel (snd-pixel (basic-color))))))
+		     (label (|XtCreateManagedWidget "new name:" |xmLabelWidgetClass mainform
+				     (list |XmNleftAttachment      |XmATTACH_FORM
+					   |XmNrightAttachment     |XmATTACH_NONE
+					   |XmNtopAttachment       |XmATTACH_FORM
+					   |XmNbottomAttachment    |XmATTACH_FORM
+					   |XmNbackground          (|Pixel (snd-pixel (basic-color)))))))
 		(set! rename-text 
-		      (XtCreateManagedWidget "newname" xmTextFieldWidgetClass mainform
-				     (list XmNleftAttachment      XmATTACH_WIDGET
-					   XmNleftWidget          label
-					   XmNrightAttachment     XmATTACH_FORM
-					   XmNtopAttachment       XmATTACH_FORM
-					   XmNbottomAttachment    XmATTACH_FORM
-					   XmNbackground          (basic-color))))
-		(XtAddEventHandler rename-text EnterWindowMask #f
+		      (|XtCreateManagedWidget "newname" |xmTextFieldWidgetClass mainform
+				     (list |XmNleftAttachment      |XmATTACH_WIDGET
+					   |XmNleftWidget          label
+					   |XmNrightAttachment     |XmATTACH_FORM
+					   |XmNtopAttachment       |XmATTACH_FORM
+					   |XmNbottomAttachment    |XmATTACH_FORM
+					   |XmNbackground          (|Pixel (snd-pixel (basic-color))))))
+		(|XtAddEventHandler rename-text |EnterWindowMask #f
 				    (lambda (w context ev flag)
-				      (XmProcessTraversal w XmTRAVERSE_CURRENT)
-				      (XtSetValues w (list XmNbackground (white-pixel)))))
-		(XtAddEventHandler rename-text LeaveWindowMask #f
+				      (|XmProcessTraversal w |XmTRAVERSE_CURRENT)
+				      (|XtSetValues w (list |XmNbackground (white-pixel)))))
+		(|XtAddEventHandler rename-text |LeaveWindowMask #f
 				    (lambda (w context ev flag)
-				      (XtSetValues w (list XmNbackground (basic-color))))))))
-	(if (not (XtIsManaged rename-dialog))
-	    (XtManageChild rename-dialog)
+				      (|XtSetValues w (list |XmNbackground (|Pixel (snd-pixel (basic-color))))))))))
+	(if (not (|XtIsManaged rename-dialog))
+	    (|XtManageChild rename-dialog)
 	    (raise-dialog rename-dialog)))
       8)))
 
@@ -165,66 +159,66 @@
 (add-rename-option)
 
 ;;;
-;;; poup menu stuff
+;;; popup menu stuff
 ;;;
 
 (change-graph-popup-color "pink")
 
-;;;(add-selection-popup)
-
 
 (define (change-selection-popup-color new-color)
   ;; new-color can be the color name, an xm Pixel, a snd color, or a list of rgb values (as in Snd's make-color)
   (let ((color-pixel
          (if (string? new-color) ; assuming X11 color names here
-             (let* ((shell (Widget (cadr (main-widgets))))
-                    (dpy (XtDisplay shell))
-                    (scr (DefaultScreen dpy))
-                    (cmap (DefaultColormap dpy scr))
-                    (col (XColor)))
-               (if (= (XAllocNamedColor dpy cmap new-color col col) 0)
+             (let* ((shell (|Widget (cadr (main-widgets))))
+                    (dpy (|XtDisplay shell))
+                    (scr (|DefaultScreen dpy))
+                    (cmap (|DefaultColormap dpy scr))
+                    (col (|XColor)))
+               (if (= (|XAllocNamedColor dpy cmap new-color col col) 0)
                    (snd-error "can't allocate ~S" new-color)
-                   (.pixel col)))
-	     (if (color? new-color)
-		 new-color
-		 ;; assume a list of rgb vals?
-		 (apply make-color new-color)))))
+                   (|pixel col)))
+             (if (color? new-color)
+                 (|Pixel (snd-pixel new-color))
+                 (if (|Pixel? new-color)
+                     new-color
+                     ;; assume a list of rgb vals?
+                     (|Pixel (snd-pixel (apply make-color new-color))))))))
     (for-each-child
      selection-popup-menu
      (lambda (n)
-       (XmChangeColor n color-pixel)))))
+       (|XmChangeColor n color-pixel)))))
 (change-selection-popup-color "coral")
 
 (define (change-fft-popup-color new-color)
   (let ((color-pixel
          (if (string? new-color) ; assuming X11 color names here
-             (let* ((shell (Widget (cadr (main-widgets))))
-                    (dpy (XtDisplay shell))
-                    (scr (DefaultScreen dpy))
-                    (cmap (DefaultColormap dpy scr))
-                    (col (XColor)))
-               (if (= (XAllocNamedColor dpy cmap new-color col col) 0)
+             (let* ((shell (|Widget (cadr (main-widgets))))
+                    (dpy (|XtDisplay shell))
+                    (scr (|DefaultScreen dpy))
+                    (cmap (|DefaultColormap dpy scr))
+                    (col (|XColor)))
+               (if (= (|XAllocNamedColor dpy cmap new-color col col) 0)
                    (snd-error "can't allocate ~S" new-color)
-                   (.pixel col)))
+                   (|pixel col)))
              (if (color? new-color)
-		 new-color
-		 ;; assume a list of rgb vals?
-		 (apply make-color new-color)))))
+                 (|Pixel (snd-pixel new-color))
+                 (if (|Pixel? new-color)
+                     new-color
+                     ;; assume a list of rgb vals?
+                     (|Pixel (snd-pixel (apply make-color new-color))))))))
     (for-each-child
      fft-popup-menu
      (lambda (n)
-       (XmChangeColor n color-pixel)))))
+       (|XmChangeColor n color-pixel)))))
 (change-fft-popup-color "orange")
 
-;(change-listener-popup-color "red")
-
-(add-to-menu 1 #f #f) ; separator
+(change-listener-popup-color "red")
 
 ;;;
 ;;; additions to Edit menu
 ;;;
 
-(define selctr 0)
+(add-to-menu 1 #f #f) ; separator
 
 ;;; -------- cut selection -> new file
 
@@ -236,7 +230,7 @@
 	(delete-selection)
 	(open-sound new-file-name))))
 
-;;; (add-to-menu 1 "Cut Selection -> New" cut-selection->new)
+(add-to-menu 1 "Cut Selection -> New" cut-selection->new)
 
 ;;; -------- append sound (and append selection for lafs)
 
@@ -255,7 +249,7 @@
 
 (define (replace-with-selection)
   (let ((beg (cursor))
-        (len (selection-frames)))
+        (len (selection-length)))
     (delete-samples beg len)
     (insert-selection beg)))
 
@@ -283,25 +277,6 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
-;;; open and convert stereo OGG files automatically
-;;;
-;;; (see examp.scm for writing these files, and a slightly improved reader)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(add-hook! open-raw-sound-hook
-           (lambda (file choices)
-             (list 2 44100 (if (little-endian?) mus-lshort mus-bshort))))
-
-(add-hook! open-hook
-           (lambda (filename)
-             (if (= (mus-sound-header-type filename) mus-raw)
-                 (let ((rawfile (string-append filename ".raw")))
-                   (system (format #f "ogg123 -d raw -f ~A ~A" rawfile filename))
-                   rawfile)
-                 #f)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
 ;;; set up a region play list
 ;;; TODO: a GUI for this feature !
 ;;;

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list