From: Steve Youngs <steve@sxemacs.org>
Date: Wed, 30 Jan 2013 07:21:04 +0000 (+1000)
Subject: A few misc changes
X-Git-Url: http://cgit.sxemacs.org/?p=syinit;a=commitdiff_plain;h=5674f22a49686b6c042c7bf140f18fe75bbf2c2a

A few misc changes

	* 09-sounds-sy.el: Re-enable PulseAudio.

	* 13-misc-sy.el (default-frame-plist): Give it a name "SXEFrame"
	so I can have different Sawfish window rules the initial frame and
	subsequent frames etc.

	* 16-riece-sy.el (sy-riece): Set frame width.

	* 17-emchat-sy.el (emchat-use-sound-flag): Re-enable PulseAudio,
	also set `default-media-stream-volume' to 50 so it doesn't blast
	my ears off.

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

diff --git a/09-sounds-sy.el b/09-sounds-sy.el
index 6145ab8..fd0d470 100644
--- 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: <Monday Jan 21, 2013 12:13:24 steve>
+;; Time-stamp: <Saturday Jan 26, 2013 21:45:54 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,8 +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 'alsa))
+  (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")
@@ -84,4 +84,6 @@
     (load-sound-file "cuckoo" 'alarm))
   )
 ;:*::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-(message "sounds loaded")
+(if default-audio-device
+    (message "sounds loaded")
+  (message "sounds NOT loaded (OK if this is a TTY)"))
diff --git a/13-misc-sy.el b/13-misc-sy.el
index a304eb9..028bea6 100644
--- a/13-misc-sy.el
+++ b/13-misc-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:59:16 steve>
+;; Time-stamp: <Wednesday Jan 30, 2013 16:46:37 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/13-misc-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -446,7 +446,7 @@ instead."
 ;:* Set the frame geometry
 (unless (getenv "XWEM_RUNNING")
   (setq initial-frame-plist '(top 23 left 26 width 95 height 40)
-	default-frame-plist '(top 3 left 26 width 95 height 40)))
+	default-frame-plist '(top 3 left 26 width 95 height 40 name "SXEFrame")))
 
 ;:*======================
 ;:* The Beginnings of a Finance package
diff --git a/16-riece-sy.el b/16-riece-sy.el
index 3ffc559..e74d590 100644
--- a/16-riece-sy.el
+++ b/16-riece-sy.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Saturday Jun 23, 2012 12:30:35 steve>
+;; Time-stamp: <Tuesday Jan 29, 2013 17:55:04 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/16-riece-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -666,7 +666,8 @@ connect to."
   (let ((riece-server (if current-prefix-arg
 			  nil
 			"irc.sxemacs.org")))
-    (setq riece-frame (new-frame '((name . "RieceFrame"))))
+    (setq riece-frame (new-frame '((name . "RieceFrame")
+				   (width . 110))))
     (select-frame riece-frame)
     (call-interactively 'riece)
     (focus-frame riece-frame)))
diff --git a/17-emchat-sy.el b/17-emchat-sy.el
index 48cec0a..0071f74 100644
--- 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 Jan 21, 2013 12:19:14 steve>
+;; Time-stamp: <Wednesday Jan 30, 2013 17:20:27 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
@@ -147,14 +147,14 @@
 
 (when emchat-use-sound-flag
   (setq emchat-audio-device
-	(make-audio-device 'alsa))
-	;; Pulseaudio is CRAP!!
-	;;(make-audio-device 'pulse
-	;;		   :client "SXEmacs::EMchat"
-	;;		   :stream "EMchat::Stream"
-	;;		   :role "phone"))
+	;(make-audio-device 'alsa))
+	(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 default-media-stream-volume 50)
   (setq emchat-sound-alist
 	'((auth-sound . "Auth.wav")
 	  (buddy-sound . "Online.wav")