Skip to content

Commit

Permalink
Merge pull request #1 from malloch/master
Browse files Browse the repository at this point in the history
Merge from malloch/mapper-max-pd
  • Loading branch information
johnty authored Mar 5, 2019
2 parents 6062d21 + bb1cac5 commit 0ec47d1
Show file tree
Hide file tree
Showing 15 changed files with 244 additions and 306 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ mapout/build
mapin/build
*.mxo
*.pd_darwin
mapper-osx-max-pd*
oscmulticast
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# libmapper bindings for MaxMSP and Pure Data

Max and Pure Data (Pd) objects instantiating libmapper devices. Help patches are included for documentation.
Max and Pure Data (Pd) objects instantiating [libmapper][1] devices. Help patches are included for documentation.

The `mapper` object can be used with both Max and Pd - it encapsulates the functionality of a libmapper device and works as a central hub in your patch by sending and receiving labeled messages from the libmapper network.

Expand Down
11 changes: 1 addition & 10 deletions help/logolink.maxpat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"appversion" : {
"major" : 7,
"minor" : 3,
"revision" : 3,
"revision" : 5,
"architecture" : "x86",
"modernui" : 1
}
Expand Down Expand Up @@ -105,19 +105,10 @@
"lines" : [ {
"patchline" : {
"destination" : [ "obj-30", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-1", 0 ]
}

}
],
"dependency_cache" : [ {
"name" : "libmapper_logo_black_512px.png",
"bootpath" : "~/Desktop/libmapper-logo",
"type" : "PNG ",
"implicit" : 1
}
],
"autosave" : 0
}
Expand Down
33 changes: 7 additions & 26 deletions help/map.device.maxhelp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"appversion" : {
"major" : 7,
"minor" : 3,
"revision" : 3,
"revision" : 5,
"architecture" : "x86",
"modernui" : 1
}
Expand Down Expand Up @@ -49,7 +49,7 @@
"appversion" : {
"major" : 7,
"minor" : 3,
"revision" : 3,
"revision" : 5,
"architecture" : "x86",
"modernui" : 1
}
Expand Down Expand Up @@ -265,7 +265,7 @@
, {
"box" : {
"automouse" : 0,
"cols" : 2,
"cols" : 1,
"colwidth" : 90,
"fontface" : 0,
"fontname" : "Arial",
Expand All @@ -278,7 +278,7 @@
"numoutlets" : 4,
"outlettype" : [ "list", "", "", "" ],
"patching_rect" : [ 30.0, 210.0, 180.0, 183.0 ],
"rows" : 7,
"rows" : 1,
"selmode" : 0,
"selsync" : 0,
"vscroll" : 0,
Expand Down Expand Up @@ -342,9 +342,9 @@
"fontsize" : 12.0,
"id" : "obj-6",
"maxclass" : "newobj",
"numinlets" : 1,
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "list" ],
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 90.0, 133.0, 22.0 ],
"style" : "",
"text" : "map.device my_device"
Expand Down Expand Up @@ -453,7 +453,6 @@
"lines" : [ {
"patchline" : {
"destination" : [ "obj-9", 0 ],
"disabled" : 0,
"hidden" : 1,
"source" : [ "obj-10", 0 ]
}
Expand All @@ -462,7 +461,6 @@
, {
"patchline" : {
"destination" : [ "obj-9", 0 ],
"disabled" : 0,
"hidden" : 1,
"source" : [ "obj-15", 0 ]
}
Expand All @@ -471,34 +469,27 @@
, {
"patchline" : {
"destination" : [ "obj-20", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-21", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-23", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-24", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-21", 0 ],
"disabled" : 0,
"hidden" : 0,
"source" : [ "obj-6", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-14", 0 ],
"disabled" : 0,
"hidden" : 1,
"source" : [ "obj-9", 0 ]
}
Expand All @@ -507,20 +498,10 @@
],
"dependency_cache" : [ {
"name" : "logolink.maxpat",
"bootpath" : "~/Documents/Mappers/mapper-max-pd/help",
"patcherrelativepath" : ".",
"type" : "JSON",
"implicit" : 1
}
, {
"name" : "libmapper_logo_black_512px.png",
"bootpath" : "~/Desktop/libmapper-logo",
"type" : "PNG ",
"implicit" : 1
}
, {
"name" : "map.device.mxo",
"type" : "iLaX"
}
],
"autosave" : 0
}
Expand Down
Loading

0 comments on commit 0ec47d1

Please sign in to comment.