search

davidedc / livecodelab

a web based livecoding environment
http://livecodelab.net/
MIT License
327 stars 63 forks source link

Unified BPM #213

Closed noio closed 10 years ago

noio commented 10 years ago

This is a tentative pull request, I still have to do some more thorough testing, but 

scale
box
play 'tranceKick', 'x...'

Is pretty fun already.

davidedc commented 10 years ago

Hey Thomas do you mind re-basing to the latest master? It's not letting me merge it automatically, and I'm pretty sure you can shuffle your code around my changes better than the other way around...

noio commented 10 years ago

Hey! I did now, but you probably want to hold off on a merge because the sound system is kind of broken, especially when linked to an external clock. I'm going to try and figure out what it is. I also need to improve the way the "beat clock" is kept in relation to an external source, so that 1-bar rhythms (x... .... x... ....) will actually run synchronized.

davidedc commented 10 years ago

OK I'll hold off. No probs, when you think it's OK I'll merge. Ideally at that point it should be an automatic merge - in the meantime feel free to work on whichever branch you prefer.

noio commented 10 years ago

Okay, I think things are working now. I do not remember any bit of code in the last years giving me as big a headache as these 6 lines ...

davidedc commented 10 years ago

:+1: nice one!