{ui, backend}: make Faded sliders, add fade master, other changes

- We now have a master fader, which we really should have had at the
  beginning.
- We now use Serde 1.0, and MessagePack instead of JSON. The rationale
  for doing this is that JSON doesn't actually support -inf values,
  so it was secretly encoding all -infs as null and causing errors.
  MessagePack doesn't have this restriction.
- We now use the fern logging framework in sqa-ui, and have nice semi-
  organised logging instead of the inconsistent chaos of println!
  that was there before.
- Apply/Cancel/OK is completely gone - all UI elements make instantaneous
  changes, so there's no need for those.
- You can actually manipulate fader sliders now, which are a thing.

Author: eeeeeta

Cargo.lock

@@ -6,14 +6,14 @@ authors = ["eeeeeta <eeeeeta@users.noreply.github.com>"]
 [dependencies]
 tokio-core = "0.1"
 futures = "0.1"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
+rmp-serde = "0.13"
+serde_derive = "1.0"
 time = "0.1"
-uuid = { version = "0.4", features = ["v4", "serde"] }
+uuid = { version = "0.5", features = ["v4", "serde"] }
 sqa-engine = { path = "../sqa-engine" }
 sqa-ffmpeg = { path = "../sqa-ffmpeg" }
 rosc = { path = "../rosc" }
-serde_json = "0.9"
 error-chain = "0.10"
 chrono = { version = "0.3", features = ["serde"] }
 sqa-osc-custom-derive = { path = "../sqa-osc-custom-derive" }

sqa-backend/Cargo.toml

@@ -10,9 +10,10 @@ use std::default::Default;
 
 #[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct FadeParams {
-    target: Option<Uuid>,
-    fades: Vec<Option<f32>>,
-    dur: Duration
+    pub target: Option<Uuid>,
+    pub fades: Vec<Option<f32>>,
+    pub fade_master: Option<f32>,
+    pub dur: Duration
 }
 #[derive(Default)]
 pub struct Controller {
@@ -30,6 +31,7 @@ impl EditableAction for Controller {
         &self.params
     }
     fn set_params(&mut self, params: FadeParams, _: &mut Context) {
+        println!("pars: {:?}", params);
         self.params = params;
     }
 }
@@ -80,6 +82,17 @@ impl ActionController for Controller {
             ActionType::Audio(ref mut t) => t,
             _ => bail!("Action was wrong type")
         };
