Skip to content

Commit

Permalink
Merge branch 'feature/ui_select_model'
Browse files Browse the repository at this point in the history
  • Loading branch information
@reno-
reno- committed Dec 8, 2015
2 parents 60faa76 + ceb9789 commit 89ab1ca
Show file tree
Hide file tree
Showing 2 changed files with 266 additions and 88 deletions.
41 changes: 20 additions & 21 deletions Jamoma/patchers/models/video/sources/movie%/movie%.model.maxpat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 592.0, 155.0, 25.0, 25.0 ],
"presentation_rect" : [ 582.5, 147.0, 0.0, 0.0 ],
"style" : ""
}

Expand Down Expand Up @@ -124,7 +123,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 357.237488, 312.072388, 140.0, 22.0 ],
"patching_rect" : [ 366.237488, 312.072388, 140.0, 22.0 ],
"style" : "",
"text" : "j.send loop/points:range",
"varname" : "loop[2]"
Expand All @@ -140,9 +139,9 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 11.0, 145.036224, 69.0, 22.0 ],
"patching_rect" : [ 10.0, 145.036224, 88.0, 22.0 ],
"style" : "",
"text" : "j.send play",
"text" : "j.send file/play",
"varname" : "loop[1]"
}

Expand All @@ -156,7 +155,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 618.599976, 84.0, 66.0, 22.0 ],
"patching_rect" : [ 627.599976, 84.0, 66.0, 22.0 ],
"style" : "",
"text" : "j.send dim"
}
Expand All @@ -171,7 +170,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 239.237488, 274.563354, 66.0, 22.0 ],
"patching_rect" : [ 248.237488, 274.563354, 66.0, 22.0 ],
"style" : "",
"text" : "prepend 0"
}
Expand All @@ -186,7 +185,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 239.237488, 312.072388, 105.0, 22.0 ],
"patching_rect" : [ 248.237488, 312.072388, 105.0, 22.0 ],
"style" : "",
"text" : "j.send loop/points",
"varname" : "loop[3]"
Expand All @@ -202,7 +201,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 560.200012, 118.509064, 359.0, 22.0 ],
"patching_rect" : [ 569.200012, 118.509064, 359.0, 22.0 ],
"style" : "",
"text" : "j.return moviedim @type array \"@native size of the current video\""
}
Expand All @@ -217,7 +216,7 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "bang", "" ],
"patching_rect" : [ 93.0, 145.036224, 38.0, 22.0 ],
"patching_rect" : [ 102.0, 145.036224, 38.0, 22.0 ],
"style" : "",
"text" : "sel 1"
}
Expand All @@ -232,7 +231,7 @@
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 93.0, 84.0, 59.0, 22.0 ],
"patching_rect" : [ 102.0, 84.0, 59.0, 22.0 ],
"style" : "",
"text" : "zl slice 1"
}
Expand All @@ -247,7 +246,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 501.799988, 154.527161, 464.0, 22.0 ],
"patching_rect" : [ 510.799988, 154.527161, 464.0, 22.0 ],
"style" : "",
"text" : "j.return loop/notify @type none @description \"notify that you reach the end of the file\""
}
Expand All @@ -262,7 +261,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 443.400024, 178.036224, 96.0, 22.0 ],
"patching_rect" : [ 452.400024, 178.036224, 96.0, 22.0 ],
"style" : "",
"text" : "j.send getlength",
"varname" : "dim[6]"
Expand All @@ -278,7 +277,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 294.600006, 219.545288, 168.0, 22.0 ],
"patching_rect" : [ 303.600006, 219.545288, 168.0, 22.0 ],
"style" : "",
"text" : "j.return length @type decimal",
"varname" : "dim[5]"
Expand All @@ -294,7 +293,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "float" ],
"patching_rect" : [ 294.600006, 191.0, 51.0, 22.0 ],
"patching_rect" : [ 303.600006, 191.0, 51.0, 22.0 ],
"style" : "",
"text" : "/ 1."
}
Expand All @@ -309,7 +308,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 268.200012, 249.054321, 475.0, 22.0 ],
"patching_rect" : [ 277.200012, 249.054321, 475.0, 22.0 ],
"style" : "",
"text" : "j.return duration @type integer @description \"the current video file duration (in frames)\""
}
Expand All @@ -324,7 +323,7 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"patching_rect" : [ 209.799988, 346.072388, 373.0, 22.0 ],
"patching_rect" : [ 218.799988, 346.072388, 373.0, 22.0 ],
"style" : "",
"text" : "j.return time @type integer @description \"the current video file time\""
}
Expand All @@ -340,7 +339,7 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 93.0, 186.0, 94.0, 76.0 ],
"patching_rect" : [ 102.0, 186.0, 94.0, 76.0 ],
"style" : "",
"text" : "getduration, getmoviedim, getmoviename, gettimescale, gettime, getdim"
}
Expand All @@ -355,7 +354,7 @@
"numinlets" : 11,
"numoutlets" : 11,
"outlettype" : [ "", "", "", "", "", "", "", "", "", "", "" ],
"patching_rect" : [ 93.0, 55.0, 603.0, 22.0 ],
"patching_rect" : [ 102.0, 55.0, 603.0, 22.0 ],
"style" : "",
"text" : "route read framedump time duration timescale moviename read loopnotify moviedim dim"
}
Expand All @@ -369,7 +368,7 @@
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 93.0, 8.0, 30.0, 30.0 ],
"patching_rect" : [ 102.0, 8.0, 30.0, 30.0 ],
"style" : ""
}

Expand All @@ -381,7 +380,7 @@
"maxclass" : "outlet",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 93.0, 338.072388, 30.0, 30.0 ],
"patching_rect" : [ 102.0, 338.072388, 30.0, 30.0 ],
"style" : ""
}

Expand All @@ -392,7 +391,7 @@
"destination" : [ "obj-2", 0 ],
"disabled" : 0,
"hidden" : 0,
"midpoints" : [ 248.737488, 305.0, 366.737488, 305.0 ],
"midpoints" : [ 257.737488, 305.0, 375.737488, 305.0 ],
"source" : [ "obj-17", 0 ]
}

Expand Down
Loading

0 comments on commit 89ab1ca

Please sign in to comment.