light9 Changeset - e993c5e1df1a

Changeset - e993c5e1df1a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 8 years ago 2017-05-24 08:27:47
drewp@bigasterisk.com

fix effecteval to drop notes into new-style timeline
Ignore-this: 57cae41f60447d55bffc8d59b84bb230

2 files changed with 51 insertions and 4 deletions:

bin/effecteval

light9/effect/edit.py

0 comments (0 inline, 0 general)

bin/effecteval

➞

Show inline comments

@@ @@ -2,25 +2,25 @@ @@
 from __future__ import division
 from run_local import log
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue
 import cyclone.web, cyclone.websocket, cyclone.httpclient
 import sys, optparse, logging, subprocess, json, itertools
 from rdflib import URIRef, Literal
 sys.path.append('/usr/lib/pymodules/python2.7/') # for numpy, on rpi
 sys.path.append('/usr/lib/python2.7/dist-packages') # For numpy
 from light9 import networking, showconfig
 from light9.effecteval.effect import EffectNode
-from light9.effect.edit import getMusicStatus, songEffectPatch
+from light9.effect.edit import getMusicStatus, songNotePatch
 from light9.effecteval.effectloop import makeEffectLoop
 from light9.greplin_cyclone import StatsForCyclone
 from light9.namespaces import L9
 from light9.rdfdb.patch import Patch
 from light9.rdfdb.syncedgraph import SyncedGraph
 from greplin import scales
 from lib.cycloneerr import PrettyErrorHandler
 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):
     def get(self):
         self.set_header('Content-Type', 'text/html')
@@ @@ -57,25 +57,25 @@ class SongEffects(PrettyErrorHandler, cy @@
         self.wideOpenCors()
         dropped = URIRef(self.get_argument('drop'))
         try:
             song = URIRef(self.get_argument('uri'))
         except Exception: # which?
             song = yield currentSong()
         event = self.get_argument('event', default='default')
         log.info("adding to %s", song)
-        p = yield songEffectPatch(self.settings.graph, dropped, song, event, ctx=song)
+        p = yield songNotePatch(self.settings.graph, dropped, song, event, ctx=song)
         self.settings.graph.patch(p)
         self.settings.graph.suggestPrefixes({'song': URIRef(song + '/')})
 class SongEffectsUpdates(cyclone.websocket.WebSocketHandler):
     def connectionMade(self, *args, **kwargs):
         self.graph = self.settings.graph
         self.graph.addHandler(self.updateClient)
     def updateClient(self):
         # todo: abort if client is gone
         playlist = self.graph.value(showconfig.showUri(), L9['playList'])
         songs = list(self.graph.items(playlist))

light9/effect/edit.py

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ from light9.curvecalc.curve import Curve @@
 def clamp(x, lo, hi):
     return max(lo, min(hi, x))
 @inlineCallbacks
 def getMusicStatus():
     returnValue(json.loads((yield cyclone.httpclient.fetch(
         networking.musicPlayer.path('time'), timeout=.5)).body))
 @inlineCallbacks
 def songEffectPatch(graph, dropped, song, event, ctx):
     """
     some uri was 'dropped' in the timeline. event is 'default' or 'start' or 'end'.
+    some uri was 'dropped' in the curvecalc timeline. event is 'default' or 'start' or 'end'.
     """
     with graph.currentState(
             tripleFilter=(dropped, None, None)) as g:
         droppedTypes = list(g.objects(dropped, RDF.type))
         droppedLabel = g.label(dropped)
         droppedCodes = list(g.objects(dropped, L9['code']))
     quads = []
     fade = 2 if event == 'default' else 0
     if _songHasEffect(graph, song, dropped):
         # bump the existing curve
@@ @@ -57,26 +57,73 @@ def songEffectPatch(graph, dropped, song @@
                 ])
         else:
             raise NotImplementedError(
                 "don't know how to add an effect from %r (types=%r)" %
                 (dropped, droppedTypes))
         _maybeAddMusicLine(quads, effect, song, ctx)
     print "adding"
     for qq in quads:
         print qq
     returnValue(Patch(addQuads=quads))
 @inlineCallbacks
 def songNotePatch(graph, dropped, song, event, ctx):
     """
     drop into effectsequencer timeline
     ported from timeline.coffee makeNewNote
     """
     with graph.currentState(
             tripleFilter=(dropped, None, None)) as g:
         droppedTypes = list(g.objects(dropped, RDF.type))
         droppedLabel = g.label(dropped)
     quads = []
     fade = 2 if event == 'default' else 0
     print 'droppedTypes', droppedTypes
     if L9['Effect'] in droppedTypes:
         musicStatus = yield getMusicStatus()
         songTime = musicStatus['t']
         note = graph.sequentialUri(song + '/n')
         curve = graph.sequentialUri(note + 'c')
         quads.extend([
             (song, L9['note'], note, ctx),
             (note, RDF.type, L9['Note'], ctx),
             (note, L9['curve'], curve, ctx),
             (note, L9['effectClass'], dropped, ctx),
             (note, L9['originTime'], Literal(songTime), ctx),
             (curve, RDF.type, L9['Curve'], ctx),
             (curve, L9['attr'], L9['strength'], ctx),
             ])
         if event == 'default':
             coords = [(0 - fade, 0), (0, 1), (20, 1), (20 + fade, 0)]
         elif event == 'start':
             coords = [(0 - fade, 0), (0, 1), (20, 1), (20 + fade, 0)]
         elif event == 'end':
             raise
         else:
             raise NotImplementedError(event)
         for t,v in coords:
             pt = graph.sequentialUri(curve + 'p')
             quads.extend([
                 (curve, L9['point'], pt, ctx),
                 (pt, L9['time'], Literal(t), ctx),
                 (pt, L9['value'], Literal(v), ctx),
                 ])
     returnValue(Patch(addQuads=quads))
 def _songHasEffect(graph, song, uri):
     """does this song have an effect of class uri or a sub curve for sub
     uri? this should be simpler to look up."""
     return False # todo
 def musicCurveForSong(uri):
     return URIRef(uri + 'music')
 def _newEffect(graph, song, ctx):
     effect = graph.sequentialUri(song + "/effect-")
     quads = [

0 comments (0 inline, 0 general)