Switch to unified view

a/doc/upmpdcli-manual.txt b/doc/upmpdcli-manual.txt
...
...
274
274
275
Upmpdcli implements an OpenHome Radio service which allows selecting and
275
Upmpdcli implements an OpenHome Radio service which allows selecting and
276
listening to internet radio stations when using an OpenHome-compatible
276
listening to internet radio stations when using an OpenHome-compatible
277
Control Point (e.g. Kazoo, Lumin, Bubble UPnP, etc.).
277
Control Point (e.g. Kazoo, Lumin, Bubble UPnP, etc.).
278
278
279
This facility uses Python 2.x, which must be available on the system for
279
This facility uses Python 2.x for upmpdcli releases up to 1.2, then Python 3
280
the radio links to work.
280
for 1.3 and later, and was tested with Python 2.7 and Python 3.5. Older
281
Python3 versions may work.
281
282
282
Radio channels can be accessed by using the Control Point application to
283
Radio channels can be accessed by using the Control Point application to
283
select the _Radio_ OpenHome source.
284
select the _Radio_ OpenHome source.
284
285
285
Radio stations can be defined in the configuration (at the end because of
286
Radio stations can be defined in the configuration (at the end because of
...
...
721
722
722
This requires the installation of the external *gmusicapi* Python
723
This requires the installation of the external *gmusicapi* Python
723
package. 
724
package. 
724
link:http://unofficial-google-music-api.readthedocs.io/en/latest/usage.html#usage[See the installation notes here].
725
link:http://unofficial-google-music-api.readthedocs.io/en/latest/usage.html#usage[See the installation notes here].
725
726
726
NOTE: gmusicapi needs Python 2.7.9 or better (e.g. the standard Python
727
NOTE: upmpdcli 1.3 and later use Python3 to run the plugins. Please replace
727
version on Ubuntu Trusty is too old). Older Python versions *will* crash.
728
pip with pip3 when installing gmusicapi.
729
730
NOTE: for upmpdcli version 1.2, which uses Python2, gmusicapi needs Python
731
2.7.9 or better (e.g. the standard Python version on Ubuntu Trusty is too
732
old). Older Python versions *will* crash.
728
733
729
You will need a valid subscription for most functions.
734
You will need a valid subscription for most functions.
730
735
731
I'm a little lost in the different google authentication/sign-in methods,
736
I'm a little lost in the different google authentication/sign-in methods,
732
but anyway:
737
but anyway:
...
...
882
C++11 support, and the development packages for *libupnp* version 1.6,
887
C++11 support, and the development packages for *libupnp* version 1.6,
883
*libcurl*, *libmpdclient*, and *libexpat*.
888
*libcurl*, *libmpdclient*, and *libexpat*.
884
889
885
Also the Python modules for streaming service support use the
890
Also the Python modules for streaming service support use the
886
*python-requests* package, so you may need to install it (it is only needed
891
*python-requests* package, so you may need to install it (it is only needed
887
at run time). Also *gmusicapi* for Google Music.
892
at run time). Also *gmusicapi* for Google Music. Upmpdcli 1.2 needs Python2,
893
upmpdcli 1.3 and later need Python3.
888
894
889
If you are using the source from the git repository, you will also need the
895
If you are using the source from the git repository, you will also need the
890
*autoconf*, *automake*, *libtool* trio. Use the +autogen.sh+ script to set
896
*autoconf*, *automake*, *libtool* trio. Use the +autogen.sh+ script to set
891
things up.
897
things up.
892
898
...
...
1087
  link:http://www.lesbonscomptes.com/upmpdcli/files/upmpdcli-spotify-authinit.zip[zip
1093
  link:http://www.lesbonscomptes.com/upmpdcli/files/upmpdcli-spotify-authinit.zip[zip
1088
  file for the helper script]. Right-click the link and use `Save link as`.
1094
  file for the helper script]. Right-click the link and use `Save link as`.
1089
- Unzip the file on any Linux machine with a web browser. This will create
1095
- Unzip the file on any Linux machine with a web browser. This will create
1090
  a 'upmpdcli-spotify-authinit' directory. The chosen machine can be the
1096
  a 'upmpdcli-spotify-authinit' directory. The chosen machine can be the
1091
  host where upmpdcli runs, or not: any Linux machine with a browser will do.
1097
  host where upmpdcli runs, or not: any Linux machine with a browser will do.
1092
- Check that the python-requests package is available on the chosen host, or
1098
- Check that the python3-requests package is available on the chosen host, or
1093
  install it.
1099
  install it.
1094
- Run the helper script inside the unzipped directory. Replace 'username'
1100
- Run the helper script inside the unzipped directory. Replace 'username'
1095
  with your Spotify user id.
1101
  with your Spotify user id.
1096
  
1102
  
1097
    ./spotiauthinit.py username
1103
    ./spotiauthinit.py username