From 6f63f4a63f0169e685f760de34e1d343c9ef475b Mon Sep 17 00:00:00 2001 From: Matthew Donoughe Date: Sun, 17 Feb 2019 19:37:07 -0500 Subject: [PATCH] use released sbzswitch --- CHANGELOG.md | 9 ++++++++- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- README.md | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f48e0..2d0a7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v0.1.0-preview1] - 2019-02-17 +### Added +- Settings are now saved to disk so they can be remembered across reboots. + +## v0.1.0-preview0 - 2019-01-15 ### Added - Button for switching between headphones and speakers. -[Unreleased]: https://github.com/mdonoughe/streamdeck-rs/commits +[Unreleased]: https://github.com/mdonoughe/sbz-switch/compare/v0.1.0-preview1...HEAD +[v0.1.0-preview1]: https://github.com/mdonoughe/sbz-switch/compare/v0.1.0-preview0...v0.1.0-preview1 diff --git a/Cargo.lock b/Cargo.lock index 094c227..848df43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -725,8 +725,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sbz-switch" -version = "3.0.0" -source = "git+https://github.com/mdonoughe/sbz-switch#a3cbf4dd5dc5db7c2bc7039708e57aa96ea63f9e" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -748,7 +748,7 @@ version = "0.1.0" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sbz-switch 3.0.0 (git+https://github.com/mdonoughe/sbz-switch)", + "sbz-switch 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1442,7 +1442,7 @@ dependencies = [ "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" -"checksum sbz-switch 3.0.0 (git+https://github.com/mdonoughe/sbz-switch)" = "" +"checksum sbz-switch 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0cf8027ed6d30683c35dc4940be9bc7e173ca65f8af50e896b2596f6842538" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" diff --git a/Cargo.toml b/Cargo.toml index 32288a6..c74f19e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ travis-ci = { repository = "mdonoughe/sbzdeck" } [dependencies] futures = "0.1.25" indexmap = "1.0" -sbz-switch = { version = "3.0", git = "https://github.com/mdonoughe/sbz-switch" } +sbz-switch = "3.1" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/README.md b/README.md index 4e35943..0856b64 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ It is also possible to create a Stream Deck "multi action" which uses the plugin ## Configuration -Currently, the only way to configure the plugin is by editing the `sbzdeck.json` file found in the `%APPDATA%\Elgato\StreamDeck\Plugins\io.github.mdonoughe.sbzdeck.sdPlugin` directory after installing the plugin, and then restarting the Stream Deck software. +Currently, the only way to configure the plugin is by stopping the Stream Deck software, editing the `sbzdeck.json` file found in the `%APPDATA%\Elgato\StreamDeck\Plugins\io.github.mdonoughe.sbzdeck.sdPlugin` directory, and then restarting the Stream Deck software. If you try to edit the configuration while the Stream Deck software is running your settings may be overwritten. ### `profiles` @@ -35,7 +35,7 @@ The profiles section contains the settings that are applied when switching betwe These are only the defaults values, and they are overwritten right before switching to the other output. For example, if the JSON file says the speaker volume should be 0.5, but you've adjusted the volume to 0.6, switching to headphones and then back to speakers will set the volume back to 0.6, not 0.5. -The parameters subsection contains the Sound Blaster settings. You can use the [sbz-switch](https://github.com/mdonoughe/sbz-switch/) dump command to find settings you want. Note that setting these values here sets the default values, but the settings will not be applied unless the parameter is selected in the `selected_parameters` section, because the idea is that this section is supposed to be constantly updated by the plugin to contain all the settings (not implemented). +The parameters subsection contains the Sound Blaster settings. Note that setting these values here sets the default values, but the settings will not be applied unless the parameter is selected in the `selected_parameters` section, because this section is constantly updated by the plugin to contain all of the active settings. ### `selected_parameters`