+        if let Some(fade) = self.params.fade_master {
+            if let Some(sdr) = tgt.senders.get_mut(0) {
+                let mut fd = FadeDetails::new(sdr.volume().get(0), fade);
+                fd.set_start_time(time);
+                let secs_component = self.params.dur.as_secs() * ::sqa_engine::ONE_SECOND_IN_NANOSECONDS;
+                let subsec_component = self.params.dur.subsec_nanos() as u64;
+                fd.set_duration(secs_component + subsec_component);
+                fd.set_active(true);
+                sdr.set_master_volume(Box::new(Parameter::LinearFade(fd)));
+            }
+        }
         for (i, fade) in self.params.fades.iter().enumerate() {
             if let Some(fade) = *fade {
                 if let Some(sdr) = tgt.senders.get_mut(i) {

sqa-backend/src/actions/fade.rs

@@ -12,7 +12,6 @@ use state::IntSender;
 use errors::*;
 use serde::{Serialize, Deserialize};
 use std::fmt::Debug;
-use serde_json;
 use std::time::Duration;
 
 pub mod audio;
@@ -43,7 +42,7 @@ pub trait OscEditable {
     fn edit(&mut self, path: &str, args: Vec<OscType>) -> BackendResult<()>;
 }
 pub trait EditableAction {
-    type Parameters: Serialize + Deserialize + Clone + Debug + Default;
+    type Parameters: Serialize + for<'de> Deserialize<'de> + Clone + Debug + Default;
 
     fn get_params(&self) -> &Self::Parameters;
     fn set_params(&mut self, Self::Parameters, ctx: &mut Context);
@@ -240,7 +239,15 @@ impl Action {
                     bail!("wrong type of action parameters");
                 }
             },
-            _ => unimplemented!()
+            ActionType::Fade(ref mut a) => {
+                if let ActionParameters::Fade(d) = data {
+                    a.set_params(d, ctx);
+                    Ok(())
+                }
+                else {
+                    bail!("wrong type of action parameters");
+                }
+            }
         }
     }
     pub fn message(&mut self, msg: Box<Any>) -> Result<(), Box<Error>> {

sqa-backend/src/actions/mod.rs

@@ -4,7 +4,6 @@ use rosc::{decoder, encoder, OscMessage, OscPacket, OscType};
 use errors::*;
 use mixer::MixerConf;
 use errors::BackendErrorKind::*;
-use serde_json;
 use actions::{ActionParameters, OpaqueAction};
 use std::collections::HashMap;
 use uuid::Uuid;
@@ -160,6 +159,7 @@ impl UdpCodec for SqaWireCodec {
     type In = RecvMessage;
     type Out = SendMessage;
     fn decode(&mut self, src: &SocketAddr, buf: &[u8]) -> ::std::io::Result<Self::In> {
+        println!("{:?}", buf);
         let pkt = match decoder::decode(buf) {
             Ok(pkt) => {
                 match pkt {

sqa-backend/src/codec.rs

@@ -8,7 +8,8 @@ error_chain! {
         Jack(::sqa_engine::sqa_jack::errors::Error, ::sqa_engine::sqa_jack::errors::ErrorKind);
     }
     foreign_links {
-        Serde(::serde_json::Error);
+        RmpDecode(::rmp_serde::decode::Error);
+        RmpEncode(::rmp_serde::encode::Error);
         Io(::std::io::Error);
         StrParse(::std::string::ParseError);
     }

sqa-backend/src/errors.rs

@@ -8,7 +8,6 @@ use tokio_core::reactor::Remote;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use time::{Duration, SteadyTime};
 use serde::Serialize;
-use serde_json;
 use rosc::{OscType, OscMessage};
 use codec::Reply;
 use errors::*;
@@ -50,16 +49,6 @@ impl<M> ConnData<M> {
         self.framed.start_send(self.addr.msg_to(msg.into()))?;
         Ok(())
     }
-    pub fn reply<T>(&mut self, data: T) -> IoResult<()> where T: Serialize {
-        let j = serde_json::to_string(&data).unwrap(); // FIXME FIXME FIXME
-        let mut path = String::from("/reply");
-        path.push_str(&self.path);
-        self.framed.start_send(self.addr.msg_to(OscMessage {
-            addr: path,
-            args: Some(vec![OscType::String(j)])
-        }))?;
-        Ok(())
-    }
     pub fn subscribe(&mut self) {
         let a = self.addr.clone();
         self.parties.retain(|party| {

sqa-backend/src/handlers.rs

@@ -5,8 +5,7 @@ extern crate tokio_core;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
+extern crate rmp_serde;
 extern crate time;
 extern crate uuid;
 extern crate sqa_engine;

sqa-backend/src/lib.rs

@@ -117,6 +117,7 @@ impl ConnHandler for Context {
                 d.respond(ActionInfoRetrieved { uuid, res })?;
             },
             UpdateActionParams { uuid, params } => {
+                println!("uap: {:?}", params);
                 let res = do_with_ctx!(self, &uuid, |a: &mut Action| {
                     let ret = a.set_params(params, self).map_err(|e| e.to_string());
                     self.on_action_changed(d, a);

sqa-backend/src/state.rs

@@ -50,13 +50,13 @@ fn tokens_from_message(name: Ident, Message { path, substs, sers, ident, verbs,
             IdentType::Ser => quote! {
                 let #tok;
                 if args.len() < 1 {
-                    bail!(OSCWrongArgs("string"))
+                    bail!(OSCWrongArgs("blob"))
                 }
-                if let Some(x) = args.remove(0).string() {
-                    #tok2 = serde_json::from_str(&x)?;
+                if let Some(x) = args.remove(0).blob() {
+                    #tok2 = ::rmp_serde::from_slice(&x)?;
                 }
                 else {
-                    bail!(OSCWrongArgs("string"))
+                    bail!(OSCWrongArgs("blob"))
                 }
             },
             IdentType::Verb(ref id) => quote! {
@@ -90,8 +90,8 @@ fn tokens_from_message(name: Ident, Message { path, substs, sers, ident, verbs,
             let path = format!(#path #(,#substs2=#substs)*);
             let mut args = vec![
                 #(
-                    OscType::String(
-                        serde_json::to_string(&#sers)
+                    OscType::Blob(
+                        ::rmp_serde::to_vec(&#sers)
                             .unwrap()
                     )
                 ),*