Move gstreamer support into simple player.

darcs-hash:20050912152239-2189f-e1b16eaa105d479db199254efc639d0cbe4d3bb2.gz

2 files changed, 4 insertions, 63 deletions

diff --git a/emms-player-gstreamer.el b/emms-player-gstreamer.el
deleted file mode 100644
index e3cd782..0000000
--- a/emms-player-gstreamer.el
+++ /dev/null
@@ -1,63 +0,0 @@
-;; emms-gstreamer.el --- EMMS Gstreamer interaction
-
-;; Copyright (C) 2005  Lucas Bonnet
-
-;; Author: Lucas Bonnet <lucas@rincevent.net>
-;; Keywords: emms, mp3, ogg, multimedia
-
-;; This file 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 2, or (at your option)
-;; any later version.
-;;
-;; GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-;; Boston, MA 02110-1301 USA
-
-;;; Commentary:
-
-;; Very basic support
-
-;; The wrapper concept is easier to set up than a generic gstreamer
-;; support, but in the long term, it's probably not a good idea.
-
-;; Installation instructions :
-
-;; 1. Put (require 'emms-player-gstreamer) in your ~/.emacs or
-;; whatever you use to configure EMMS.
-
-;; 2. Put the wrappers in your `exec-path' :
-;;      (add-to-list 'exec-path "/path/to/wrapper") or the other way,
-;;      by moving it to an already known directory.
-
-(require 'emms-player-simple)
-
-(defvar emms-player-gstreamer-sink "alsasink"
-  "The audio output sink to use")
-
-(define-emms-simple-player gstreamer '(file) 
-  (regexp-opt '(".mp3" ".ogg" ".mod" ".flac" ".xm" ".it" ".ft"
-		".MP3" ".OGG" ".MOD" ".FLAC" ".XM" ".IT" ".FT"))
-  "gst-wrapper")
-
-(setq emms-player-gstreamer-parameters (list emms-player-gstreamer-sink))
-
-(emms-player-set emms-player-gstreamer 'pause  'emms-player-gstreamer-pause)
-(emms-player-set emms-player-gstreamer 'resume 'emms-player-gstreamer-resume)
-
-(defun emms-player-gstreamer-pause ()
-  (interactive)
-  (signal-process (get-process emms-player-simple-process-name) 'SIGSTOP))
-
-(defun emms-player-gstreamer-resume ()
-  (interactive)
-  (signal-process (get-process emms-player-simple-process-name) 'SIGCONT))
-
-
-(provide 'emms-player-gstreamer)
diff --git a/emms-player-simple.el b/emms-player-simple.el
index 92b9540..92af56b 100644
--- a/emms-player-simple.el
+++ b/emms-player-simple.el
@@ -138,6 +138,10 @@ the specified PARAMS."
 (define-emms-simple-player mpg321 '(file url) "\\.[mM][pP][23]$" "mpg321")
 (define-emms-simple-player ogg123 '(file) (regexp-opt '(".ogg" ".OGG" ".FLAC" ".flac")) "ogg123")
 (define-emms-simple-player speexdec '(file) "\\.[sS][pP][xX]$" "speexdec")
+(define-emms-simple-player gstreamer '(file)
+  (regexp-opt '(".[mM][pP]3" ".[oO][gG][gG]" ".[mM][oO][dD]" ".[fF][lL][aA][cC]"
+                ".[xX][mM]" ".[iI][tT]" ".[fF][tT]"))
+  "gst-wrapper" "alsasink")
 
 (provide 'emms-player-simple)
 ;;; emms-player-simple.el ends here