Add https as a recognizable connection option.

Note that not all backends know how to play through an https connection.

5 files changed, 8 insertions, 8 deletions

diff --git a/lisp/emms-player-mplayer.el b/lisp/emms-player-mplayer.el
index 2fc5d3b..aa1f5c7 100644
--- a/lisp/emms-player-mplayer.el
+++ b/lisp/emms-player-mplayer.el
@@ -34,13 +34,13 @@
 (require 'emms-player-simple)
 
 (define-emms-simple-player mplayer '(file url)
-  (concat "\\`\\(http\\|mms\\)://\\|"
+  (concat "\\`\\(http[s]?\\|mms\\)://\\|"
 	  (apply #'emms-player-simple-regexp
 		 emms-player-base-format-list))
   "mplayer" "-slave" "-quiet" "-really-quiet")
 
 (define-emms-simple-player mplayer-playlist '(streamlist)
-  "\\`http://"
+  "\\`http[s]?://"
   "mplayer" "-slave" "-quiet" "-really-quiet" "-playlist")
 
 (emms-player-set emms-player-mplayer
diff --git a/lisp/emms-player-simple.el b/lisp/emms-player-simple.el
index 95bd6e0..fd93137 100644
--- a/lisp/emms-player-simple.el
+++ b/lisp/emms-player-simple.el
@@ -183,7 +183,7 @@ PLAYER is the name of the current player."
   (emms-player-simple-regexp "mid")
   "fluidsynth" "-aalsa" "-in" "/media/music/sf/FluidR3-GM.SF2")
 (define-emms-simple-player alsaplayer '(file url)
-  (concat "\\`http://\\|"
+  (concat "\\`http[s]?://\\|"
           (emms-player-simple-regexp "ogg" "mp3" "wav" "flac" "pls" "m3u"))
   "alsaplayer" "--quiet" "--nosave" "\"--interface text\"")
 
diff --git a/lisp/emms-player-vlc.el b/lisp/emms-player-vlc.el
index 8a95297..06f3955 100644
--- a/lisp/emms-player-vlc.el
+++ b/lisp/emms-player-vlc.el
@@ -30,13 +30,13 @@
 ;; I use this macro, and later override some of the stuff it defines
 ;; in order to accomodate VLC's particular idioms.
 (define-emms-simple-player vlc '(file url)
-  (concat "\\`\\(http\\|mms\\)://\\|"
+  (concat "\\`\\(http[s]?\\|mms\\)://\\|"
 	  (apply #'emms-player-simple-regexp
 		 emms-player-base-format-list))
   "vlc" "--intf=rc")
 
 (define-emms-simple-player vlc-playlist '(streamlist)
-  "\\`http://"
+  "\\`http[s]?://"
   "vlc" "--intf=rc")
 
 ;; (kludge) By default, VLC does not quit after finishing to play a
diff --git a/lisp/emms-player-xine.el b/lisp/emms-player-xine.el
index de86059..2fc60e7 100644
--- a/lisp/emms-player-xine.el
+++ b/lisp/emms-player-xine.el
@@ -35,7 +35,7 @@
 (require 'emms-player-simple)
 
 (define-emms-simple-player xine '(file url)
-  (concat "\\`\\(http\\|mms\\)://\\|"
+  (concat "\\`\\(http[s]?\\|mms\\)://\\|"
           (emms-player-simple-regexp
            "ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
            "mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
diff --git a/lisp/emms-source-playlist.el b/lisp/emms-source-playlist.el
index 0054f43..eadd4b7 100644
--- a/lisp/emms-source-playlist.el
+++ b/lisp/emms-source-playlist.el
@@ -271,7 +271,7 @@ Files will be relative to the directory of PLAYLIST-FILE, unless
 they have absolute paths."
   (let ((dir (file-name-directory playlist-file)))
     (mapcar (lambda (file)
-              (if (string-match "\\`\\(http\\|mms\\)://" file)
+              (if (string-match "\\`\\(http[s]?\\|mms\\)://" file)
                   (emms-track 'url file)
                 (emms-track 'file (expand-file-name file dir))))
             (emms-source-playlist-m3u-files))))
@@ -343,7 +343,7 @@ Files will be relative to the directory of PLAYLIST-FILE, unless
 they have absolute paths."
   (let ((dir (file-name-directory playlist-file)))
     (mapcar (lambda (file)
-              (if (string-match "\\`\\(http\\|mms\\)://" file)
+              (if (string-match "\\`\\(http[s]?\\|mms\\)://" file)
                   (emms-track 'url file)
 		(if (string-match "\\`file://" file) ;; handle file:// uris 
 		  (let ((file (url-unhex-string (substring file 7))))