tzim/loupiottes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modifs OSC

Browse source
This commit is contained in:
tzim 2014-12-30 18:11:34 +00:00
parent 431af46b9d
commit 22e4afe63f
2 changed files with 140 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
DMX-2.0/OSCServer.cs
View file

@ -468,6 +468,17 @@ namespace DMX2
break; break;
} }
} }
if (seq is SequenceurSon) {
SequenceurSon seqs = seq as SequenceurSon;
switch(toks[2]){
case "master":
int arg = msg.Args[0].GetInt();
if (arg<0) arg=0;
if (arg>100)arg=100;
seqs.Volume = (uint)arg;
break;
}
}
} }
void ProcessMessageUniv (OSCMessage msg, string[] toks) void ProcessMessageUniv (OSCMessage msg, string[] toks)
@ -531,37 +542,51 @@ namespace DMX2
byte[] buff = msg.Encode (); byte[] buff = msg.Encode ();
udpCli.Send (buff, buff.Length, ep); udpCli.Send (buff, buff.Length, ep);
var id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours-1; var id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours - 1;
msg = new OSCMessage ("/masterseq/prevstep");
if (id >= 0) { if (id >= 0) {
msg = new OSCMessage("/masterseq/prevstep"); msg.AddString (
msg.AddString( string.Format ("{0}. {1}", id + 1,
string.Format("{0}. {1}", id+1, Conduite.Courante.SequenceurMaitre.Lignes [id].Nom)
Conduite.Courante.SequenceurMaitre.Lignes[id].Nom )
); );
buff = msg.Encode(); } else {
udpCli.Send (buff, buff.Length, ep); msg.AddString ("---");
}
id = Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre;
if (id == -1) id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours+1;
if (id >= 0 && id < Conduite.Courante.SequenceurMaitre.Lignes.Count) {
msg = new OSCMessage("/masterseq/nextstep");
msg.AddString(
string.Format("{0}. {1}", id+1,
Conduite.Courante.SequenceurMaitre.Lignes[id].Nom)
);
buff = msg.Encode();
udpCli.Send (buff, buff.Length, ep);
} }
buff = msg.Encode ();
udpCli.Send (buff, buff.Length, ep);
id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours; id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours;
string auto = string.Empty;
msg = new OSCMessage ("/masterseq/curstep");
if (id >= 0) { if (id >= 0) {
msg = new OSCMessage("/masterseq/curstep"); msg.AddString (
msg.AddString( string.Format ("{0}. {1}", id + 1,
string.Format("{0}. {1}", id+1, Conduite.Courante.SequenceurMaitre.Lignes [id].Nom)
Conduite.Courante.SequenceurMaitre.Lignes[id].Nom)
); );
buff = msg.Encode(); if(Conduite.Courante.SequenceurMaitre.Lignes[id].Duree!= TimeSpan.Zero)
udpCli.Send (buff, buff.Length, ep); auto = string.Format(" (AUTO {0})",Conduite.Courante.SequenceurMaitre.Lignes[id].Duree.TotalMilliseconds/100);
} else {
msg.AddString ("---");
} }
buff = msg.Encode();
udpCli.Send (buff, buff.Length, ep);
id = Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre;
if (id == -1)
id = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours + 1;
msg = new OSCMessage ("/masterseq/nextstep");
if (id >= 0 && id < Conduite.Courante.SequenceurMaitre.Lignes.Count) {
msg.AddString (
string.Format ("{0}. {1}{2}", id + 1,
Conduite.Courante.SequenceurMaitre.Lignes [id].Nom,auto)
);
} else {
msg.AddString ("---");
}
buff = msg.Encode ();
udpCli.Send (buff, buff.Length, ep);
msg = new OSCMessage("/masterseq/time"); msg = new OSCMessage("/masterseq/time");
msg.AddFloat(((float) Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds/1000 )); msg.AddFloat(((float) Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds/1000 ));
buff = msg.Encode(); buff = msg.Encode();

91
loupiottes.js
View file

@ -379,6 +379,97 @@ pages = [
"bounds": [0,0,.14,.1], "bounds": [0,0,.14,.1],
"value": "Pages :", "value": "Pages :",
}, },
{
"name":"master",
"address":"/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"isVertical" : true,
"x":.15, "y": 0,
"width":.08, "height":.9,
"startingValue":100,
"color":"#FF3300"
},
{
"name":"seqm1",
"address":"/seq/1/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"bounds":[.3,.05,.65,.1],
"startingValue":100,
"color":"#FFEE00"
},
{
"name":"seqm2",
"address":"/seq/2/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"bounds":[.3,.20,.65,.1],
"startingValue":100,
"color":"#FFEE00"
},
{
"name":"seqm3",
"address":"/seq/3/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"bounds":[.3,.35,.65,.1],
"startingValue":100,
"color":"#FFEE00"
},
{
"name":"seqm4",
"address":"/seq/4/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"bounds":[.3,.50,.65,.1],
"startingValue":100,
"color":"#FFEE00"
},
{
"name":"seqm5",
"address":"/seq/5/master",
"type":"Slider",
"min" : -10,
"max" : 110,
"bounds":[.3,.65,.65,.1],
"startingValue":100,
"color":"#FFEE00"
},
{"name": "lblm1", "type": "Label",
"bounds":[.3,.05,.65,.1],
"value": "Sequenceur 1",
},
{"name": "lblm1", "type": "Label",
"bounds":[.3,.20,.65,.1],
"value": "Sequenceur 2",
},
{"name": "lblm1", "type": "Label",
"bounds":[.3,.35,.65,.1],
"value": "Sequenceur 3",
},
{"name": "lblm1", "type": "Label",
"bounds":[.3,.50,.65,.1],
"value": "Sequenceur 4",
},
{"name": "lblm1", "type": "Label",
"bounds":[.3,.65,.65,.1],
"value": "Sequenceur 5",
},
] ]
]; ];