Merge branch 'radio' of github.com:urbit/urbit-new into radio

it-new into radio
This commit is contained in:
Galen Wolfe-Pauly 2014-12-17 15:48:34 -08:00
commit 865f760fd5
2 changed files with 26 additions and 15 deletions

View File

@ -429,6 +429,7 @@
|- ^- atlas
?~ locals ~
[[p.n.locals q.q.n.locals] $(locals l.locals) $(locals r.locals)]
~& [%pa-display man reg]
|- ^+ +>.^$
?~ vew +>.^$
=. +>.^$ $(vew l.vew)
@ -465,11 +466,10 @@
^+ +>
?+ sih ~&([%radio-bad-friend sih] !!)
[%g %nice ~]
~& %pa-friend-nice
~& %pa-stalk-nice
+>.$
::
[%g %rust %radio-report *]
~& [%pa-friend-report +>+.sih]
?+ -.+>+.sih ~&([%radio-odd-friend sih] !!)
%group
(pa-remind tay +.+>+.sih)
@ -557,7 +557,7 @@
^+ +>
=+ guz=(~(get by locals) her)
=. locals (~(put by locals) her lat.hid saz)
?. |(?=(~ guz) !=(per q.u.guz))
?. |(?=(~ guz) !=(saz q.u.guz))
+>.$
(pa-display viewers)
::
@ -581,9 +581,11 @@
%hear (~(put by loc) p.i.dur q.i.dur)
==
=+ gub=(~(get by remotes) tay)
?. |(?=(~ gub) =(buk u.gub))
~& [%pa-remind tay gub buk]
?. |(?=(~ gub) !=(buk u.gub))
+>.$
(pa-display(remotes (~(put by remotes) tay buk)) viewers)
=. remotes (~(put by remotes) tay buk)
(pa-display viewers)
::
++ pa-start :: start stream
|= riv=river

View File

@ -171,6 +171,10 @@
?~ shape.u.pur ~
sources.u.shape.u.pur
::
++ presentation
^- (map station presence)
(~(run by destination) |=(a=* mode))
::
++ pour-shell
|= [ost=bone txt=cord]
^- [(list move) _+>]
@ -376,6 +380,13 @@
'& '
(cat 3 u.live '& ')
::
++ present
^- (list move)
=+ taz=presentation
?~ taz
~
[(send-rodeo 0 %ping taz) ~]
::
++ peer
|= [ost=bone you=ship pax=path]
^- [(list move) _+>]
@ -404,23 +415,21 @@
%time
:_ +>.$
:* [0 %pass /time %t %wait (add ~s10 lat.hid)]
?~ targets
~
:_ ~
%+ send-rodeo 0
:- %ping
%- ~(gas by *(map station presence))
%+ turn (~(tap in u.targets) ~)
|=(a=station [a mode])
present
==
::
%cmd-ac
?+ +<.sih !!
%nice [~ +>.$]
%mean [(send /out %give +.sih) +>.$]
%mean ~&(%cmd-ac-mean [~ +>.$])
?(%rush %rust)
?> ?=(%type -.p.sih)
[~ +>.$(mode ?:(p.p.sih %talk %hear))]
=+ dom=`presence`?:(p.p.sih %talk %hear)
?: =(dom mode)
[~ +>.$]
~& [%cmd-ac-mode dom]
=. mode dom
[present +>.$]
==
::
%command