From 608e8249a2815b9332e590750b7f1bfece6901ac Mon Sep 17 00:00:00 2001 From: Colm Date: Tue, 23 Jan 2018 00:25:58 +0000 Subject: [PATCH 01/15] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bd8bf64..be46aeb 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ which are not available in the official library. Note: librespot only works with Spotify Premium -# THIS FORK +# This fork As the origin is no longer maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. -# THANKS -I've done noting more than make this pretty so big thanks to: +# Credits +I've done nothing more than make this pretty so big thanks to: [plietar](https://github.com/plietar/) for making the thing in the first place. [kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. [ipha](https://github.com/ipha/) for the start stop audio sink. From 1442e9a1a11b92e37dbf8030d8fc576ff104e44c Mon Sep 17 00:00:00 2001 From: Colm Date: Tue, 23 Jan 2018 19:30:28 +0000 Subject: [PATCH 02/15] Update README.md --- README.md | 76 +++---------------------------------------------------- 1 file changed, 3 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index be46aeb..25c80d0 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Note: librespot only works with Spotify Premium # This fork As the origin is no longer maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. +# Wiki +More information can befound in the [wiki](https://github.com/ComlOnline/librespot/wiki) # Credits I've done nothing more than make this pretty so big thanks to: @@ -51,80 +53,8 @@ cargo build --release A sample program implementing a headless Spotify Connect receiver is provided. Once you've built *librespot*, run it using : ```shell -target/release/librespot --username USERNAME --cache CACHEDIR --name DEVICENAME [--initial-volume 20] +target/release/librespot --name DEVICENAME ``` - -### All options - -| Type | Short | Long | Description | Hint | -|----------|-------|---------------------|-------------------------------------------------|-------------| -| Option | c | cache | Path to a directory where files will be cached. | CACHE | -| Flag | | disable-audio-cache | Disable caching of the audio data. | | -| Required | n | name | Device name | NAME | -| Option | | device-type | Displayed device type | DEVICE_TYPE | -| Option | b | bitrate | Bitrate (96, 160 or 320). Defaults to 160 | BITRATE | -| Option | | onstart | Run PROGRAM when playback is about to begin. | | -| Option | | onstop | Run PROGRAM when playback has ended. | PROGRAM | -| Flag | v | verbose | Enable verbose output | PROGRAM | -| Option | u | username | Username to sign in with | USERNAME | -| Option | p | password | Password | PASSWORD | -| Flag | | disable-discovery | Disable discovery mode | | -| Option | | backend | Audio backend to use. Use '?' to list options | BACKEND | -| Option | | device | Audio device to use. Use '?' to list options | DEVICE | -| Option | | mixer | Mixer to use | MIXER | -| Option | | initial-volume | Initial volume in %, once connected [0-100] | VOLUME | - -Taken from here: -https://github.com/ComlOnline/librespot/blob/master/src/main.rs#L88 - -## Audio Backends -*librespot* supports various audio backends. Multiple backends can be enabled at compile time by enabling the -corresponding cargo feature. By default, only PortAudio is enabled. - -A specific backend can selected at runtime using the `--backend` switch. - -```shell -cargo build --features portaudio-backend -target/release/librespot [...] --backend portaudio -``` - -The following backends are currently available : -- ALSA -- PortAudio -- PulseAudio - -## Cross-compiling -A cross compilation environment is provided as a docker image. -Build the image from the root of the project with the following command : - -``` -$ docker build -t librespot-cross -f contrib/Dockerfile . -``` - -The resulting image can be used to build librespot for linux x86_64, armhf (compatible e. g. with Raspberry Pi 2 or 3, but not with Raspberry Pi 1 or Zero) and armel. -The compiled binaries will be located in /tmp/librespot-build - -``` -docker run -v /tmp/librespot-build:/build librespot-cross -``` - -If only one architecture is desired, cargo can be invoked directly with the appropriate options : -```shell -docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --no-default-features --features alsa-backend -docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabihf --no-default-features --features alsa-backend -docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features alsa-backend -``` - -Don't forget to set the `with-tremor` feature flag if your target device does not have floating-point capabilities. - -## Development -When developing *librespot*, it is preferable to use Rust nightly, and build it using the following : -```shell -cargo build --no-default-features --features "nightly portaudio-backend" -``` - -This produces better compilation error messages than with the default configuration. - ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. Use at your own risk. From 838523d49de7fac0b59aeabc0fc6120a230cb1f2 Mon Sep 17 00:00:00 2001 From: Colm Date: Tue, 23 Jan 2018 19:31:27 +0000 Subject: [PATCH 03/15] Update README.md --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 25c80d0..b02f1c2 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,6 @@ As the origin is no longer maintained I wanted to have a place for a version of # Wiki More information can befound in the [wiki](https://github.com/ComlOnline/librespot/wiki) -# Credits -I've done nothing more than make this pretty so big thanks to: -[plietar](https://github.com/plietar/) for making the thing in the first place. -[kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. -[ipha](https://github.com/ipha/) for the start stop audio sink. -[fossedihelm](https://github.com/fossedihelm/) for [addind a default inital volume and options for it](https://github.com/ComlOnline/librespot/pull/5) -[brain0](https://github.com/brain0/) for [making pluseaudio more robust against audio failures](https://github.com/ComlOnline/librespot/pull/6) - ## Building Rust 1.17.0 or later is required to build librespot. @@ -55,6 +47,15 @@ Once you've built *librespot*, run it using : ```shell target/release/librespot --name DEVICENAME ``` + +# Credits +I've done nothing more than make this pretty so big thanks to: +[plietar](https://github.com/plietar/) for making the thing in the first place. +[kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. +[ipha](https://github.com/ipha/) for the start stop audio sink. +[fossedihelm](https://github.com/fossedihelm/) for [addind a default inital volume and options for it](https://github.com/ComlOnline/librespot/pull/5) +[brain0](https://github.com/brain0/) for [making pluseaudio more robust against audio failures](https://github.com/ComlOnline/librespot/pull/6) + ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. Use at your own risk. From 977664f5fe22befd84938a21711ada7d196959b3 Mon Sep 17 00:00:00 2001 From: Colm Date: Tue, 23 Jan 2018 19:31:49 +0000 Subject: [PATCH 04/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b02f1c2..33a8ecd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ which are not available in the official library. Note: librespot only works with Spotify Premium -# This fork +## This fork As the origin is no longer maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. # Wiki From b819f632cf9de164d0c6957511ca3095436c8318 Mon Sep 17 00:00:00 2001 From: Colm Date: Tue, 23 Jan 2018 19:32:29 +0000 Subject: [PATCH 05/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 33a8ecd..fd8ec42 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ As the origin is no longer maintained I wanted to have a place for a version of # Wiki More information can befound in the [wiki](https://github.com/ComlOnline/librespot/wiki) -## Building +# Building Rust 1.17.0 or later is required to build librespot. **If you are building librespot on macOS, the homebrew provided rust may fail due to the way in which homebrew installs rust. In this case, uninstall the homebrew version of rust and use [rustup](https://www.rustup.rs/), and librespot should then build.** @@ -48,7 +48,7 @@ Once you've built *librespot*, run it using : target/release/librespot --name DEVICENAME ``` -# Credits +## Credits I've done nothing more than make this pretty so big thanks to: [plietar](https://github.com/plietar/) for making the thing in the first place. [kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. From f966440f987b1e9ce9bd4fb785b9ccef97df663d Mon Sep 17 00:00:00 2001 From: Colm Date: Thu, 25 Jan 2018 01:34:56 +0000 Subject: [PATCH 06/15] Updated links and Travis badge --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fd8ec42..881663b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/ComlOnline/librespot.svg?branch=master)](https://travis-ci.org/ComlOnline/librespot) +[![Build Status](https://travis-ci.org/librespot-org/librespot.svg?branch=master)](https://travis-ci.org/librespot-org/librespot) # librespot *librespot* is an open source client library for Spotify. It enables @@ -12,7 +12,7 @@ Note: librespot only works with Spotify Premium As the origin is no longer maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. # Wiki -More information can befound in the [wiki](https://github.com/ComlOnline/librespot/wiki) +More information can befound in the [wiki](https://github.com/librespot-org/librespot/wiki) # Building Rust 1.17.0 or later is required to build librespot. @@ -53,8 +53,8 @@ I've done nothing more than make this pretty so big thanks to: [plietar](https://github.com/plietar/) for making the thing in the first place. [kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. [ipha](https://github.com/ipha/) for the start stop audio sink. -[fossedihelm](https://github.com/fossedihelm/) for [addind a default inital volume and options for it](https://github.com/ComlOnline/librespot/pull/5) -[brain0](https://github.com/brain0/) for [making pluseaudio more robust against audio failures](https://github.com/ComlOnline/librespot/pull/6) +[fossedihelm](https://github.com/fossedihelm/) for [addind a default inital volume and options for it](https://github.com/librespot-org/librespot/pull/5) +[brain0](https://github.com/brain0/) for [making pluseaudio more robust against audio failures](https://github.com/librespot-org/librespot/pull/6) ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. From 364f912885eb1880c70e1c709d6c40f245411d86 Mon Sep 17 00:00:00 2001 From: Colm Date: Fri, 26 Jan 2018 21:21:36 +0000 Subject: [PATCH 07/15] Update README.md --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 881663b..a2b0f4b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ which are not available in the official library. Note: librespot only works with Spotify Premium ## This fork -As the origin is no longer maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. +As the origin by [plietar](https://github.com/plietar/) is no longer actively maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. # Wiki More information can befound in the [wiki](https://github.com/librespot-org/librespot/wiki) @@ -48,14 +48,6 @@ Once you've built *librespot*, run it using : target/release/librespot --name DEVICENAME ``` -## Credits -I've done nothing more than make this pretty so big thanks to: -[plietar](https://github.com/plietar/) for making the thing in the first place. -[kingosticks](https://github.com/kingosticks/) for the Suffling and Repeat. -[ipha](https://github.com/ipha/) for the start stop audio sink. -[fossedihelm](https://github.com/fossedihelm/) for [addind a default inital volume and options for it](https://github.com/librespot-org/librespot/pull/5) -[brain0](https://github.com/brain0/) for [making pluseaudio more robust against audio failures](https://github.com/librespot-org/librespot/pull/6) - ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. Use at your own risk. From 08959c23c41f29c969e67639211ea9a4c433e725 Mon Sep 17 00:00:00 2001 From: Colm Date: Fri, 26 Jan 2018 21:29:24 +0000 Subject: [PATCH 08/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2b0f4b..596a7ed 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ As the origin by [plietar](https://github.com/plietar/) is no longer actively ma More information can befound in the [wiki](https://github.com/librespot-org/librespot/wiki) # Building -Rust 1.17.0 or later is required to build librespot. +Rust 1.18.0 or later is required to build librespot. **If you are building librespot on macOS, the homebrew provided rust may fail due to the way in which homebrew installs rust. In this case, uninstall the homebrew version of rust and use [rustup](https://www.rustup.rs/), and librespot should then build.** From 1358fc7995382ba9d98510ba277051380a9b9c2c Mon Sep 17 00:00:00 2001 From: Colm Date: Fri, 26 Jan 2018 21:44:57 +0000 Subject: [PATCH 09/15] Typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 596a7ed..277a1b5 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Note: librespot only works with Spotify Premium As the origin by [plietar](https://github.com/plietar/) is no longer actively maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. # Wiki -More information can befound in the [wiki](https://github.com/librespot-org/librespot/wiki) +More information can be found in the [wiki](https://github.com/librespot-org/librespot/wiki) # Building Rust 1.18.0 or later is required to build librespot. From b495f57676be3ebbddf1aed26d9f123bd6b45d70 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 28 Jan 2018 17:51:00 +0100 Subject: [PATCH 10/15] Proposed update to Readme. This is just a simple update to the readme to reflect this repo's intention as the replacement repo for plietar/librespot, and adds a to-do list for feature requests/problems that need resolving. --- README.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 277a1b5..3cd7e28 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ which are not available in the official library. Note: librespot only works with Spotify Premium ## This fork -As the origin by [plietar](https://github.com/plietar/) is no longer actively maintained I wanted to have a place for a version of librespot with other peoples forks and features merged. +As the origin by [plietar](https://github.com/plietar/) is no longer actively maintained, this organisation and repository have been set up so that the project may be maintained and upgraded in the future. # Wiki More information can be found in the [wiki](https://github.com/librespot-org/librespot/wiki) @@ -17,7 +17,7 @@ More information can be found in the [wiki](https://github.com/librespot-org/lib # Building Rust 1.18.0 or later is required to build librespot. -**If you are building librespot on macOS, the homebrew provided rust may fail due to the way in which homebrew installs rust. In this case, uninstall the homebrew version of rust and use [rustup](https://www.rustup.rs/), and librespot should then build.** +**If you are building librespot on macOS, the homebrew provided rust may fail due to the way in which homebrew installs rust. In this case, uninstall the homebrew version of rust and use [rustup](https://www.rustup.rs/), and librespot should then build. This should have been fixed in more recent versions of Homebrew, but we're leaving this notice here as a warning.** It also requires a C, with portaudio. @@ -48,13 +48,21 @@ Once you've built *librespot*, run it using : target/release/librespot --name DEVICENAME ``` -## Disclaimer -Using this code to connect to Spotify's API is probably forbidden by them. -Use at your own risk. - ## Contact Come and hang out on gitter if you need help or want to offer some. https://gitter.im/sashahilton00/spotify-connect-resources +## To-Do/Feature Requests +If there is a feature request that is being considered, or has been widely requested, it should be listed below. Please do not use this for bug reports or special use case feature requests. + +[ ] Document the Spotify Protocol and provide reference example. +[ ] Implement API to allow wrappers to be written for librespot. +[ ] Logarithmic volume scaling +[ ] Provide automatic release binaries for download + +## Disclaimer +Using this code to connect to Spotify's API is probably forbidden by them. +Use at your own risk. + ## License Everything in this repository is licensed under the MIT license. From a855fe62af65ab17bface0548907c7f7927b1fa6 Mon Sep 17 00:00:00 2001 From: Colm Date: Sun, 28 Jan 2018 16:57:05 +0000 Subject: [PATCH 11/15] Added metadata feature request and added link to logarithmic volume --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cd7e28..a6ce958 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,9 @@ If there is a feature request that is being considered, or has been widely reque [ ] Document the Spotify Protocol and provide reference example. [ ] Implement API to allow wrappers to be written for librespot. -[ ] Logarithmic volume scaling +[ ] Logarithmic volume scaling (#10) [ ] Provide automatic release binaries for download +[ ] Provide an adequate method for exporting metadata (#7) ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. From ad7162530cb5d3e61c2278cf99fbad5283effd5e Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 28 Jan 2018 18:16:44 +0100 Subject: [PATCH 12/15] Fix formatting, add detail to metadata request. --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a6ce958..d736595 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,13 @@ https://gitter.im/sashahilton00/spotify-connect-resources ## To-Do/Feature Requests If there is a feature request that is being considered, or has been widely requested, it should be listed below. Please do not use this for bug reports or special use case feature requests. -[ ] Document the Spotify Protocol and provide reference example. -[ ] Implement API to allow wrappers to be written for librespot. -[ ] Logarithmic volume scaling (#10) -[ ] Provide automatic release binaries for download -[ ] Provide an adequate method for exporting metadata (#7) +- [ ] Document the Spotify Protocol and provide reference example. +- [ ] Implement API to allow wrappers to be written for librespot. +- [ ] Logarithmic volume scaling (#10) +- [ ] Provide automatic release binaries for download +- [ ] Provide an adequate method for exporting metadata (#7) + - [ ] Provide API Documentation + - [ ] Provide Schema/Versioning ## Disclaimer Using this code to connect to Spotify's API is probably forbidden by them. From e0d31bc972a05b9ad6b894dff09a8e4675a50efe Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 28 Jan 2018 18:53:24 +0100 Subject: [PATCH 13/15] Add Travis notifications to Gitter. --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8626377..402b32a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,10 @@ script: - cargo build --no-default-features --target armv7-unknown-linux-gnueabihf notifications: - email: false + email: false + webhooks: + urls: + - https://webhooks.gitter.im/e/780b178b15811059752e + on_success: change # options: [always|never|change] default: always + on_failure: always # options: [always|never|change] default: always + on_start: never # options: [always|never|change] default: always From 43b5e02260cb6216aa3100d02546bdc99769bb21 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 28 Jan 2018 19:02:32 +0100 Subject: [PATCH 14/15] Add Gitter Badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 277a1b5..03b1ff9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/librespot-org/librespot.svg?branch=master)](https://travis-ci.org/librespot-org/librespot) +[![Gitter chat](https://badges.gitter.im/librespot-org/librespot.png)](https://gitter.im/sashahilton00/spotify-connect-resources) # librespot *librespot* is an open source client library for Spotify. It enables From 5f21c2582887b6f58aeb4a0900c5c28ee634ef98 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 28 Jan 2018 19:43:34 +0100 Subject: [PATCH 15/15] [ci skip] Fix formatting --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 907779f..623a56f 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ If there is a feature request that is being considered, or has been widely reque - [ ] Document the Spotify Protocol and provide reference example. - [ ] Implement API to allow wrappers to be written for librespot. -- [ ] Logarithmic volume scaling (#10) +- [ ] Logarithmic volume scaling ([#10](https://github.com/librespot-org/librespot/issues/10)) - [ ] Provide automatic release binaries for download -- [ ] Provide an adequate method for exporting metadata (#7) +- [ ] Provide an adequate method for exporting metadata ([#7](https://github.com/librespot-org/librespot/issues/7)) - [ ] Provide API Documentation - [ ] Provide Schema/Versioning