Some misc updates

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/.gitignore b/.gitignore
index 11c196d..d93ec9e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*~
+*.elc
 ++log

diff --git a/09-sounds-sy.el b/09-sounds-sy.el
index 1480fab..6145ab8 100644 (file)
--- a/09-sounds-sy.el
+++ b/09-sounds-sy.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:57:38 steve>
+;; Time-stamp: <Monday Jan 21, 2013 12:13:24 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/09-sounds-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -59,11 +59,8 @@
 ;:*=======================
 ;:* Set default sound device
 (when (getenv "DISPLAY")               ; skip the lot if not in X11
-  (setq default-audio-device (make-audio-device 'pulse))
-
-  ;; (setq default-audio-device (make-audio-device 'ao :driver "alsa"))
-  ;; (setq default-audio-device (make-audio-device 'alsa :device "plughw:0,0"))
-
+  ;; (setq default-audio-device (make-audio-device 'pulse))
+  (setq default-audio-device (make-audio-device 'alsa))
   (init-workers 6)
   (setq synchronous-sounds nil)
   (load "sound")

diff --git a/17-emchat-sy.el b/17-emchat-sy.el
index 9aa0726..48cec0a 100644 (file)
--- a/17-emchat-sy.el
+++ b/17-emchat-sy.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Monday Jun 25, 2012 13:53:34 steve>
+;; Time-stamp: <Monday Jan 21, 2013 12:19:14 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/17-emchat-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -63,7 +63,7 @@
 ;;; Experimental stuff
 
 
-;; EMchat works great in a tty, but some setttings I use are best
+;; EMchat works great in a tty, but some settings I use are best
 ;; suited for X, so this just turns them off.
 (defun tty-im-setup ()
   "Set some things so I can use EMchat/Riece in tty."
@@ -147,15 +147,14 @@
 
 (when emchat-use-sound-flag
   (setq emchat-audio-device
-       ;(make-audio-device 'alsa :device "plughw:0,0"))
-       ;(make-audio-device 'ao :driver "alsa"))
+       (make-audio-device 'alsa))
        ;; Pulseaudio is CRAP!!
-       (make-audio-device 'pulse
-                          :client "SXEmacs::EMchat"
-                          :stream "EMchat::Stream"
-                          :role "phone"))
-  ;; SXEmacs doesn't like current ffmpeg
-  (setq emchat-media-driver 'sox)
+       ;;(make-audio-device 'pulse
+       ;;                 :client "SXEmacs::EMchat"
+       ;;                 :stream "EMchat::Stream"
+       ;;                 :role "phone"))
+  ;; SXEmacs doesn't like current ffmpeg, and SoX is dodgy ATM too
+  (setq emchat-media-driver 'sndfile)
   (setq emchat-sound-alist
        '((auth-sound . "Auth.wav")
          (buddy-sound . "Online.wav")