Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	examples/touchdesigner.toe
#	max/abstractions/live_clip.maxpat
#	max/abstractions/live_clip_slot.maxpat
#	max/abstractions/live_device.maxpat
#	max/abstractions/live_mixer_device.maxpat
#	max/abstractions/live_song.maxpat
#	max/abstractions/live_track.maxpat
#	max/respectrable.amxd
#	max/scripts/get_state.js
#	max/scripts/init.js
#	max/scripts/init_clip.js
#	max/scripts/init_clip_slot.js
#	max/scripts/init_clip_slots.js
#	max/scripts/init_device.js
#	max/scripts/init_device_parameter.js
#	max/scripts/init_devices.js
#	max/scripts/init_mixer_device.js
#	max/scripts/init_networking.js
#	max/scripts/init_song.js
#	max/scripts/init_song_view.js
#	max/scripts/init_track.js
#	max/scripts/init_tracks.js
#	max/scripts/output_parameter_id.js
#	max/scripts/process_message.js
#	settings.json
#	test/demo.als
  • Loading branch information
Willy Nolan committed Aug 20, 2021
2 parents 6f41d9a + db4509e commit 0a7f22c
Show file tree
Hide file tree
Showing 2 changed files with 234 additions and 29 deletions.
234 changes: 234 additions & 0 deletions max/abstractions/networking.maxpat
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
{
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 7,
"minor" : 3,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"rect" : [ 504.0, 524.0, 1238.0, 684.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" : "",
"boxes" : [ {
"box" : {
"id" : "obj-90",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "bang" ],
"patching_rect" : [ 32.0, 60.0, 69.0, 22.0 ],
"style" : "",
"text" : "delay 4000"
}

}
, {
"box" : {
"id" : "obj-3",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 32.0, 97.0, 103.0, 22.0 ],
"saved_object_attributes" : {
"filename" : "init_networking",
"parameter_enable" : 0
}
,
"style" : "",
"text" : "js init_networking"
}

}
, {
"box" : {
"comment" : "",
"id" : "obj-1",
"index" : 1,
"maxclass" : "inlet",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 32.0, 11.0, 30.0, 30.0 ],
"style" : ""
}

}
, {
"box" : {
"id" : "obj-36",
"maxclass" : "newobj",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 473.0, 60.0, 136.0, 22.0 ],
"style" : "",
"text" : "r spectra_out_message",
"varname" : "local_js_receiver"
}

}
, {
"box" : {
"id" : "obj-2",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 200.0, 31.0, 107.0, 20.0 ],
"style" : "",
"text" : "Incoming GUI"
}

}
, {
"box" : {
"comment" : "",
"id" : "obj-8",
"index" : 2,
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 329.0, 263.5, 21.5, 21.5 ],
"style" : "",
"varname" : "incoming_message_inlet"
}

}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 473.0, 178.0, 127.0, 22.0 ],
"style" : "",
"text" : "r spectra_out_channel",
"varname" : "local_gui_receiver"
}

}
, {
"box" : {
"id" : "obj-18",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 322.0, 31.0, 114.0, 20.0 ],
"style" : "",
"text" : "Incoming JS"
}

}
, {
"box" : {
"comment" : "",
"id" : "obj-10",
"index" : 1,
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 200.0, 263.5, 21.5, 21.5 ],
"style" : "",
"varname" : "incoming_channel_inlet"
}

}
, {
"box" : {
"id" : "obj-26",
"maxclass" : "newobj",
"numinlets" : 0,
"numoutlets" : 0,
"patching_rect" : [ 1519.0, 318.0, 134.0, 22.0 ],
"style" : "",
"text" : "udpsend Starcom 7040"
}

}
, {
"box" : {
"id" : "obj-58",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 330.0, 60.0, 100.0, 22.0 ],
"style" : "",
"text" : "udpreceive 9091"
}

}
, {
"box" : {
"id" : "obj-59",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 200.0, 60.0, 100.0, 22.0 ],
"style" : "",
"text" : "udpreceive 9090"
}

}
],
"lines" : [ {
"patchline" : {
"destination" : [ "obj-90", 0 ],
"source" : [ "obj-1", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-8", 0 ],
"source" : [ "obj-58", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-10", 0 ],
"source" : [ "obj-59", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-3", 0 ],
"source" : [ "obj-90", 0 ]
}

}
]
}

}
29 changes: 0 additions & 29 deletions max/scripts/init_clip.js

This file was deleted.

0 comments on commit 0a7f22c

Please sign in to comment.