summaryrefslogtreecommitdiff
path: root/rpc
diff options
context:
space:
mode:
authorjules@lens <julescarbon@gmail.com>2018-09-05 12:00:28 +0200
committerjules@lens <julescarbon@gmail.com>2018-09-05 12:00:28 +0200
commit9abfa16dc059d042c21f1636ecc8797ef29a030d (patch)
treed0583cb5dae01de1abc57ed8f7587d23242ed6f0 /rpc
parent0a3c6743543dd3dfcb876f5ce735b72d050e981d (diff)
parent15eb6806b6e216255f33abcb885f6cdbc38a7663 (diff)
Merge branch 'master' of asdf.us:live-cortex
Diffstat (limited to 'rpc')
-rw-r--r--rpc/img_ops.py4
-rw-r--r--rpc/listener.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/rpc/img_ops.py b/rpc/img_ops.py
index e748af4..cb453c4 100644
--- a/rpc/img_ops.py
+++ b/rpc/img_ops.py
@@ -12,6 +12,10 @@ def clamp(n,a,b):
def lerp(n,a,b):
return (b-a)*n+a
+def read_sequence(path, module_name=''):
+ print("> read sequence {}".format(path))
+ return sorted([f for f in glob.glob(os.path.join('./sequences/', module_name, path, '*.png'))])
+
def process_image(opt, data_opt, im):
img = im[:, :, ::-1].copy()
processed = False
diff --git a/rpc/listener.py b/rpc/listener.py
index 1df575e..4b91230 100644
--- a/rpc/listener.py
+++ b/rpc/listener.py
@@ -115,7 +115,3 @@ class Listener():
self.run_live(self.opt, self.data_opt, rpc_client)
def connect(self):
self.rpc_client = CortexRPC(self._get_fn, self._set_fn, self._ready_fn, self._cmd_fn)
-
-def read_sequence(path, module_name=''):
- print("> read sequence {}".format(path))
- return sorted([f for f in glob.glob(os.path.join('./sequences/', module_name, path, '*.png'))])