From 55ccefad268c637346ecc50e8365e8b486b7b918 Mon Sep 17 00:00:00 2001 From: Jeffrey Lubow Date: Wed, 31 Aug 2016 09:56:39 +0200 Subject: [PATCH] adding changes from bergen dev --- max/_zpn_server.maxpat | 47 ++- max/audio_test.maxpat | 639 +++++++++++++++++++++++++++++++++++++++-- max/zpn_presets.json | 4 +- 3 files changed, 639 insertions(+), 51 deletions(-) diff --git a/max/_zpn_server.maxpat b/max/_zpn_server.maxpat index dc88b62..260d704 100644 --- a/max/_zpn_server.maxpat +++ b/max/_zpn_server.maxpat @@ -4,8 +4,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , @@ -128,19 +128,6 @@ "style" : "" } - } -, { - "box" : { - "id" : "obj-90", - "linecount" : 2, - "maxclass" : "comment", - "numinlets" : 1, - "numoutlets" : 0, - "patching_rect" : [ 8.0, 649.0, 71.0, 33.0 ], - "style" : "", - "text" : "1-5 tarek\n6-9 andrew" - } - } , { "box" : { @@ -340,7 +327,7 @@ "numoutlets" : 3, "outlettype" : [ "", "", "" ], "patching_rect" : [ 954.333374, 336.672974, 75.0, 22.0 ], - "restore" : [ 86 ], + "restore" : [ 0 ], "saved_object_attributes" : { "parameter_enable" : 0 } @@ -360,7 +347,7 @@ "numoutlets" : 3, "outlettype" : [ "", "", "" ], "patching_rect" : [ 911.666687, 310.338409, 97.0, 22.0 ], - "restore" : [ 87 ], + "restore" : [ 0 ], "saved_object_attributes" : { "parameter_enable" : 0 } @@ -413,7 +400,7 @@ "numoutlets" : 3, "outlettype" : [ "", "", "" ], "patching_rect" : [ 826.333313, 257.669189, 83.0, 22.0 ], - "restore" : [ 0 ], + "restore" : [ 91 ], "saved_object_attributes" : { "parameter_enable" : 0 } @@ -551,7 +538,7 @@ "outlettype" : [ "" ], "patching_rect" : [ 537.5, 592.0, 50.0, 22.0 ], "style" : "", - "text" : "3" + "text" : "4" } } @@ -567,8 +554,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , @@ -1279,8 +1266,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , @@ -1713,7 +1700,7 @@ , "style" : "", "text" : "pattrstorage", - "varname" : "u477000461" + "varname" : "u750000652" } } @@ -1797,8 +1784,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , @@ -2021,8 +2008,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , @@ -2293,8 +2280,8 @@ "appversion" : { "major" : 7, "minor" : 2, - "revision" : 2, - "architecture" : "x64", + "revision" : 4, + "architecture" : "x86", "modernui" : 1 } , diff --git a/max/audio_test.maxpat b/max/audio_test.maxpat index f9fc904..5098651 100644 --- a/max/audio_test.maxpat +++ b/max/audio_test.maxpat @@ -3,13 +3,13 @@ "fileversion" : 1, "appversion" : { "major" : 7, - "minor" : 1, - "revision" : 0, + "minor" : 2, + "revision" : 4, "architecture" : "x86", "modernui" : 1 } , - "rect" : [ 54.0, 86.0, 340.0, 362.0 ], + "rect" : [ 54.0, 86.0, 681.0, 352.0 ], "bglocked" : 0, "openinpresentation" : 0, "default_fontsize" : 12.0, @@ -37,6 +37,429 @@ "style" : "", "subpatcher_template" : "gridded", "boxes" : [ { + "box" : { + "id" : "obj-46", + "maxclass" : "message", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 506.5, 195.0, 109.0, 22.0 ], + "style" : "", + "text" : "export freqlist.json" + } + + } +, { + "box" : { + "id" : "obj-44", + "maxclass" : "comment", + "numinlets" : 1, + "numoutlets" : 0, + "patching_rect" : [ 513.0, 32.0, 99.0, 20.0 ], + "style" : "", + "text" : "catch a new freq" + } + + } +, { + "box" : { + "id" : "obj-42", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patcher" : { + "fileversion" : 1, + "appversion" : { + "major" : 7, + "minor" : 2, + "revision" : 4, + "architecture" : "x86", + "modernui" : 1 + } +, + "rect" : [ 496.0, 222.0, 504.0, 400.0 ], + "bglocked" : 0, + "openinpresentation" : 0, + "default_fontsize" : 12.0, + "default_fontface" : 0, + "default_fontname" : "Arial", + "gridonopen" : 1, + "gridsize" : [ 15.0, 15.0 ], + "gridsnaponopen" : 1, + "objectsnaponopen" : 1, + "statusbarvisible" : 2, + "toolbarvisible" : 1, + "lefttoolbarpinned" : 0, + "toptoolbarpinned" : 0, + "righttoolbarpinned" : 0, + "bottomtoolbarpinned" : 0, + "toolbars_unpinned_last_save" : 0, + "tallnewobj" : 0, + "boxanimatetime" : 200, + "enablehscroll" : 1, + "enablevscroll" : 1, + "devicewidth" : 0.0, + "description" : "", + "digest" : "", + "tags" : "", + "style" : "", + "subpatcher_template" : "gridded", + "boxes" : [ { + "box" : { + "id" : "obj-36", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "FullPacket" ], + "patching_rect" : [ 29.0, 129.0, 82.0, 22.0 ], + "style" : "", + "text" : "o.var" + } + + } +, { + "box" : { + "id" : "obj-21", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "", "" ], + "patching_rect" : [ 29.0, 252.0, 29.5, 22.0 ], + "style" : "", + "text" : "t l l" + } + + } +, { + "box" : { + "id" : "obj-22", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 29.0, 291.0, 39.0, 22.0 ], + "style" : "", + "text" : "o.dict" + } + + } +, { + "box" : { + "fontface" : 0, + "fontsize" : 12.0, + "id" : "obj-34", + "linecount" : 2, + "maxclass" : "o.expr.codebox", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "FullPacket", "FullPacket" ], + "patching_rect" : [ 29.0, 197.0, 446.0, 46.0 ], + "text" : "if(exists(/freqs), /freqs = [/freqs, /new], /freqs = /new),\ndelete(/new)", + "textcolor" : [ 0.0, 0.0, 0.0, 1.0 ] + } + + } +, { + "box" : { + "id" : "obj-20", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "FullPacket" ], + "patching_rect" : [ 92.0, 85.0, 75.0, 22.0 ], + "style" : "", + "text" : "o.pack /new" + } + + } +, { + "box" : { + "id" : "obj-19", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "FullPacket" ], + "patching_rect" : [ 29.0, 167.0, 50.0, 22.0 ], + "style" : "", + "text" : "o.union" + } + + } +, { + "box" : { + "comment" : "", + "id" : "obj-39", + "maxclass" : "inlet", + "numinlets" : 0, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 92.0, 24.0, 30.0, 30.0 ], + "style" : "" + } + + } +, { + "box" : { + "comment" : "", + "id" : "obj-40", + "maxclass" : "inlet", + "numinlets" : 0, + "numoutlets" : 1, + "outlettype" : [ "bang" ], + "patching_rect" : [ 29.0, 24.0, 30.0, 30.0 ], + "style" : "" + } + + } +, { + "box" : { + "comment" : "", + "id" : "obj-41", + "maxclass" : "outlet", + "numinlets" : 1, + "numoutlets" : 0, + "patching_rect" : [ 29.0, 335.5, 30.0, 30.0 ], + "style" : "" + } + + } + ], + "lines" : [ { + "patchline" : { + "destination" : [ "obj-34", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-19", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-36", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-20", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-19", 1 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 49.0, 284.0, 84.25, 284.0, 84.25, 156.0, 69.5, 156.0 ], + "source" : [ "obj-21", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-22", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-21", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-41", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-22", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-21", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-34", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-19", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-36", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-20", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-39", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-36", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-40", 0 ] + } + + } + ] + } +, + "patching_rect" : [ 480.0, 132.5, 123.0, 22.0 ], + "saved_object_attributes" : { + "description" : "", + "digest" : "", + "globalpatchername" : "", + "style" : "", + "tags" : "" + } +, + "style" : "", + "text" : "p collect_frequencies" + } + + } +, { + "box" : { + "id" : "obj-38", + "maxclass" : "button", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "bang" ], + "patching_rect" : [ 480.0, 30.0, 24.0, 24.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-33", + "maxclass" : "ezdac~", + "numinlets" : 2, + "numoutlets" : 0, + "patching_rect" : [ 45.0, 247.0, 45.0, 45.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-18", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 4, + "outlettype" : [ "dictionary", "", "", "" ], + "patching_rect" : [ 480.0, 270.0, 50.5, 22.0 ], + "saved_object_attributes" : { + "embed" : 0, + "parameter_enable" : 0 + } +, + "style" : "", + "text" : "dict" + } + + } +, { + "box" : { + "format" : 6, + "id" : "obj-17", + "maxclass" : "flonum", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "", "bang" ], + "parameter_enable" : 0, + "patching_rect" : [ 307.0, 30.0, 53.0, 22.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-15", + "maxclass" : "gain~", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "signal", "int" ], + "parameter_enable" : 0, + "patching_rect" : [ 435.0, 132.5, 26.0, 87.0 ], + "presentation_rect" : [ 517.0, 96.5, 0.0, 0.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-14", + "maxclass" : "gain~", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "signal", "int" ], + "parameter_enable" : 0, + "patching_rect" : [ 388.0, 132.5, 26.0, 87.0 ], + "presentation_rect" : [ 447.0, 132.5, 0.0, 0.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-13", + "maxclass" : "gain~", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "signal", "int" ], + "parameter_enable" : 0, + "patching_rect" : [ 347.5, 132.5, 26.0, 87.0 ], + "presentation_rect" : [ 414.0, 132.5, 0.0, 0.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-12", + "maxclass" : "gain~", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "signal", "int" ], + "parameter_enable" : 0, + "patching_rect" : [ 307.0, 132.5, 26.0, 87.0 ], + "style" : "" + } + + } +, { + "box" : { + "id" : "obj-7", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "signal" ], + "patching_rect" : [ 307.0, 75.0, 55.0, 22.0 ], + "style" : "", + "text" : "cycle~ 2" + } + + } +, { + "box" : { + "id" : "obj-3", + "maxclass" : "newobj", + "numinlets" : 9, + "numoutlets" : 0, + "patching_rect" : [ 307.0, 270.0, 127.0, 22.0 ], + "style" : "", + "text" : "dac~ 1 2 3 4 5 6 7 8 9" + } + + } +, { "box" : { "id" : "obj-11", "maxclass" : "newobj", @@ -74,19 +497,6 @@ "text" : "open" } - } -, { - "box" : { - "id" : "obj-5", - "maxclass" : "toggle", - "numinlets" : 1, - "numoutlets" : 1, - "outlettype" : [ "int" ], - "parameter_enable" : 0, - "patching_rect" : [ 57.0, 194.0, 24.0, 24.0 ], - "style" : "" - } - } , { "box" : { @@ -161,6 +571,132 @@ "source" : [ "obj-11", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-3", 2 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-12", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-12", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-12", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 5 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-13", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 4 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-13", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 3 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-13", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 8 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-14", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 7 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-14", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-3", 6 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-14", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-12", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-15", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-13", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-15", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-14", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-15", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-42", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-17", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-7", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-17", 0 ] + } + } , { "patchline" : { @@ -170,6 +706,15 @@ "source" : [ "obj-2", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-42", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-38", 0 ] + } + } , { "patchline" : { @@ -182,10 +727,19 @@ } , { "patchline" : { - "destination" : [ "obj-1", 0 ], + "destination" : [ "obj-18", 0 ], "disabled" : 0, "hidden" : 0, - "source" : [ "obj-5", 0 ] + "source" : [ "obj-42", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-18", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-46", 0 ] } } @@ -197,6 +751,33 @@ "source" : [ "obj-6", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-12", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-7", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-13", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-7", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-14", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-7", 0 ] + } + } , { "patchline" : { @@ -217,7 +798,27 @@ } ], - "dependency_cache" : [ ], + "dependency_cache" : [ { + "name" : "o.union.mxo", + "type" : "iLaX" + } +, { + "name" : "o.pack.mxo", + "type" : "iLaX" + } +, { + "name" : "o.expr.codebox.mxo", + "type" : "iLaX" + } +, { + "name" : "o.dict.mxo", + "type" : "iLaX" + } +, { + "name" : "o.var.mxo", + "type" : "iLaX" + } + ], "autosave" : 0, "bgfillcolor_type" : "gradient", "bgfillcolor_color1" : [ 0.376471, 0.384314, 0.4, 1.0 ], diff --git a/max/zpn_presets.json b/max/zpn_presets.json index 51e5ce4..d18ee28 100644 --- a/max/zpn_presets.json +++ b/max/zpn_presets.json @@ -1,6 +1,6 @@ { "pattrstorage" : { - "name" : "u354000443", + "name" : "u652000534", "slots" : { "1" : { "id" : 1, @@ -105,7 +105,7 @@ "all_migrate" : [ 0 ], "all_slip" : [ 0 ], "client1::tog_migrate" : [ 0 ], - "client1::tog_openclose" : [ 0 ], + "client1::tog_openclose" : [ 1 ], "client1::tog_poke" : [ 0 ], "client1::tog_slip" : [ 0 ], "client1::tog_summon" : [ 0 ], -- 2.34.1