aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorYoni Rabkin <yrk@gnu.org>2015-03-29 22:42:41 -0400
committerYoni Rabkin <yrk@gnu.org>2015-03-29 22:42:41 -0400
commit1ca398268d28644bb955560612ed881d783078d0 (patch)
tree78d453da12eaf7666531ba160bf024c02b99a658 /lisp
parent7df41c3237a6e855d0568bf9b67642cab61a8184 (diff)
Move librefm to https.
Note that some player backends don't know how to handle https.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emms-librefm-scrobbler.el2
-rw-r--r--lisp/emms-librefm-stream.el9
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/emms-librefm-scrobbler.el b/lisp/emms-librefm-scrobbler.el
index 28c4c02..a49a458 100644
--- a/lisp/emms-librefm-scrobbler.el
+++ b/lisp/emms-librefm-scrobbler.el
@@ -38,7 +38,7 @@
"Endpoint for client handshake.")
(defvar emms-librefm-scrobbler-method
- "http"
+ "https"
"Transfer method.")
(defvar emms-librefm-scrobbler-username nil
diff --git a/lisp/emms-librefm-stream.el b/lisp/emms-librefm-stream.el
index 9c55e41..7df67cb 100644
--- a/lisp/emms-librefm-stream.el
+++ b/lisp/emms-librefm-stream.el
@@ -60,6 +60,9 @@
(defvar emms-librefm-stream-playlist-buffer nil
"Non-interactive Emms GNU FM buffer.")
+(defvar emms-librefm-stream-connect-method "https://"
+ "Method of connecting to server.")
+
;;; ------------------------------------------------------------------
;;; HTTP
@@ -88,7 +91,7 @@ point after the HTTP headers."
(error "null username"))
(when (not emms-librefm-scrobbler-password)
(error "null password"))
- (let ((url (concat "http://"
+ (let ((url (concat emms-librefm-stream-connect-method
emms-librefm-stream-host-url
"/radio/handshake.php?"
"version=1.3.0.58" "&"
@@ -157,7 +160,7 @@ point after the HTTP headers."
(error "null session id"))
(when (not station)
(error "null station"))
- (let ((url (concat "http://"
+ (let ((url (concat emms-librefm-stream-connect-method
emms-librefm-stream-host-url
emms-librefm-stream-host-base-path
"/adjust.php?"
@@ -227,7 +230,7 @@ point after the HTTP headers."
"Create the getplaylist string."
(when (not radio-session-id)
(error "null radio session id"))
- (let ((url (concat "http://"
+ (let ((url (concat emms-librefm-stream-connect-method
emms-librefm-stream-host-url
emms-librefm-stream-host-base-path
"/xspf.php?"