Skip to content

Commit

Permalink
Merge branch 'release/0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pascal Baltazar committed Nov 21, 2014
2 parents cd98e32 + bd86e61 commit 2e56c50
Show file tree
Hide file tree
Showing 23 changed files with 928 additions and 282 deletions.
19 changes: 19 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
before_install:
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository --yes ppa:beineri/opt-qt532

- sudo apt-get update -qq
- sudo apt-get install -qq qt53-meta-full libportmidi-dev libgecode-dev libxml2-dev libsndfile-dev portaudio19-dev libportmidi-dev

- wget https://www.dropbox.com/s/e0o670ve6gv1dgt/cmake-3.0.2-Linux-x86_64.tar.gz?dl=1 -O cmake-3.0.2-Linux-x86_64.tar.gz
- tar zxf cmake-3.0.2-Linux-x86_64.tar.gz

- wget https://www.dropbox.com/s/exjazsh5epqet2g/gcc_4.9.1-1_amd64.deb?dl=1 -O gcc_4.9.1-1_amd64.deb
- sudo dpkg -i gcc_4.9.1-1_amd64.deb

script:
- export CMAKE_PATH="$(pwd)/cmake-3.0.2-Linux-x86_64/bin"
- source /opt/qt53/bin/qt53-env.sh
- git clone https://github.com/OSSIA/OSSIA
- cd OSSIA
- PATH=$CMAKE_PATH:$PATH ./Build.sh jamoma iscore --clone
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@ add_definitions(-DTT_NO_DSP)

#TODO find_package
if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-unused-parameter -Wno-deprecated-register -Wno-unknown-pragmas -Wno-conversion")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-unused-parameter -Wno-deprecated-register -Wno-deprecated-declarations -Wno-unknown-pragmas -Wno-conversion")
include_directories("/usr/local/lib/jamoma/include")
include_directories("/usr/local/jamoma/include")
include_directories("/usr/include/libxml2")
include_directories("/usr/local/include/jamoma")
include_directories("/usr/include/jamoma")

if(APPLE)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-rpath,/usr/local/lib/jamoma/lib -Wl,-rpath,/usr/local/jamoma/lib -Wl,-rpath,/usr/local/jamoma/extensions")
endif()

# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
Expand Down Expand Up @@ -164,7 +165,7 @@ if(UNIX)
if(APPLE)
set(JAMOMA_LIB_FOLDER "/usr/local/jamoma/lib")
else()
set(JAMOMA_LIB_FOLDER "/usr/local/lib/jamoma/lib")
set(JAMOMA_LIB_FOLDER "/usr/lib")
endif()
elseif(WIN32)
set(JAMOMA_LIB_FOLDER_WIN32 "c:\\Program Files (x86)\\JamomaCore 0.6-dev\\lib")
Expand Down
92 changes: 92 additions & 0 deletions Examples/PD_OSCDevice_example/01-basic_example.pd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
#N canvas 577 126 450 300 10;
#X declare -stdpath osc -stdpath iemnet -lib iemnet -path abs;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#N canvas 542 145 418 579 OSC 0;
#X obj 41 427 s from_i-score;
#X obj 252 52 r to_i-score;
#X obj 195 192 loadbang;
#X obj 133 166 spigot;
#X obj 152 291 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
1;
#X msg 195 212 connect 127.0.0.1 9996;
#X obj 252 156 spigot;
#X obj 285 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X obj 252 176 print to_i-score;
#X obj 106 450 spigot;
#X obj 139 431 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X obj 106 490 print from_i-score;
#X obj 133 260 t f f f;
#X obj 133 121 list prepend send;
#X obj 133 143 list trim;
#X obj 133 315 sel 1;
#X msg 41 346 get;
#X obj 133 100 packOSC;
#X obj 106 402 unpackOSC;
#X obj 65 28 inlet;
#X obj 65 49 t b b b;
#X msg 103 70 [;
#X msg 53 70 ];
#X text 69 347 bang all parameters to expose them to i-score;
#X obj 208 287 sel 0;
#X obj 208 309 del 1000;
#X msg 105 196 disconnect;
#X obj 133 240 udpsend;
#X obj 106 382 udpreceive 9997;
#X text 53 526 with Pd >= 0-46 \, you can use [netreceive -b -u 9997]
and;
#X text 50 542 [netsend -b -u] instead of [udpreceive 9997] / [udpsend]
;
#X connect 1 0 6 0;
#X connect 1 0 17 0;
#X connect 2 0 5 0;
#X connect 3 0 27 0;
#X connect 5 0 27 0;
#X connect 6 0 8 0;
#X connect 7 0 6 1;
#X connect 9 0 11 0;
#X connect 10 0 9 1;
#X connect 12 0 15 0;
#X connect 12 1 4 0;
#X connect 12 1 24 0;
#X connect 12 2 3 1;
#X connect 13 0 14 0;
#X connect 14 0 3 0;
#X connect 16 0 0 0;
#X connect 17 0 13 0;
#X connect 18 0 9 0;
#X connect 18 0 0 0;
#X connect 19 0 20 0;
#X connect 20 0 22 0;
#X connect 20 1 16 0;
#X connect 20 2 21 0;
#X connect 24 0 25 0;
#X connect 25 0 5 0;
#X connect 26 0 27 0;
#X connect 27 0 12 0;
#X connect 28 0 18 0;
#X restore 38 58 pd OSC;
#X floatatom 128 147 5 0 0 0 x - -;
#X text 34 8 You need mrpeach/osc and iemnet or mrpeach/net objects
to use this patch.;
#X obj 37 36 declare -stdpath osc -stdpath iemnet -lib iemnet -path
abs;
#X floatatom 128 167 5 0 0 0 y - -;
#X obj 164 196 oscparam /name;
#X symbolatom 95 197 10 0 0 0 - - -;
#X obj 164 216 symbol;
#X text 62 91 Open the 01-simple_example.score with i-score.;
#X text 62 111 Then press play in i-score \, you should see some changes
here!;
#X obj 164 166 oscparam /position/y;
#X obj 164 146 oscparam /position/x;
#X connect 1 0 11 0;
#X connect 4 0 10 0;
#X connect 5 0 7 0;
#X connect 6 0 5 0;
#X connect 7 0 6 0;
#X connect 10 0 4 0;
#X connect 11 0 1 0;
Binary file added Examples/PD_OSCDevice_example/01-simple_example.score
View file
Binary file not shown.
233 changes: 233 additions & 0 deletions Examples/PD_OSCDevice_example/02-advancede_example.pd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
#N canvas 39 719 450 300 10;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -path ../osc;
#X declare -stdpath osc -stdpath iemnet -lib iemnet -path abs;
#X declare -path ../osc;
#N canvas 544 500 418 579 OSC 0;
#X obj 41 427 s from_i-score;
#X obj 252 52 r to_i-score;
#X obj 195 192 loadbang;
#X obj 133 166 spigot;
#X obj 152 291 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
1;
#X msg 195 212 connect 127.0.0.1 9996;
#X obj 252 156 spigot;
#X obj 285 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X obj 252 176 print to_i-score;
#X obj 106 450 spigot;
#X obj 139 431 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X obj 106 490 print from_i-score;
#X obj 133 260 t f f f;
#X obj 133 121 list prepend send;
#X obj 133 143 list trim;
#X obj 133 315 sel 1;
#X msg 41 346 get;
#X obj 133 100 packOSC;
#X obj 106 402 unpackOSC;
#X obj 65 28 inlet;
#X obj 65 49 t b b b;
#X msg 103 70 [;
#X msg 53 70 ];
#X text 69 347 bang all parameters to expose them to i-score;
#X obj 208 287 sel 0;
#X obj 208 309 del 1000;
#X msg 105 196 disconnect;
#X obj 133 240 udpsend;
#X obj 106 382 udpreceive 9997;
#X text 53 526 with Pd >= 0-46 \, you can use [netreceive -b -u 9997]
and;
#X text 50 542 [netsend -b -u] instead of [udpreceive 9997] / [udpsend]
;
#X connect 1 0 6 0;
#X connect 1 0 17 0;
#X connect 2 0 5 0;
#X connect 3 0 27 0;
#X connect 5 0 27 0;
#X connect 6 0 8 0;
#X connect 7 0 6 1;
#X connect 9 0 11 0;
#X connect 10 0 9 1;
#X connect 12 0 15 0;
#X connect 12 1 4 0;
#X connect 12 1 24 0;
#X connect 12 2 3 1;
#X connect 13 0 14 0;
#X connect 14 0 3 0;
#X connect 16 0 0 0;
#X connect 17 0 13 0;
#X connect 18 0 9 0;
#X connect 18 0 0 0;
#X connect 19 0 20 0;
#X connect 20 0 22 0;
#X connect 20 1 16 0;
#X connect 20 2 21 0;
#X connect 24 0 25 0;
#X connect 25 0 5 0;
#X connect 26 0 27 0;
#X connect 27 0 12 0;
#X connect 28 0 18 0;
#X restore 335 70 pd OSC;
#X obj 318 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X obj 161 137 dummy_text 0;
#X obj 161 157 dummy_text 1;
#X obj 161 177 dummy_text 2;
#X obj 161 197 dummy_text 3;
#X obj 161 217 dummy_text 4;
#X obj 277 135 dummy_video 0;
#X obj 277 155 dummy_video 1;
#X obj 277 175 dummy_video 2;
#X obj 277 195 dummy_video 3;
#X obj 277 215 dummy_video 4;
#X obj 161 237 dummy_text 5;
#X obj 277 235 dummy_video 5;
#X floatatom 127 261 5 0 0 0 x - -, f 5;
#X text 20 70 click here after enabling OSC leaning in i-score;
#X text 34 8 You need mrpeach/osc and iemnet or mrpeach/net objects
to use this patch.;
#X text 62 99 each [dummy_text] and [dummy_video] contains several
parameters that are exposed to i-score.;
#X obj 38 36 declare -stdpath osc -stdpath iemnet -lib iemnet -path
abs;
#X obj 163 260 oscparam /test/position/x;
#X connect 1 0 0 0;
#X connect 14 0 19 0;
#X connect 19 0 14 0;
Loading

0 comments on commit 2e56c50

Please sign in to comment.