[emms-help] Patch for emms-streaming.el

[Yoni Rabkin]

Below is a patch for emms-streaming.el, I hope gmail will not munge it.

The radio stations have been updated to use Lucas' playlist type.
"Deephouse" and "Mostly Classical" from DigitallyImported still do not
work, but according to the station's Website this might be because of
technical errors. All other stations have been checked to work.

I've removed `emms-stream-info-bookmark' and replaced it with a
placeholder function `emms-stream-info-current' since streaming
information if currently broken until I get it to work with the new
changes.

START OF DIFF OUTPUT
*** emms/emms-streaming.el      2005-05-18 17:11:22.000000000 +0300
--- modified_emms/emms-streaming.el     2005-05-19 09:37:12.000000000 +0300
***************
*** 60,95 ****
  ;; type could be either url or playlist. If url, then it represents a
  ;; direct IP, otherwite it's a stream playlist
  (defvar emms-stream-default-list
!   '(("SomaFM: Beatblender" "http://64.124.44.102:8388"; 1 url)
!     ("SomaFM: Secret Agent" "http://207.200.96.225:8010"; 1 url)
!     ("SomaFM: Secret Agent" "http://64.236.34.67:80/stream/1021"; 2 url)
!     ("SomaFM: Groove Salad" "http://64.236.34.97:80/stream/1018"; 1 url)
!     ("SomaFM: Groove Salad" "http://64.236.34.196:80/stream/1018"; 2 url)
!     ("SomaFM: Drone Zone" "http://64.236.34.97:80/stream/1032"; 1 url)
!     ("SomaFM: Drone Zone" "http://server2.somafm.com:8002"; 2 url)
!     ("SomaFM: Tag's Trance" "http://www.somafm.com/tagstrance.pls"; 1 playlist)
!     ("Digitally Imported, Deephouse"
"http://64.236.34.4:80/stream/1007"; 1 url)
!     ("Digitally Imported, Deephouse"
"http://64.236.34.4:5190/stream/1007"; 2 url)
!     ("Digitally Imported, Modern Jazz"
"http://64.236.34.97:80/stream/1019"; 1 url)
!     ("Digitally Imported, Modern Jazz"
"http://64.236.34.97:5190/stream/1019"; 2 url)
!     ("Digitally Imported, Mostly Classical"
"http://64.236.34.4:80/stream/1006"; 1 url)
!     ("Digitally Imported, Mostly Classical"
"http://64.236.34.4:5190/stream/1006"; 2 url)
!     ("Digitally Imported, Chillout" "http://64.236.34.4:80/stream/8022"; 1 url)
!     ("Digitally Imported, Chillout"
"http://64.236.34.4:5190/stream/8022"; 2 url)
!     ("Digitally Imported, Chillout" "http://205.188.234.65:8022"; 3 url)
!     ("Digitally Imported, Drum and Bass" "http://207.200.96.229:8030"; 1 url)
!     ("Drum and Bass Radio, BassDrive"
"http://us-dc1.streams.bassdrive.com:8024"; 1 url)
!     ("Drum and Bass Radio, BassDrive"
"http://us-dc1.streams.bassdrive.com:8016"; 2 url)
!     ("Flaresound, Jazzmusique" "http://64.236.34.196:80/stream/1016"; 1 url)
!     ("Flaresound, Jazzmusique" "http://205.188.234.4:8004"; 2 url)
!     ("Flaresound, L'Electric" "http://www.bp6.com:8002"; 1 url)
!     ("Stangs Garage, Eclectic" "http://130.13.125.181:8000"; 1 url)
!     ("Philosomatika, Goa-Trance" "http://205.188.234.65:8030"; 1 url)
!     ("Philosomatika, Goa-Trance" "http://205.188.234.65:8006"; 2 url)
!     ("Virgin Radio, The Groove" "http://vruk.sc.llnwd.net:12275"; 1 url)
!     ("Virgin Radio, Virgin Classic" "http://vruk.sc.llnwd.net:12265"; 1 url)
!     ("Virgin Radio, Virgin 1215AM" "http://vruk.sc.llnwd.net:12255"; 1 url)
!     ("WCPE, Classical Music" "http://audio.ibiblio.org:8010/wcpe.ogg"; 1 url)))
  ;;)
  ;;(
  (defvar emms-stream-mode-map
--- 60,107 ----
  ;; type could be either url or playlist. If url, then it represents a
  ;; direct IP, otherwite it's a stream playlist
  (defvar emms-stream-default-list
!  '(("SomaFM: Beatblender"
!     "http://www.somafm.com/beatblender.pls"; 1 playlist)
!    ("SomaFM: Secret Agent"
!     "http://www.somafm.com/secretagent.pls"; 1 playlist)
!    ("SomaFM: Groove Salad"
!     "http://www.somafm.com/groovesalad.pls"; 1 playlist)
!    ("SomaFM: Drone Zone"
!     "http://www.somafm.com/dronezone.pls"; 1 playlist)
!    ("SomaFM: Tag's Trance"
!     "http://www.somafm.com/tagstrance.pls"; 1 playlist)
!    ("Digitally Imported, Trance"
!     "http://www.digitallyimported.com/mp3/trance.pls"; 1 playlist)
!    ("Digitally Imported, Deephouse"
!     "http://www.digitallyimported.com/mp3/deephouse.pls"; 1 playlist)
!    ("Digitally Imported, Mostly Classical"
!     "http://www.digitallyimported.com/mp3/classical.pls"; 1 playlist)
!    ("Digitally Imported, Chillout"
!     "http://www.digitallyimported.com/mp3/chillout.pls"; 1 playlist)
!    ("Digitally Imported, Drum and Bass"
!     "http://www.digitallyimported.com/mp3/drumandbass.pls"; 1 playlist)
!    ("Philosomatika, Goa-Trance"
!     "http://www.philosomatika.com/Philosomatika.pls"; 1 playlist)
!    ("Drum and Bass Radio, BassDrive"
!     "http://www.bassdrive.com/BassDrive.m3u"; 1 playlist)
!    ("Flaresound, Jazzmusique"
!     "http://64.236.34.196:80/stream/1016"; 1 url)
!    ("Flaresound, Jazzmusique"
!     "http://205.188.234.4:8004"; 2 url)
!    ("Flaresound, L'Electric"
!     "http://www.bp6.com:8002"; 1 url)
!    ("Stangs Garage, Eclectic"
!     "http://www.stangsgarage.com/listen.pls"; 1 playlist)
!    ("DNA Lounge, Live"
!     "http://www.dnalounge.com/audio/128.m3u"; 1 playlist)
!    ("Virgin Radio, The Groove"
!     "http://www.smgradio.com/core/audio/ogg/live.pls?service=grbb"; 1 playlist)
!    ("Virgin Radio, Virgin Classic"
!     "http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb"; 1 playlist)
!    ("Virgin Radio, Virgin 1215AM"
!     "http://www.smgradio.com/core/audio/ogg/live.pls?service=vrbb"; 1 playlist)
!    ("WCPE, Classical Music"
!     "http://www.ibiblio.org/wcpe/wcpe.pls"; 1 playlist)))
  ;;)
  ;;(
  (defvar emms-stream-mode-map
***************
*** 111,117 ****
      (define-key map [?q] 'emms-stream-quit)
      (define-key map [?s] 'emms-stream-save-bookmarks-file)
      (define-key map [?u] 'emms-stream-move-bookmark-up)
!     (define-key map [?i] 'emms-stream-info-bookmark)
      (define-key map (kbd "<up>") 'emms-stream-previous-line)
      (define-key map (kbd "<down>") 'emms-stream-next-line)
      (define-key map (kbd "<left>") 'beginning-of-line)
--- 123,129 ----
      (define-key map [?q] 'emms-stream-quit)
      (define-key map [?s] 'emms-stream-save-bookmarks-file)
      (define-key map [?u] 'emms-stream-move-bookmark-up)
!     (define-key map [?i] 'emms-stream-info-current)
      (define-key map (kbd "<up>") 'emms-stream-previous-line)
      (define-key map (kbd "<down>") 'emms-stream-next-line)
      (define-key map (kbd "<left>") 'beginning-of-line)
***************
*** 339,350 ****
    (later-do 'emms-modeline-alter)
    (run-hooks 'emms-stream-play-hook))
  
! (defun emms-stream-info-bookmark ()
!   "Return the station and track information for the streaming audio
station under point."
!   (interactive)
!   (let* ((line  (get-text-property (point) 'emms-stream))
!          (url   (emms-stream-url  line)))
!     (emms-stream-info-message url)))
  
  ;; Navigation
  (defun emms-stream-next-line ()
--- 351,360 ----
    (later-do 'emms-modeline-alter)
    (run-hooks 'emms-stream-play-hook))
  
! ;; Currently broken, I'm working on it.
! (defun emms-stream-info-current ()
!   "Return the station and track information for the streaming audio
station currently playing."
!   (interactive)'())
  
  ;; Navigation
  (defun emms-stream-next-line ()
END OF DIFF OUTPUT