Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	.emacs.d/site-lisp/oni.el

1 files changed, 49 insertions, 0 deletions

diff --git a/.emacs.d/site-lisp/metalexpress.el b/.emacs.d/site-lisp/metalexpress.el
new file mode 100644
index 0000000..9d57c19
--- /dev/null
+++ b/.emacs.d/site-lisp/metalexpress.el
@@ -0,0 +1,49 @@
+;;; metalexpress.el --- Listen to Metal Express Radio
+
+;; Copyright (C) 2012  Tom Willemsen
+
+;; Author: Tom Willemsen <thomas@aethon.nl>
+;; Keywords: multimedia
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functions for easily listening to Metal Express Radio.
+
+;;; Code:
+
+(defgroup metal-express-radio nil
+  "Group for the Metal Express Radio listening functions."
+  :group 'multimedia)
+
+(defcustom metal-express-radio-playlist-url
+  "http://usa7-vn.mixstream.net/listen/8248.m3u"
+  "The URL of the Metal Express Radio stream.")
+
+;;;###autoload
+(defun metal-express-radio-start ()
+  "Start listening to Metal Express Radio."
+  (interactive)
+  (async-shell-command
+   (concat "mplayer " metal-express-radio-playlist-url)
+   "*Metal Express Radio*"))
+
+(defun metal-express-radio-stop ()
+  "Stop listening to Metal Express Radio."
+  (interactive)
+  (kill-process (get-buffer-process "*Metal Express Radio*")))
+
+(provide 'metalexpress)
+;;; metalexpress.el ends here