From 6736d2e86d2909ef44759b1162e006bd5cc07547 Mon Sep 17 00:00:00 2001 From: Yoni Rabkin Date: Mon, 7 Nov 2016 18:15:04 -0500 Subject: * lisp/emms-stream-info.el: Remove preference and document. Removes the built-in preference for mplayer, but also clearly documents how one would go about choosing either mplayer or vlc to query the streams. --- doc/emms.texinfo | 25 ++++++++++++++++++++++--- lisp/emms-stream-info.el | 4 ++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/doc/emms.texinfo b/doc/emms.texinfo index 457a2d3..60a8957 100644 --- a/doc/emms.texinfo +++ b/doc/emms.texinfo @@ -2288,9 +2288,28 @@ invoking: (require 'emms-streams) @end lisp -The Emms interface for streaming audio is enabled by default in the -`emms-all' setup level. For more information about Emms setup levels -see @xref{Setup}. +Querying the streams for track information is provided by the +@file{emms-stream-info.el} package and can be loaded with: + +@lisp +(require 'emms-stream-info) +@end lisp + +The Emms interface for streaming audio, and the stream query +capabilites are enabled by default in the `emms-all' setup level. For +more information about Emms setup levels see @xref{Setup}. + +`emms-stream-info' calls a backend program to query the stream for +information. The preferred program needs to be specified by setting +the variable @var{emms-stream-info-backend} either `mplayer' or +`vlc'. For instance: + +@lisp +(setq emms-stream-info-backend 'vlc) +@end lisp + +Obviously, the corresponding program needs to be installed and +available for Emms to invoke. Enter the emms-streams interface by invoking @kbd{M-x} @command{emms-streams}. The emms-streams interface comes with a diff --git a/lisp/emms-stream-info.el b/lisp/emms-stream-info.el index 667e3ce..4bf7eeb 100644 --- a/lisp/emms-stream-info.el +++ b/lisp/emms-stream-info.el @@ -44,7 +44,7 @@ ;;; Code: -(defvar emms-stream-info-backend 'mplayer +(defvar emms-stream-info-backend nil "Symbol designating the backend program to use.") ;; using unhygienic macros for good... or is it evil? @@ -82,7 +82,7 @@ (bitrate "N/A") (nowplaying "N/A")) (with-temp-buffer - (message "querying stream...") + (message "querying stream with %s backend..." emms-stream-info-backend) (cond ((eq emms-stream-info-backend 'mplayer) (emms-stream-info-mplayer-backend url) -- cgit v1.2.3