| [proaudio] proaudio/proaudio: [3020] zynaddsubfx: Remove old stuff; rename live ebuild |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3020
Author: dominique
Date: 2016-11-18 16:36:49 +0100 (Fri, 18 Nov 2016)
Log Message:
-----------
zynaddsubfx: Remove old stuff; rename live ebuild
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/01-mutex-split.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/02-ifdef-jackmidi.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/03-fix_jackmidi.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/fix_jack_midi_api.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/jackmidi_ifdef.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/unzombify.diff
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-jackmidi-051205.diff
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-lash-and-jackmidi-051205.diff
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn_lash-0.5.0pre0.diff
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-docs.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-18 15:36:49 UTC (rev 3020)
@@ -3,8 +3,9 @@
# $Header: $
18 Nov 2016; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ -files/* -*.ebuild: remove old stuffs; zynaddsubfx is now in portage
+files/gnustd.diff: fix compilation errors on gentoo
- zynaddsubfx-99999999-r1.ebuild: use git-r3 eclass.
+ +zynaddsubfx-9999.ebuild: 99999999-r1 but use git-r3 eclass.
31 Mar 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+zynaddsubfx-99999999-r1.ebuild:
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,28 +1,5 @@
-AUX 01-mutex-split.patch 29031 SHA256 535fc6e85d0f7ad85fe8f5d031d7bc52f69e3356390a4d1e88fb3e78f367943a SHA512 3b65609c9d657d8a48f9a8f39e6af75b66dcd555f15f60eccda6e9020f3bfd461dbaa4f6dfa3648d3db28200c2aa4947d0accc04f56b35ca7e6b05836695fc98 WHIRLPOOL befb37ccd9891eea4226f0367d0494d2828970dc172ebc19bd3b4a3503652f4537aaa5c0a44425b187326a7894f23f1390e7db6f9c13199b23fd0bba2cb17dd3
-AUX 02-ifdef-jackmidi.patch 3178 SHA256 405fe2696e6b8c0f8cb1c4842f822cd654e4070d163824e9d401c4a6b5fc5073 SHA512 d38a36b3d0d9aaf59cf0f2c1f47854970a79da8bbd646e6d8d9a9d5ae62b1603d44ed7dd24f9f066bdd0f0a8a86fd54e6beaa529cc871a7e1e260330e18f0d06 WHIRLPOOL df20fc2c5de7919d94874efa309a885627817334a1bc53d762a971fbfc9ecc4e5aa4eb74553b3710c9ae8fd031a3349899bf2249cb00be2276f3bba713ba3cb3
-AUX 03-fix_jackmidi.patch 446 SHA256 c85c642b2528a7978ce4402174158d4da78ab74f0ae61139ac8f2aa9dac712b9 SHA512 ff67c9bcdd256545199cd74839766052bc674b66ee14065d06f901b93b6cd54b8cb88fd03ad798d63306238f8c0781054233557d5f65b0351acd80efd737ad58 WHIRLPOOL cee3d28862c5383938bfa9a24947d795686d7c98f302bccacc0528023fce0426cde1fdb1b360580012d9683e621de464b8e42345396419efa2a10b1c860bb65b
-AUX fix_jack_midi_api.patch 722 SHA256 e8727347f905ca1c21d8c17f413b09c75ad94d1d49caa872242f049bd7a9d514 SHA512 e7f11864e9789447ccb78c5c17a605e33fe3c8262ca9fb108e475beaade0e3b808b72dc53e2ae2ac58b482cf4770a798e1d1f47ca095e2bd3175c989616bec10 WHIRLPOOL 88c6519e766392523919253ec7ab2a08f195c299d4ad8eb7b33e09fb025fd8f5e5095b02f046e30eb3386370ab9cabcbd3d874559950e8e09ecae129f485f1b0
AUX gnustd.diff 391 SHA256 33810a39a73b389a74cab5f9473a81aa202e600e2110a218b2645c5c61b40f6e SHA512 fce0a12d96ac18f8852416ad32d5a541377abb10f8fdcd7344bc2b1d894fc5fbceaf85ad25d66ce26153b6b028b467eee5f7b7195ab3b81c59e648b35cbd1146 WHIRLPOOL a72fcbc9d5cc54d0d99ff1db1c4e116d17bab93b67f8b1b2017f118abd94ac02bc8b8a38d22ff8a96b9168d2102c937460690537f5bab3605890902a05c5661d
-AUX jackmidi_ifdef.patch 2715 SHA256 9b480711e0d21cee208aa0266f6cc6fc8b4a089f17674f49e3b733dfb566f749 SHA512 7af6bff786104db883ee37b9f1759198eec29b4c12c324663f1ea4546e2bd8817b3757435fa70061575e2cb9c006b09a9b48d4f49503df62a4311bafcee2a986 WHIRLPOOL 99f708050d3fd2e0c8758e937a0ae451220b3452338a6948167ebb56e64f420213787074ecd41cd0f82e90ebf78db556e53d643d2905c4f2d0b70f9d89a0706a
-AUX unzombify.diff 1027 SHA256 43a3cecc60ce0793c9303b44f4d225eaee69a2a0177a02eccc3129ae1a727d4b SHA512 f1dd1a4037ab4bddf95b12718f37f051f17a18645bcd23e9abc7d4e94a05b3f44057b68dc877701f448bb44a6cb19b0e022a9056543f472d8d23e7c74bb1b88a WHIRLPOOL 0b088f3cfeba60f1c1284c4a30fca4a9e40dae51720b0be3cf027a95ca3306d030b18328a4e494db26c194589402726e5c4b091f6e973fa38526155444e5216f
-AUX zyn-jackmidi-051205.diff 3875 SHA256 eeca9f41cb0c100095c90676b224ba09cc2281132633ad1453f1fd5983dc17f2 SHA512 4f3016cd32cc6591436da2760c94b6ce9e1c4a6b6262306f46a58c434cebc8d10600fcd2c710a6333e69f9c0c3c08e9127c31ea731ca324572d4ba3c8c181bde WHIRLPOOL 0ddd91afbadea7739c82342e46a25042dec279bc61a15be3bb6c68532f05e4328d277ada2037e8f7fb5a117bb5f7632c4ac6204ba719a16478e11fecb234cd8e
-AUX zyn-lash-and-jackmidi-051205.diff 16615 SHA256 90a084a3cba4ee178e3f72c025dc66f6203d0f4f7f841e31eff1a2c2642b24c7 SHA512 32beee03d115fd272d9b790b85366626cf787f579e63f4fb33fb097c70e37ac1cd0ba834cb962d038ce881a3ead3c95438fa832d80c2f4185282e501c127db0f WHIRLPOOL b644acf174681e067fb69d1e06fcfb421c696026721778f910a5ce2087cd7bd26b8515d2688520f3d64d5c439f2d487cce72cf52c67e25d438f985df398875cf
-AUX zyn_lash-0.5.0pre0.diff 15848 SHA256 b7abccad463f57c04c80bb7a2f442eb90b6de3d2f30918a6da9c8a742a72fe06 SHA512 d9770d6de96e1bf1a005b30257b160fb50e5ac0109a643be57826d0cfa48a57f72e0b03610959e96e2f54831f6998bc90f1f38410ee861056101be340b252c13 WHIRLPOOL b0319f5109742e887ebc0d0a5e58daedc2e1ad373ec9ed332956d090c1da4c666f6fce48da7c78a861a19d27f42f157b0fcdf7baf6af402be9c0204879e6a66e
-AUX zynaddsubfx-2.4.1-fltk13.patch 1978 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22 SHA512 7fc4ddf564035b88ec7c9100eb1b29c0011a6b567c141d25861db1c1a76ab931d5dc6a704d9300d78ae524b00a05eca61612e1ea05f284026524b56af799ccdf WHIRLPOOL 91ab050f379fb7724c49486e0da31d70e72806e690b873f06201a7ce1be7b67f526846d0b1b73c3e70447fd60c10760f4f6494c724c484f9b785118bc0806b72
-AUX zynaddsubfx-2.4.3-docs.patch 420 SHA256 379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2 SHA512 541da21e9b1e86da83a9d369f86efcdcac4fc49c9b0158182c42dbf49287e5eb59e466443be2cf7ce87c1daca85ccc141e0fa5f288839ee6fe2da4e7cd978157 WHIRLPOOL 67e128af2a008a0db6436c7f9c2792d50af679c0a1ddae9f457f62576587bdf9f6b3a644d82142a6860775abf3866527b11c1723b6c57c8c72394fa7d895f7bb
-AUX zynaddsubfx-2.4.3-nofltk.patch 487 SHA256 8428e1214a257a03ec6cdb3aa702d2ff55ad055c6ed59f4432ecb416af107528 SHA512 c0ecfc942eb3e3ceced6fffbd05f764fc4ded5e16eb74510b327c0c7ac7641d5a33cf219a1c111c6a2a48ce327a075dbe2f4f9768a0e67f260db9c2334328d9e WHIRLPOOL 97e7fae25a218cbb83c50bee855b6b7e10245a6ef7e92fbc28986492ca6eb27c4e84e64bb77cc22569c07b75032b3fc8435e4480e6f50d89e20068abb3348ac2
-DIST ZynAddSubFX-2.2.1.tar.bz2 927022 SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2 SHA512 defc1c0a29a7184ad8fad410dbf615df4f0c746f51682ed14847e70e422850a4146fbca753901b9fc3e8108ad5700304ef1ac9986d240e44f31bfc0c293c5d0a WHIRLPOOL 3c4dcfebceac37850df48a887aa536630ef3109cd5d80e02d1b9b16cf48251bfc60f6f531ff8af587ca51dcdee21eab9d1bb7e2abde7c3ebd1f7cca15f061f99
-DIST ZynAddSubFX-2.4.0.tar.bz2 1418352 SHA256 7675a7ac7741dcfce0bed197e2190f2e21b5b0a072458bcb605184b7be246c63 SHA512 3dfc93888d73bab7ba8a75f237730f4ece621a371841c09cc99189dc083f5eb71e66db867e19a0aa8948add1f2d776223e1bb102ecb34f82cb8235dc98b03201 WHIRLPOOL 35d8f815f6f1ebc926fd759e2334d0de492cfe120368635505220b2dc07a705ea17abbb649e88feef97f5391ffa808bf088df237b89f8b1ee3274e7654b84014
-DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
-DIST ZynAddSubFX-20070707.tar.bz2 206680 SHA256 036482f2aa68fc25b9bd8426032c458dcf46052ab9cde12ab30279126b0db4fa SHA512 f81cc427628b301e846dde1e51d5cd3d737e7c04387338a86728a327ed0abd5c45a722b61ac9e1088b7c52a49bb1a38df6bcc731c0b44ce73bf472f1dda6a3d9 WHIRLPOOL 1a459da1182358084d23741c328f81eb75d4eea90e257660649489216c6ebd57afe717003f8f1cfe75d1d006807392a1332dd18afd43e3e672c950bd77748474
-DIST zynaddsubfx-patches-2.tar.gz 6423 SHA256 b0d0f784940b647dcd2e3cfc4c0f1faba344f33e2ae568dd7c8bd97af0abb7b3 SHA512 0b27a8db2be1b4fda1bd44b47264820dd45dbec56598c43501984380cbe3b64ef0379af78447cd03bdc5083afabf8206303231457433f71037199b80ac0304b7 WHIRLPOOL 8f6c857ebbbf3fa7c996dd84ee1c030ef2bac4788c78d031eb8a4295f5ae52481ab93bbffdc0164059045ddf9721619345bba1a5c533a5471aaa7d3ba853b210
DIST zynaddsubfx-presets-0.1.tar.bz2 27052 SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626 WHIRLPOOL 582674fbdfe7b770b93a6559c38bb79f718aa042e6f9795dbac8d5821f50ef1caa1655e71c350f28b7f7a8f94151bb07365d20896dd5101f925af56e21b993fc
-EBUILD zynaddsubfx-2.2.1-r8.ebuild 3157 SHA256 148e8466a6a4e6c0193aec1dfbcf7c52ed744c9e5aea02cf98cbac5f34d22f59 SHA512 054e7e1dc84195a39a3f40a3e5241afa7d491f1f63046895a643ae1a958de48cafa8bcac73fee256abd6fcad693f9fea734d36f8bffad8a3e251c20fce5d6339 WHIRLPOOL faf2ed9802adaf70deb13a347f8cf2383c368f20995ff0353e6e89aec089571f3e5a1041ed0be5846f951119ee1c83b31ea7d3356b1409bc5658029aadb8caa3
-EBUILD zynaddsubfx-2.4.0.ebuild 2733 SHA256 1db058464596dc84a60ca88997ecd6489df61542383f23202133b5483cf6333f SHA512 6ac350babf2a1d550e7961b5b88792a357e02a12d4ebeabe219430b8236b4ee26b9e2e07e7144bd9e7489e35fcc49b8ed634b368a2450072f4dc449eef6b9a51 WHIRLPOOL f94a9a25bee1467af460618d960c4653fa27480a601b97766c4ad9b9ccb728719646a53d7275f28f919b7149705c2a2f596968f57b5e5096760f1b1bbad91aa8
-EBUILD zynaddsubfx-2.4.3.ebuild 1585 SHA256 9773e2ffd8d4373399d59ac748925b5f483f66dbc21712513c7129264a275d49 SHA512 0e19c3a50bdc6b4a684f74788f207b49a0bdb363d1b774c8d4c42c4e37252b30eba58c020addcd98baccacf9f7657812e7ab626c98289f7157c2a1caaeb6b1b1 WHIRLPOOL 58c2cfe80d2c94b7872d7051e20e6726365eeb4f0003e486528463989ac426fc5ac8c6ef36b407bfb89a0e5d82e3b5e26148a39f6dd804dea1f4aa0ae47cf92f
-EBUILD zynaddsubfx-20070707-r1.ebuild 3094 SHA256 feaa56afa960ec2d51fb0e62629e98ce202646a4afee04dd4ec18a27e46e23e2 SHA512 9a4de8f8fddc497f0396ad43a85ef4b3d2c1a3aea68d903d045edf98999abd0fec06ce020a9120ab24907767b202f23cc5700d5f2c43e47d24f167b358fec620 WHIRLPOOL b507af8cf295e4e351eb7bb74d8e4ae5b83bbc4669c187e6b305522c56b5546ba641c251663c96f89999e0dc259bc9277a409002d9d0665c784b3384ba706d34
-EBUILD zynaddsubfx-20070707.ebuild 3018 SHA256 ed9aae5e87f2fc3b0c796647331b214f7058e1368196fe976d81b5977250fd1c SHA512 f56b55ace1360c8b21bd6e97441b057a8c3a32a12a42a2bf5b0593fcfa4cac05d9c4336aff4757b48ef0710cf8677d5f0b8116711bbfd6c196ecaa6e10b39348 WHIRLPOOL b366f5ba35a95231cb96032c26702c09619a874f177e852224eb216055e1cd73793b622fa75fda7ed2be2c4c9ec4297f2b2e778472beeb9ac31127a8396a36a4
-EBUILD zynaddsubfx-99999999-r1.ebuild 2409 SHA256 e1648b9b947f592b6e12217d43ae08eb7150d5d6c72b1b25f9c199309536b52a SHA512 9dbf6bb1cd629dc161296735007bc36815f25b413b188491309c7ba4541eff2824f92a06f343325bfdba750fb2ee540745f9c50b585b2d78eb3ef9c172094558 WHIRLPOOL f5245a2b91fe49f4278de1a6b9828e929fdcb3a4a92df4349abcf164e31f0da2ea2479a85d397bafb189bba8338f1afe3a790ee5c1b62258c253bb261068446a
-EBUILD zynaddsubfx-99999999.ebuild 3567 SHA256 4dbb9ed6c0effdf6af0411ff6d12b0b91f4174df99d1686d69c75386ee2a2b61 SHA512 7a649238734c847d774e480be4751170ef3c205f84ae555fd6c8b7ecf61d668359264f3f3b15c497b110f1e83ac53cad8d7b4a73181a3d6e2ab862d8e815a195 WHIRLPOOL 509d9cbfeada744c5ff427e689890af03fdcbeff3fb2c8f691ddebd17b02c400f2238764069f10ab1d4940b712e508b9fdd6c3bd689a8a039da5e5ad86989763
-MISC ChangeLog 2513 SHA256 9a3cb4aae71e50b8379a255a3fa10019d54f13f0aab272f0fcd637aa690b6e93 SHA512 707328b6e1d67e736a07b030296746ceb012a0a97e9e59f5a3fa3c4e36070256f7b3ef52e22efab0010282b6a3bc634abf32ca06911b57e2ac0f05f85f110731 WHIRLPOOL 7513871bb8055ae132d95a5589ce118e5d9f79bbdd98b899501f2c07c015f332a21a8fc097238d9007c63b152067252523c169b7b3795a9e662eae96b8cf35b6
+EBUILD zynaddsubfx-9999.ebuild 2409 SHA256 e1648b9b947f592b6e12217d43ae08eb7150d5d6c72b1b25f9c199309536b52a SHA512 9dbf6bb1cd629dc161296735007bc36815f25b413b188491309c7ba4541eff2824f92a06f343325bfdba750fb2ee540745f9c50b585b2d78eb3ef9c172094558 WHIRLPOOL f5245a2b91fe49f4278de1a6b9828e929fdcb3a4a92df4349abcf164e31f0da2ea2479a85d397bafb189bba8338f1afe3a790ee5c1b62258c253bb261068446a
+MISC ChangeLog 2775 SHA256 56b94543bca9755ee2a13e47e130d38db323a095f8243c4f73e153d1e6f70b66 SHA512 7e710507fbe8ac7f8d9c38420fea28a3a9513dff9e4d8955278ca929a6b82628130461026d2c4755b94e1eecc15e0716350220e6a1d91b6d45051ceec8dd2199 WHIRLPOOL 4a7b1c906a8bde525f49c31d03fb6d950f1ec54412f66afb0aede4ac049dce9ef129da5e2a0632a150cfe35a4a2425ea35600f037239bfc5990763b3a3ef3c41
MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/01-mutex-split.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/01-mutex-split.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/01-mutex-split.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,854 +0,0 @@
-diff -urN zynaddsubfx/src/main.C zynaddsubfx/src/main.C
---- zynaddsubfx/src/main.C 2006-11-01 20:05:59.000000000 +0100
-+++ zynaddsubfx/src/main.C 2007-02-04 18:17:24.000000000 +0100
-@@ -121,13 +121,13 @@
- note=cmdparams[0];
- vel=cmdparams[1];
-
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
-
- if ((cmdtype==MidiNoteON)&&(note!=0)) master->NoteOn(cmdchan,note,vel);
- if ((cmdtype==MidiNoteOFF)&&(note!=0)) master->NoteOff(cmdchan,note);
- if (cmdtype==MidiController) master->SetController(cmdchan,cmdparams[0],cmdparams[1]);
-
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
- };
-
- return(0);
-@@ -227,12 +227,12 @@
-
-
-
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
- if (type==1){//note_on or note_off
- if (par2!=0) master->NoteOn(midichan,par1,par2);
- else master->NoteOff(midichan,par1);
- };
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
- };
- } while (again>0);
-
-@@ -316,7 +316,7 @@
- * Program exit
- */
- void exitprogram(){
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->initMutex);
- #ifdef OSSAUDIOOUT
- delete(audioout);
- #endif
-diff -urN zynaddsubfx/src/Misc/Master.C zynaddsubfx/src/Misc/Master.C
---- zynaddsubfx/src/Misc/Master.C 2006-11-01 00:03:00.000000000 +0100
-+++ zynaddsubfx/src/Misc/Master.C 2007-02-04 18:17:24.000000000 +0100
-@@ -32,7 +32,8 @@
- Master::Master(){
- swaplr=0;
-
-- pthread_mutex_init(&mutex,NULL);
-+ pthread_mutex_init(&initMutex,NULL);
-+ pthread_mutex_init(&processMutex,NULL);
- fft=new FFTwrapper(OSCIL_SIZE);
-
- tmpmixl=new REALTYPE[SOUND_BUFFER_SIZE];
-@@ -55,17 +56,17 @@
- };
-
- for (int npart=0;npart<NUM_MIDI_PARTS;npart++)
-- part[npart]=new Part(µtonal,fft,&mutex);
-+ part[npart]=new Part(µtonal,fft,&processMutex);
-
-
-
- //Insertion Effects init
- for (int nefx=0;nefx<NUM_INS_EFX;nefx++)
-- insefx[nefx]=new EffectMgr(1,&mutex);
-+ insefx[nefx]=new EffectMgr(1,&processMutex);
-
- //System Effects init
- for (int nefx=0;nefx<NUM_SYS_EFX;nefx++) {
-- sysefx[nefx]=new EffectMgr(0,&mutex);
-+ sysefx[nefx]=new EffectMgr(0,&processMutex);
- };
-
-
-@@ -492,7 +493,8 @@
- delete [] tmpmixr;
- delete (fft);
-
-- pthread_mutex_destroy(&mutex);
-+ pthread_mutex_destroy(&processMutex);
-+ pthread_mutex_destroy(&initMutex);
- };
-
-
-@@ -612,9 +614,9 @@
-
- xml->beginbranch("MASTER");
-
-- pthread_mutex_lock(&mutex);
-+ pthread_mutex_lock(&processMutex);
- add2XML(xml);
-- pthread_mutex_unlock(&mutex);
-+ pthread_mutex_unlock(&processMutex);
-
- xml->endbranch();
-
-@@ -632,9 +634,9 @@
-
- if (xml->enterbranch("MASTER")==0) return;
-
-- pthread_mutex_lock(&mutex);
-+ pthread_mutex_lock(&processMutex);
- getfromXML(xml);
-- pthread_mutex_unlock(&mutex);
-+ pthread_mutex_unlock(&processMutex);
-
- xml->exitbranch();
-
-diff -urN zynaddsubfx/src/Misc/Master.h zynaddsubfx/src/Misc/Master.h
---- zynaddsubfx/src/Misc/Master.h 2005-03-14 19:13:43.000000000 +0100
-+++ zynaddsubfx/src/Misc/Master.h 2007-02-04 18:17:24.000000000 +0100
-@@ -130,7 +130,8 @@
- Bank bank;
-
- FFTwrapper *fft;
-- pthread_mutex_t mutex;
-+ pthread_mutex_t initMutex;
-+ pthread_mutex_t processMutex;
-
- private:
- REALTYPE volume;
-diff -urN zynaddsubfx/src/Misc/Part.C zynaddsubfx/src/Misc/Part.C
---- zynaddsubfx/src/Misc/Part.C 2007-01-07 23:33:56.000000000 +0100
-+++ zynaddsubfx/src/Misc/Part.C 2007-02-04 18:17:24.000000000 +0100
-@@ -962,7 +962,7 @@
-
- void Part::applyparameters(){
- for (int n=0;n<NUM_KIT_ITEMS;n++){
-- if ((kit[n].padpars!=NULL)&&(kit[n].Ppadenabled!=0)) kit[n].padpars->applyparameters(true);
-+ if ((kit[n].padpars!=NULL)&&(kit[n].Ppadenabled!=0)) kit[n].padpars->applyparameters();
- };
- };
-
-diff -urN zynaddsubfx/src/Output/JACKaudiooutput.C zynaddsubfx/src/Output/JACKaudiooutput.C
---- zynaddsubfx/src/Output/JACKaudiooutput.C 2006-11-01 20:06:00.000000000 +0100
-+++ zynaddsubfx/src/Output/JACKaudiooutput.C 2007-02-04 18:17:24.000000000 +0100
-@@ -79,18 +79,19 @@
- int jackprocess(jack_nframes_t nframes,void *arg){
- jack_default_audio_sample_t *outl=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_left, nframes);
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
--
-- if (!pthread_mutex_trylock(&jackmaster->mutex)) {
-+ if (!pthread_mutex_trylock(&jackmaster->initMutex)) {
-+ if (!pthread_mutex_lock(&jackmaster->processMutex)) {
- JACKhandlemidi(nframes);
- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
-- pthread_mutex_unlock(&jackmaster->mutex);
-- }
-- else {
-- memset(outl, 0, sizeof(jack_default_audio_sample_t) * nframes);
-- memset(outr, 0, sizeof(jack_default_audio_sample_t) * nframes);
-+ pthread_mutex_unlock(&jackmaster->processMutex);
- }
-+ pthread_mutex_unlock(&jackmaster->initMutex);
-+ } else {
-+ memset(outl, 0, sizeof(jack_default_audio_sample_t) * nframes);
-+ memset(outr, 0, sizeof(jack_default_audio_sample_t) * nframes);
-+ }
-
-- return(0);
-+ return 0;
- };
-
- void JACKfinish(){
-diff -urN zynaddsubfx/src/Params/PADnoteParameters.C zynaddsubfx/src/Params/PADnoteParameters.C
---- zynaddsubfx/src/Params/PADnoteParameters.C 2005-09-27 19:42:44.000000000 +0200
-+++ zynaddsubfx/src/Params/PADnoteParameters.C 2007-02-04 18:17:24.000000000 +0100
-@@ -447,12 +447,13 @@
- /*
- * Applies the parameters (i.e. computes all the samples, based on parameters);
- */
--void PADnoteParameters::applyparameters(bool lockmutex){
-+void PADnoteParameters::applyparameters() {
- const int samplesize=(((int) 1)<<(Pquality.samplesize+14));
- int spectrumsize=samplesize/2;
- REALTYPE spectrum[spectrumsize];
- int profilesize=512;
- REALTYPE profile[profilesize];
-+ fprintf(stderr," PADnoteParameters::applyparameters()\n");
-
-
- REALTYPE bwadjust=getprofile(profile,profilesize);
-@@ -506,33 +507,22 @@
- for (int i=0;i<extra_samples;i++) newsample.smp[i+samplesize]=newsample.smp[i];
-
- //replace the current sample with the new computed sample
-- if (lockmutex){
-- pthread_mutex_lock(mutex);
-- deletesample(nsample);
-- sample[nsample].smp=newsample.smp;
-- sample[nsample].size=samplesize;
-- sample[nsample].basefreq=basefreq*basefreqadjust;
-- pthread_mutex_unlock(mutex);
-- } else {
-- deletesample(nsample);
-- sample[nsample].smp=newsample.smp;
-- sample[nsample].size=samplesize;
-- sample[nsample].basefreq=basefreq*basefreqadjust;
-- };
-+ pthread_mutex_lock(mutex);
-+ deletesample(nsample);
-+ sample[nsample].smp=newsample.smp;
-+ sample[nsample].size=samplesize;
-+ sample[nsample].basefreq=basefreq*basefreqadjust;
-+ pthread_mutex_unlock(mutex);
- newsample.smp=NULL;
-- };
-+ }
- delete(fft);
- deleteFFTFREQS(&fftfreqs);
-
- //delete the additional samples that might exists and are not useful
-- if (lockmutex){
-- pthread_mutex_lock(mutex);
-- for (int i=samplemax;i<PAD_MAX_SAMPLES;i++) deletesample(i);
-- pthread_mutex_unlock(mutex);
-- } else {
-- for (int i=samplemax;i<PAD_MAX_SAMPLES;i++) deletesample(i);
-- };
--};
-+ pthread_mutex_lock(mutex);
-+ for (int i=samplemax;i<PAD_MAX_SAMPLES;i++) deletesample(i);
-+ pthread_mutex_unlock(mutex);
-+}
-
-
- void PADnoteParameters::add2XML(XMLwrapper *xml){
-diff -urN zynaddsubfx/src/Params/PADnoteParameters.h zynaddsubfx/src/Params/PADnoteParameters.h
---- zynaddsubfx/src/Params/PADnoteParameters.h 2005-03-14 19:13:45.000000000 +0100
-+++ zynaddsubfx/src/Params/PADnoteParameters.h 2007-02-04 18:17:24.000000000 +0100
-@@ -142,7 +142,7 @@
- REALTYPE setPbandwidth(int Pbandwidth);//returns the BandWidth in cents
- REALTYPE getNhr(int n);//gets the n-th overtone position relatively to N harmonic
-
-- void applyparameters(bool lockmutex);
-+ void applyparameters();
-
- OscilGen *oscilgen;
- Resonance *resonance;
-diff -urN zynaddsubfx/src/UI/BankUI.fl zynaddsubfx/src/UI/BankUI.fl
---- zynaddsubfx/src/UI/BankUI.fl 2006-11-01 00:03:01.000000000 +0100
-+++ zynaddsubfx/src/UI/BankUI.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -254,9 +254,9 @@
- };
-
- if ((what==1)&&(mode==1)&&(!bank->emptyslot(slot))){//Reads from slot
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->initMutex);
- bank->loadfromslot(slot,master->part[*npart]);
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->initMutex);
- master->part[*npart]->applyparameters();
- snprintf((char *)master->part[*npart]->Pname,PART_MAX_NAME_LEN,"%s",bank->getname(slot));
- cbwig->do_callback();
-@@ -270,9 +270,9 @@
- if (!bank->emptyslot(slot)){
- if (!fl_choice("Overwrite the slot no. %d ?","No","Yes",NULL,slot+1)) goto nooverwriteslot;
- };
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->initMutex);
- bank->savetoslot(slot,master->part[*npart]);
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->initMutex);
-
- bs[slot]->refresh();
- mode=1;readbutton->value(1);writebutton->value(0);
-diff -urN zynaddsubfx/src/UI/MasterUI.fl zynaddsubfx/src/UI/MasterUI.fl
---- zynaddsubfx/src/UI/MasterUI.fl 2006-11-01 20:06:02.000000000 +0100
-+++ zynaddsubfx/src/UI/MasterUI.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -60,6 +60,7 @@
- decl {\#include "../globals.h"} {public
- }
-
-+
- class VUMeter {: {public Fl_Box}
- } {
- Function {VUMeter(int x,int y, int w, int h, const char *label=0):Fl_Box(x,y,w,h,label)} {} {
-@@ -81,7 +82,7 @@
-
- int ox=x(); int oy=y(); int lx=w(); int ly=h();
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- REALTYPE dbl=rap2dB(master->vuoutpeakl);
- REALTYPE dbr=rap2dB(master->vuoutpeakr);
- REALTYPE rmsdbl=rap2dB(master->vurmspeakl);
-@@ -89,7 +90,7 @@
- REALTYPE maxdbl=rap2dB(master->vumaxoutpeakl);
- REALTYPE maxdbr=rap2dB(master->vumaxoutpeakr);
- int clipped=master->vuclipped;
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- dbl=(MIN_DB-dbl)/MIN_DB;
- if (dbl<0.0) dbl=0.0;
-@@ -181,9 +182,9 @@
- int ox=x(); int oy=y(); int lx=w(); int ly=h();
-
- if (!active_r()){
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
- int fakedb=master->fakepeakpart[npart];
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
- fl_rectf(ox,oy,lx,ly,140,140,140);
- if (fakedb>0){
- fakedb=(int)(fakedb/255.0*ly)+4;
-@@ -194,9 +195,9 @@
- };
-
- //draw the vu lines
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- REALTYPE db=rap2dB(master->vuoutpeakpart[npart]);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- db=(MIN_DB-db)/MIN_DB;
- if (db<0.0) db=0.0;
-@@ -242,9 +243,9 @@
- break;
- case FL_PUSH:
- if (npart>=0) break;
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
- master->vuresetpeaks();
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
- break;
- };
- return(1);} {}
-@@ -351,9 +352,9 @@
- }
- Fl_Check_Button partenabled {
- label 01
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->partonoff(npart,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if ((int) o->value()==0) panellistitemgroup->deactivate();
- else {
-@@ -457,13 +458,13 @@
- filename=fl_file_chooser("Open:","({*.xsz})",NULL,0);
- if (filename==NULL) return;
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- //clear all parameters
- master->microtonal.defaults();
-
- //load the data
- int result=master->microtonal.loadXML(filename);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
-
- delete microtonalui;
-@@ -490,9 +491,9 @@
- };
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- result=master->microtonal.saveXML(filename);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (result<0) fl_alert("Error: Could not save the file.");
-
-@@ -529,9 +530,9 @@
- label {&Clear Instrument...}
- callback {if (fl_choice("Clear instrument's parameters ?","No","Yes",NULL)){
- // int npart=(int)npartcounter->value()-1;
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
- master->part[npart]->defaultsinstrument();
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
-
- npartcounter->do_callback();
- };
-@@ -546,7 +547,7 @@
- if (filename==NULL) return;
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- // int npart=(int)npartcounter->value()-1;
-
- //clear all instrument parameters, first
-@@ -555,7 +556,8 @@
- //load the instr. parameters
- int result=master->part[npart]->loadXMLinstrument(filename);
-
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-+
- master->part[npart]->applyparameters();
-
- npartcounter->do_callback();
-@@ -581,9 +583,9 @@
- };
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- result=master->part[npart]->saveXML(filename);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (result<0) fl_alert("Error: Could not save the file.");
-
-@@ -671,9 +673,9 @@
- Fl_Button {} {
- label {Panic!}
- callback {virkeyboard->relaseallkeys();
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- master->shutup=1;
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {293 29 92 31} box PLASTIC_UP_BOX color 231 labelfont 1
- }
- Fl_Group partuigroup {
-@@ -704,9 +706,9 @@
- }
- Fl_Choice sysefftype {
- label EffType
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->sysefx[nsyseff]->changeeffect((int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- syseffectui->refresh(master->sysefx[nsyseff]);}
- xywh {315 125 70 15} down_box BORDER_BOX labelsize 10
- code0 {o->value(master->sysefx[nsyseff]->geteffect());}
-@@ -769,9 +771,9 @@
- }
- Fl_Button {} {
- label P
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- presetsui->paste(master->sysefx[nsyseff],syseffectui);
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
- }
- }
-@@ -801,9 +803,9 @@
- }
- Fl_Choice insefftype {
- label EffType
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->insefx[ninseff]->changeeffect((int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- inseffectui->refresh(master->insefx[ninseff]);
- inseffectui->show();}
- xywh {315 125 70 15} down_box BORDER_BOX labelsize 10
-@@ -882,9 +884,9 @@
- }
- Fl_Button {} {
- label P
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- presetsui->paste(master->insefx[ninseff],inseffectui);
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {245 124 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
- }
- }
-@@ -1133,7 +1135,7 @@
- if (filename==NULL) return;
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- // int npart=(int)npartcounter->value()-1;
-
- //clear all instrument parameters, first
-@@ -1142,7 +1144,7 @@
- //load the instr. parameters
- int result=master->part[npart]->loadXMLinstrument(filename);
-
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- master->part[npart]->applyparameters();
-
- simplenpartcounter->do_callback();
-@@ -1274,9 +1276,9 @@
- }
- Fl_Check_Button partenabled {
- label Enabled
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->partonoff(npart,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if ((int) o->value()==0) simplelistitemgroup->deactivate();
- else {
-@@ -1320,9 +1322,9 @@
- }
- Fl_Choice simplesysefftype {
- label EffType
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->sysefx[nsyseff]->changeeffect((int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- simplesyseffectui->refresh(master->sysefx[nsyseff]);}
- xywh {515 80 70 15} down_box BORDER_BOX labelsize 10 align 5
- code0 {o->value(master->sysefx[nsyseff]->geteffect());}
-@@ -1380,9 +1382,9 @@
- }
- Fl_Button {} {
- label P
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- presetsui->paste(master->sysefx[nsyseff],simplesyseffectui);
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
- }
- }
-@@ -1412,9 +1414,9 @@
- }
- Fl_Choice simpleinsefftype {
- label EffType
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->insefx[ninseff]->changeeffect((int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- simpleinseffectui->refresh(master->insefx[ninseff]);
- simpleinseffectui->show();}
- xywh {515 80 70 15} down_box BORDER_BOX labelsize 10 align 5
-@@ -1488,9 +1490,9 @@
- } {}
- Fl_Button {} {
- label P
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- presetsui->paste(master->insefx[ninseff],simpleinseffectui);
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {560 65 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
- }
- }
-@@ -1523,9 +1525,9 @@
- Fl_Button {} {
- label {Stop ALL sounds!}
- callback {virkeyboard->relaseallkeys();
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- master->shutup=1;
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {5 149 115 31} box PLASTIC_UP_BOX color 231 labelfont 1 labelsize 11
- }
- Fl_Button {} {
-@@ -1694,9 +1696,9 @@
- code {if (fl_choice("Clear *ALL* the parameters ?","No","Yes",NULL)){
- delete microtonalui;
-
-- pthread_mutex_lock(&master->mutex);
-+ pthread_mutex_lock(&master->processMutex);
- master->defaults();
-- pthread_mutex_unlock(&master->mutex);
-+ pthread_mutex_unlock(&master->processMutex);
-
- npartcounter->value(1);
- refresh_master_ui();
-@@ -1716,13 +1718,14 @@
- }
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
-+
- //clear all parameters
- master->defaults();
-
- //load the data
- int result=master->loadXML(filename);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- master->applyparameters();
-
- npartcounter->value(1);
-@@ -1753,9 +1756,9 @@
- }
-
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- result=master->saveXML(filename);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (result<0) fl_alert("Error: Could not save the file.");
- else setfilelabel(filename);
-diff -urN zynaddsubfx/src/UI/OscilGenUI.fl zynaddsubfx/src/UI/OscilGenUI.fl
---- zynaddsubfx/src/UI/OscilGenUI.fl 2006-11-01 00:03:01.000000000 +0100
-+++ zynaddsubfx/src/UI/OscilGenUI.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -71,10 +71,10 @@
- REALTYPE spc[n];
- for (i=0;i<n;i++) spc[i]=0.0;
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- if (oscbase==0) oscil->getspectrum(n,spc,0);
- else oscil->getspectrum(n,spc,1);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- //normalize
- REALTYPE max=0;
-@@ -178,10 +178,10 @@
- Function {draw()} {} {
- code {int ox=x(),oy=y(),lx=w(),ly=h()-1,i;
- REALTYPE smps[OSCIL_SIZE];
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- if (oscbase==0) oscil->get(smps,-1.0);
- else oscil->getcurrentbasefunction(smps);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (damage()!=1){
- fl_color(0,0,0);
-@@ -250,14 +250,14 @@
- if (x==64) o->selection_color(0);
- else o->selection_color(222);
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- oscil->Phmag[n]=x;
- if (x==64) {
- oscil->Phphase[n]=64;
- phase->value(64);
- };
- oscil->prepare();
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- display->redraw();
- oldosc->redraw();
-@@ -276,10 +276,10 @@
- if (Fl::event_button3()) o->value(x);
- else x=(int)o->value();
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- oscil->Phphase[n]=x;
- oscil->prepare();
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- display->redraw();
- oldosc->redraw();
-@@ -627,13 +627,13 @@
- sabutton->do_callback();
- };
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- for (int i=0;i<MAX_AD_HARMONICS;i++){
- if (oscil->Phmag[i]==64) h[i]->mag->selection_color(0);
- else h[i]->mag->selection_color(222);
- };
- oscil->prepare();
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- basefuncdisplaygroup->redraw();
- redrawoscil();}
-@@ -664,9 +664,9 @@
-
- //harmonics->redraw();
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- oscil->prepare();
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- redrawoscil();}
- xywh {670 505 55 15} box THIN_UP_BOX labelfont 1 labelsize 11
-@@ -1020,9 +1020,9 @@
- label Sine
- callback {if (!fl_choice("Convert to SINE?","No","Yes",NULL)) return;
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- oscil->convert2sine(0);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- redrawoscil();
- refresh();}
-@@ -1108,9 +1108,9 @@
-
- for (int i=0;i<MAX_AD_HARMONICS;i++) h[i]->refresh();
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- oscil->prepare();
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- basefuncdisplaygroup->redraw();
- redrawoscil();} {}
-diff -urN zynaddsubfx/src/UI/PADnoteUI.fl zynaddsubfx/src/UI/PADnoteUI.fl
---- zynaddsubfx/src/UI/PADnoteUI.fl 2006-10-31 12:13:01.000000000 +0100
-+++ zynaddsubfx/src/UI/PADnoteUI.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -147,9 +147,9 @@
- REALTYPE spc[n];
- for (int i=0;i<n;i++) spc[i]=0.0;
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- pars->oscilgen->getspectrum(n,spc,0);
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
-
- //normalize
-@@ -943,7 +943,7 @@
- }
- Fl_Button applybutton {
- label {Apply Changes}
-- callback {pars->applyparameters(true);
-+ callback {pars->applyparameters();
- o->color(FL_GRAY);
- if (oscui!=NULL) {
- oscui->applybutton->color(FL_GRAY);
-@@ -1062,7 +1062,7 @@
- overtonepos->redraw();
-
- osc->redraw();
--pars->applyparameters(true);
-+pars->applyparameters();
- applybutton->color(FL_GRAY);
- applybutton->parent()->redraw();} {}
- }
-diff -urN zynaddsubfx/src/UI/PartUI.fl zynaddsubfx/src/UI/PartUI.fl
---- zynaddsubfx/src/UI/PartUI.fl 2006-11-01 00:03:01.000000000 +0100
-+++ zynaddsubfx/src/UI/PartUI.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -202,9 +202,9 @@
- callback {int answer=1;
- if (o->value()==0) answer=fl_choice("Delete the item?","No","Yes",NULL);
- if (answer!=0){
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- part->setkititemstatus(n,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (o->value()==0) partkititemgroup->deactivate();
- else partkititemgroup->activate();
-@@ -243,9 +243,9 @@
- callback {int answer=1;
- if (o->value()==0) answer=fl_choice("Delete the item?","No","Yes",NULL);
- if (answer!=0){
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- part->setkititemstatus(n,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
-
- if (o->value()==0) partkititemgroup->deactivate();
- else partkititemgroup->activate();
-@@ -446,9 +446,9 @@
- }
- Fl_Check_Button {} {
- label Enabled
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->partonoff(npart,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- if (part->Penabled==0) partgroupui->deactivate();
- else partgroupui->activate();}
- xywh {90 5 75 20} down_box DOWN_BOX labelfont 1 labelsize 11
-@@ -729,9 +729,9 @@
- }
- Fl_Button {} {
- label P
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- presetsui->paste(part->partefx[ninseff],inseffectui);
--pthread_mutex_unlock(&master->mutex);}
-+pthread_mutex_unlock(&master->processMutex);}
- xywh {120 127 25 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 11 labelcolor 7
- }
- }
-diff -urN zynaddsubfx/src/UI/VirKeyboard.fl zynaddsubfx/src/UI/VirKeyboard.fl
---- zynaddsubfx/src/UI/VirKeyboard.fl 2006-10-31 12:13:01.000000000 +0100
-+++ zynaddsubfx/src/UI/VirKeyboard.fl 2007-02-04 18:17:24.000000000 +0100
-@@ -183,9 +183,9 @@
- vel=midivel*(127.0-rndvelocity)/127.0+RND*rndvelocity;
- };
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- master->NoteOn(midich,nk+midioct*12,(int)vel);
--pthread_mutex_unlock(&master->mutex);} {}
-+pthread_mutex_unlock(&master->processMutex);} {}
- }
- Function {relasekey(int nk,int type)} {} {
- code {if ((nk<0)||(nk>=N_OCT*12)) return;
-@@ -197,9 +197,9 @@
-
- damage(1);
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- master->NoteOff(midich,nk+12*midioct);
--pthread_mutex_unlock(&master->mutex);} {}
-+pthread_mutex_unlock(&master->processMutex);} {}
- }
- Function {relaseallkeys(int type)} {} {
- code {for (int i=0;i<N_OCT*12;i++) relasekey(i,type);} {}
-@@ -272,9 +272,9 @@
- label Cval
- callback {int ctl=midictl;
-
--pthread_mutex_lock(&master->mutex);
-+pthread_mutex_lock(&master->processMutex);
- master->SetController(virkeys->midich,ctl,(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- virkeys->take_focus();}
- tooltip {Controller value} xywh {605 10 15 115} type {Vert Fill} box ENGRAVED_BOX selection_color 229 labelsize 8 align 5 minimum 127 maximum 0 step 1 value 64 textsize 7
- }
-@@ -354,9 +354,9 @@
- }
- Fl_Roller pitchwheelroller {
- label Pwh
-- callback {pthread_mutex_lock(&master->mutex);
-+ callback {pthread_mutex_lock(&master->processMutex);
- master->SetController(virkeys->midich,C_pitchwheel,-(int) o->value());
--pthread_mutex_unlock(&master->mutex);
-+pthread_mutex_unlock(&master->processMutex);
- virkeys->take_focus();}
- tooltip {Pitch Wheel} xywh {625 10 20 95} box PLASTIC_UP_BOX labelsize 8 align 1 when 3 minimum -8192 maximum 8192 step 64
- }
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/02-ifdef-jackmidi.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/02-ifdef-jackmidi.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/02-ifdef-jackmidi.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,101 +0,0 @@
-diff -urN zynaddsubfx/src/Makefile zynaddsubfx/src/Makefile
---- zynaddsubfx/src/Makefile 2006-11-01 20:05:58.000000000 +0100
-+++ zynaddsubfx/src/Makefile 2007-02-04 18:20:43.000000000 +0100
-@@ -75,6 +75,10 @@
- LIBS+= `pkg-config --libs lash-1.0`
- endif
-
-+ifeq ($(LINUX_USE_JACKMIDI),YES)
-+CXXFLAGS += -DUSE_JACKMIDI
-+endif
-+
-
- objects=main.o
- SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
-diff -urN zynaddsubfx/src/Makefile.inc zynaddsubfx/src/Makefile.inc
---- zynaddsubfx/src/Makefile.inc 2006-11-01 20:05:59.000000000 +0100
-+++ zynaddsubfx/src/Makefile.inc 2007-02-04 18:20:43.000000000 +0100
-@@ -46,6 +46,10 @@
- LINUX_USE_LASH=YES
- #LINUX_USE_LASH=NO
-
-+#Next line sets if Jackmidi support will be enabled
-+LINUX_USE_JACKMIDI=NO
-+#LINUX_USE_JACKMIDI=YES
-+
- # W I N D O W S C O N F I G U R A T I O N
-
- #Next line sets the midi input
-diff -urN zynaddsubfx/src/Output/JACKaudiooutput.C zynaddsubfx/src/Output/JACKaudiooutput.C
---- zynaddsubfx/src/Output/JACKaudiooutput.C 2007-02-04 18:17:24.000000000 +0100
-+++ zynaddsubfx/src/Output/JACKaudiooutput.C 2007-02-04 18:21:58.000000000 +0100
-@@ -21,13 +21,19 @@
- */
-
- #include <stdlib.h>
-+#ifdef USE_JACKMIDI
- #include <jack/midiport.h>
-+#endif
- #include "JACKaudiooutput.h"
-
- Master *jackmaster;
- jack_client_t *jackclient;
- char jackname[100];
-+#ifdef USE_JACKMIDI
- jack_port_t *outport_left,*outport_right,*midi_inport;
-+#else
-+jack_port_t *outport_left,*outport_right;
-+#endif
-
- int jackprocess(jack_nframes_t nframes,void *arg);
- int jacksrate(jack_nframes_t nframes,void *arg);
-@@ -61,8 +67,10 @@
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
- outport_right=jack_port_register(jackclient,"out_2",
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
-+#ifdef USE_JACKMIDI
- midi_inport=jack_port_register(jackclient,"midi_input",
- JACK_DEFAULT_MIDI_TYPE,JackPortIsInput|JackPortIsTerminal,0);
-+#endif
-
- if (jack_activate(jackclient)){
- fprintf(stderr,"Cannot activate jack client\n");
-@@ -81,7 +89,9 @@
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
- if (!pthread_mutex_trylock(&jackmaster->initMutex)) {
- if (!pthread_mutex_lock(&jackmaster->processMutex)) {
-+#ifdef USE_JACKMIDI
- JACKhandlemidi(nframes);
-+#endif
- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
- pthread_mutex_unlock(&jackmaster->processMutex);
- }
-@@ -107,6 +117,7 @@
- };
-
-
-+#ifdef USE_JACKMIDI
- void JACKhandlemidi(unsigned long frames) {
-
- // We must have the master mutex before we run this function
-@@ -155,6 +166,7 @@
- }
-
- }
-+#endif
-
-
- const char* JACKgetname() {
-diff -urN zynaddsubfx/src/Output/JACKaudiooutput.h zynaddsubfx/src/Output/JACKaudiooutput.h
---- zynaddsubfx/src/Output/JACKaudiooutput.h 2006-11-01 20:06:00.000000000 +0100
-+++ zynaddsubfx/src/Output/JACKaudiooutput.h 2007-02-04 18:20:43.000000000 +0100
-@@ -40,7 +40,9 @@
-
- bool JACKaudiooutputinit(Master *master_);
- void JACKfinish();
-+#ifdef USE_JACKMIDI
- void JACKhandlemidi(unsigned long frames);
-+#endif
- const char* JACKgetname();
-
- #endif
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/03-fix_jackmidi.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/03-fix_jackmidi.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/03-fix_jackmidi.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,11 +0,0 @@
---- a/src/Output/JACKaudiooutput.C.orig 2007-01-02 15:03:00.000000000 +0100
-+++ b/src/Output/JACKaudiooutput.C 2007-01-02 15:03:28.000000000 +0100
-@@ -128,7 +128,7 @@
- jack_midi_event_t jack_midi_event;
- jack_nframes_t event_index = 0;
- jack_nframes_t event_count =
-- jack_midi_port_get_info(midi_buf, frames)->event_count;
-+ jack_midi_get_event_count(midi_buf, frames);
- unsigned char* midi_data;
- unsigned char type, chan;
-
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/fix_jack_midi_api.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/fix_jack_midi_api.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/fix_jack_midi_api.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,18 +0,0 @@
---- a/src/Output/JACKaudiooutput.C.old 2007-07-08 11:36:31.000000000 +0200
-+++ b/src/Output/JACKaudiooutput.C 2007-07-08 11:36:56.000000000 +0200
-@@ -129,13 +129,13 @@
- jack_midi_event_t jack_midi_event;
- jack_nframes_t event_index = 0;
- jack_nframes_t event_count =
-- jack_midi_get_event_count(midi_buf, frames);
-+ jack_midi_get_event_count(midi_buf);
- unsigned char* midi_data;
- unsigned char type, chan;
-
- while (event_index < event_count) {
-
-- jack_midi_event_get(&jack_midi_event, midi_buf, event_index, frames);
-+ jack_midi_event_get(&jack_midi_event, midi_buf, event_index);
- midi_data = jack_midi_event.buffer;
- type = midi_data[0] & 0xF0;
- chan = midi_data[0] & 0x0F;
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/jackmidi_ifdef.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/jackmidi_ifdef.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/jackmidi_ifdef.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,97 +0,0 @@
---- a/src/Output/JACKaudiooutput.C 2007-01-02 13:53:28.000000000 +0100
-+++ b/src/Output/JACKaudiooutput.C 2007-01-02 13:53:28.000000000 +0100
-@@ -21,13 +21,19 @@
- */
-
- #include <stdlib.h>
-+#ifdef USE_JACKMIDI
- #include <jack/midiport.h>
-+#endif
- #include "JACKaudiooutput.h"
-
- Master *jackmaster;
- jack_client_t *jackclient;
- char jackname[100];
-+#ifdef USE_JACKMIDI
- jack_port_t *outport_left,*outport_right,*midi_inport;
-+#else
-+jack_port_t *outport_left,*outport_right;
-+#endif
-
- int jackprocess(jack_nframes_t nframes,void *arg);
- int jacksrate(jack_nframes_t nframes,void *arg);
-@@ -61,8 +67,10 @@
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
- outport_right=jack_port_register(jackclient,"out_2",
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
-+#ifdef USE_JACKMIDI
- midi_inport=jack_port_register(jackclient,"midi_input",
- JACK_DEFAULT_MIDI_TYPE,JackPortIsInput|JackPortIsTerminal,0);
-+#endif
-
- if (jack_activate(jackclient)){
- fprintf(stderr,"Cannot activate jack client\n");
-@@ -81,7 +89,9 @@
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
-
- if (!pthread_mutex_trylock(&jackmaster->mutex)) {
-+#ifdef USE_JACKMIDI
- JACKhandlemidi(nframes);
-+#endif
- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
- pthread_mutex_unlock(&jackmaster->mutex);
- }
-@@ -106,6 +116,7 @@
- };
-
-
-+#ifdef USE_JACKMIDI
- void JACKhandlemidi(unsigned long frames) {
-
- // We must have the master mutex before we run this function
-@@ -154,6 +165,7 @@
- }
-
- }
-+#endif
-
-
- const char* JACKgetname() {
---- a/src/Output/JACKaudiooutput.h 2007-01-02 13:53:28.000000000 +0100
-+++ b/src/Output/JACKaudiooutput.h 2007-01-02 13:53:28.000000000 +0100
-@@ -40,7 +40,9 @@
-
- bool JACKaudiooutputinit(Master *master_);
- void JACKfinish();
-+#ifdef USE_JACKMIDI
- void JACKhandlemidi(unsigned long frames);
-+#endif
- const char* JACKgetname();
-
- #endif
---- a/src/Makefile.inc.org 2007-01-02 14:50:46.000000000 +0100
-+++ b/src/Makefile.inc 2007-01-02 15:11:52.000000000 +0100
-@@ -46,6 +46,10 @@
- LINUX_USE_LASH=YES
- #LINUX_USE_LASH=NO
-
-+#Next line sets if Jackmidi support will be enabled
-+LINUX_USE_JACKMIDI=NO
-+#LINUX_USE_JACKMIDI=YES
-+
- # W I N D O W S C O N F I G U R A T I O N
-
- #Next line sets the midi input
---- a/src/Makefile 2007-01-02 13:54:47.000000000 +0100
-+++ b/src/Makefile 2007-01-02 15:28:36.000000000 +0100
-@@ -75,6 +75,10 @@
- LIBS+= `pkg-config --libs lash-1.0`
- endif
-
-+ifeq ($(LINUX_USE_JACKMIDI),YES)
-+CXXFLAGS += -DUSE_JACKMIDI
-+endif
-+
-
- objects=main.o
- SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/unzombify.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/unzombify.diff 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/unzombify.diff 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,22 +0,0 @@
---- src/Output/JACKaudiooutput.C 2006-05-23 00:42:21.000000000 +0200
-+++ src/Output/JACKaudiooutput.C 2006-05-31 21:01:28.000000000 +0200
-@@ -87,10 +87,15 @@
- jack_default_audio_sample_t *outl=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_left, nframes);
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
-
-- pthread_mutex_lock(&jackmaster->mutex);
-- JACKhandlemidi(nframes);
-- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
-- pthread_mutex_unlock(&jackmaster->mutex);
-+ if (!pthread_mutex_trylock(&jackmaster->mutex)) {
-+ JACKhandlemidi(nframes);
-+ jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
-+ pthread_mutex_unlock(&jackmaster->mutex);
-+ }
-+ else {
-+ memset(outl, 0, sizeof(jack_default_audio_sample_t) * nframes);
-+ memset(outr, 0, sizeof(jack_default_audio_sample_t) * nframes);
-+ }
-
- return(0);
- };
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-jackmidi-051205.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-jackmidi-051205.diff 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-jackmidi-051205.diff 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,114 +0,0 @@
-diff -ru ZynAddSubFX-2.2.1/src/Makefile.inc ZynAddSubFX-2.2.1-jackmidi/src/Makefile.inc
---- ZynAddSubFX-2.2.1/src/Makefile.inc 2005-04-28 02:21:35.000000000 +0200
-+++ ZynAddSubFX-2.2.1-jackmidi/src/Makefile.inc 2005-10-02 15:09:53.000000000 +0200
-@@ -29,9 +29,9 @@
- #parameters (run 'zynaddsubfx --help' for help)
-
- #LINUX_AUDIOOUT=OSS_AND_JACK
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-diff -ru ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C ZynAddSubFX-2.2.1-jackmidi/src/Output/JACKaudiooutput.C
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-jackmidi/src/Output/JACKaudiooutput.C 2005-10-02 15:08:48.000000000 +0200
-@@ -21,11 +21,14 @@
- */
-
- #include <stdlib.h>
-+extern "C" {
-+#include <jack/midiport.h>
-+}
- #include "JACKaudiooutput.h"
-
- Master *jackmaster;
- jack_client_t *jackclient;
--jack_port_t *outport_left,*outport_right;
-+jack_port_t *outport_left,*outport_right,*midi_inport;
-
- int jackprocess(jack_nframes_t nframes,void *arg);
- int jacksrate(jack_nframes_t nframes,void *arg);
-@@ -60,6 +63,8 @@
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
- outport_right=jack_port_register(jackclient,"out_2",
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
-+ midi_inport=jack_port_register(jackclient,"midi_input",
-+ JACK_DEFAULT_MIDI_TYPE,JackPortIsInput|JackPortIsTerminal,0);
-
- if (jack_activate(jackclient)){
- fprintf(stderr,"Cannot activate jack client\n");
-@@ -78,6 +83,7 @@
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
-
- pthread_mutex_lock(&jackmaster->mutex);
-+ JACKhandlemidi(nframes);
- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
- pthread_mutex_unlock(&jackmaster->mutex);
-
-@@ -97,4 +103,51 @@
- };
-
-
-+void JACKhandlemidi(unsigned long frames) {
-+
-+ // We must have the master mutex before we run this function
-+
-+ // XXX This is really nasty, not only do we lose the sample accuracy of
-+ // JACK MIDI, but any accuracy at all below the buffer size
-+
-+ void* midi_buf = jack_port_get_buffer(midi_inport, frames);
-+ jack_midi_event_t jack_midi_event;
-+ jack_nframes_t event_index = 0;
-+ jack_nframes_t event_count =
-+ jack_midi_port_get_info(midi_buf, frames)->event_count;
-+ unsigned char* midi_data;
-+ unsigned char type, chan;
-+
-+ while (event_index < event_count) {
-+
-+ jack_midi_event_get(&jack_midi_event, midi_buf, event_index, frames);
-+ midi_data = jack_midi_event.buffer;
-+ type = midi_data[0] & 0xF0;
-+ chan = midi_data[0] & 0x0F;
-+
-+ switch (type) {
-+
-+ case 0x80: /* note-off */
-+ jackmaster->NoteOff(chan, midi_data[1]);
-+ break;
-+
-+ case 0x90: /* note-on */
-+ jackmaster->NoteOn(chan, midi_data[1], midi_data[2]);
-+ break;
-+
-+ case 0xB0: /* controller */
-+ jackmaster->SetController(chan, midi_data[1], midi_data[2]);
-+ break;
-+
-+ case 0xE0: /* pitch bend */
-+ jackmaster->SetController(chan, C_pitchwheel,
-+ ((midi_data[2] << 7) | midi_data[1]));
-+ break;
-
-+ /* XXX TODO: handle MSB/LSB controllers and RPNs and NRPNs */
-+ }
-+
-+ event_index++;
-+ }
-+
-+}
-diff -ru ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h ZynAddSubFX-2.2.1-jackmidi/src/Output/JACKaudiooutput.h
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-jackmidi/src/Output/JACKaudiooutput.h 2005-10-02 14:40:05.000000000 +0200
-@@ -40,6 +40,7 @@
-
- bool JACKaudiooutputinit(Master *master_);
- void JACKfinish();
-+void JACKhandlemidi(unsigned long frames);
-
- #endif
-
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-lash-and-jackmidi-051205.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-lash-and-jackmidi-051205.diff 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn-lash-and-jackmidi-051205.diff 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,537 +0,0 @@
-diff -ruN ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Input/ALSAMidiIn.C
---- ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.C 2005-03-14 20:54:28.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Input/ALSAMidiIn.C 2005-10-02 13:51:35.000000000 +0200
-@@ -94,3 +94,14 @@
- };
-
-
-+int ALSAMidiIn::getalsaid() {
-+ if (midi_handle) {
-+ snd_seq_client_info_t* seq_info;
-+ snd_seq_client_info_malloc(&seq_info);
-+ snd_seq_get_client_info(midi_handle, seq_info);
-+ int id = snd_seq_client_info_get_client(seq_info);
-+ snd_seq_client_info_free(seq_info);
-+ return id;
-+ }
-+ return -1;
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Input/ALSAMidiIn.h
---- ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.h 2005-03-14 20:54:19.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Input/ALSAMidiIn.h 2005-10-02 13:51:35.000000000 +0200
-@@ -32,6 +32,7 @@
- ALSAMidiIn();
- ~ALSAMidiIn();
- void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams);
-+ int getalsaid();
-
- private:
- snd_seq_t *midi_handle;
-diff -ruN ZynAddSubFX-2.2.1/src/main.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/main.C
---- ZynAddSubFX-2.2.1/src/main.C 2005-04-28 02:15:28.000000000 +0200
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/main.C 2005-10-02 13:51:35.000000000 +0200
-@@ -83,6 +83,10 @@
- OSSaudiooutput *audioout;
- #endif
-
-+#include "Misc/LASHClient.h"
-+LASHClient *lash;
-+
-+
- MidiIn *Midi;
- int Pexitprogram=0;//if the UI set this to 1, the program will exit
-
-@@ -180,7 +184,20 @@
- void *thread3(void *arg){
- #ifndef DISABLE_GUI
- ui->showUI();
-- while (Pexitprogram==0) Fl::wait();
-+ while (Pexitprogram==0) {
-+ std::string filename;
-+ switch (lash->checkevents(filename)) {
-+ case LASHClient::Save:
-+ ui->do_save_master(const_cast<char*>(filename.c_str()));
-+ lash->confirmevent(LASHClient::Save);
-+ break;
-+ case LASHClient::Restore:
-+ ui->do_load_master(filename.c_str());
-+ lash->confirmevent(LASHClient::Restore);
-+ break;
-+ }
-+ Fl::wait();
-+ }
- #endif
- return(0);
- };
-@@ -312,6 +329,8 @@
- delete(Midi);
- delete(master);
-
-+ delete(lash);
-+
- // pthread_mutex_unlock(&master->mutex);
- delete(denormalkillbuf);
- delete(OscilGen::tmpsmps);
-@@ -345,6 +364,9 @@
-
- #ifndef VSTAUDIOOUT
- int main(int argc, char *argv[]){
-+
-+ lash = new LASHClient(&argc, &argv, &Pexitprogram);
-+
- config.init();
- int noui=0;
- #ifdef JACKAUDIOOUT
-@@ -488,7 +510,13 @@
- //---------
-
- initprogram();
--
-+
-+ ALSAMidiIn* alsamidi = dynamic_cast<ALSAMidiIn*>(Midi);
-+ if (alsamidi) {
-+ lash->setalsaid(alsamidi->getalsaid());
-+ lash->setjackname(JACKgetname());
-+ }
-+
- if (strlen(loadfile)>1){
- int tmp=master->loadXML(loadfile);
- if (tmp<0) {
-diff -ruN ZynAddSubFX-2.2.1/src/Makefile ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Makefile
---- ZynAddSubFX-2.2.1/src/Makefile 2005-04-28 01:45:52.000000000 +0200
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Makefile 2005-10-02 13:51:35.000000000 +0200
-@@ -70,6 +70,9 @@
- LIBS+= `pkg-config --libs jack`
- endif
-
-+CXXFLAGS += `pkg-config --cflags lash-1.0`
-+LIBS += `pkg-config --libs lash-1.0`
-+
- objects=main.o
- SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
-
-diff -ruN ZynAddSubFX-2.2.1/src/Makefile.inc ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Makefile.inc
---- ZynAddSubFX-2.2.1/src/Makefile.inc 2005-04-28 02:21:35.000000000 +0200
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Makefile.inc 2005-10-02 13:51:35.000000000 +0200
-@@ -29,9 +29,9 @@
- #parameters (run 'zynaddsubfx --help' for help)
-
- #LINUX_AUDIOOUT=OSS_AND_JACK
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/lash/lash.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/lash/lash.h
---- ZynAddSubFX-2.2.1/src/Misc/lash/lash.h 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/lash/lash.h 2005-10-02 13:51:35.000000000 +0200
-@@ -0,0 +1 @@
-+dummy
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/LASHClient.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/LASHClient.C
---- ZynAddSubFX-2.2.1/src/Misc/LASHClient.C 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/LASHClient.C 2005-10-02 13:56:16.000000000 +0200
-@@ -0,0 +1,78 @@
-+#include <unistd.h>
-+#include <iostream>
-+#include <string>
-+
-+#include "LASHClient.h"
-+
-+
-+LASHClient::LASHClient(int* argc, char*** argv, int* exitflag) {
-+ this->exitflag = exitflag;
-+ client = lash_init(lash_extract_args(argc, argv), "ZynAddSubFX",
-+ LASH_Config_File, LASH_PROTOCOL(2, 0));
-+ lash_event_t* event = lash_event_new_with_type(LASH_Client_Name);
-+ lash_event_set_string(event, "ZynAddSubFX");
-+ lash_send_event(client, event);
-+}
-+
-+
-+void LASHClient::setalsaid(int id) {
-+ if (lash_enabled(client)) {
-+ if (id != -1)
-+ lash_alsa_client_id(client, id);
-+ }
-+}
-+
-+
-+void LASHClient::setjackname(const char* name) {
-+ if (lash_enabled(client)) {
-+ if (name != NULL)
-+ lash_jack_client_name(client, name);
-+ }
-+}
-+
-+
-+LASHClient::Event LASHClient::checkevents(std::string& filename) {
-+
-+ if (!lash_enabled(client))
-+ return NoEvent;
-+
-+ Event received = NoEvent;
-+ lash_event_t* event;
-+ while (event = lash_get_event(client)) {
-+
-+ // save
-+ if (lash_event_get_type(event) == LASH_Save_File) {
-+ std::cerr<<"LASH event: LASH_Save_File"<<std::endl;
-+ filename = std::string(lash_event_get_string(event)) + "/master.xmz";
-+ received = Save;
-+ break;
-+ }
-+
-+ // restore
-+ else if (lash_event_get_type(event) == LASH_Restore_File) {
-+ std::cerr<<"LASH event: LASH_Restore_File"<<std::endl;
-+ filename = std::string(lash_event_get_string(event)) + "/master.xmz";
-+ received = Restore;
-+ break;
-+ }
-+
-+ // quit
-+ else if (lash_event_get_type(event) == LASH_Quit) {
-+ std::cerr<<"LASH event: LASH_Quit"<<std::endl;
-+ *(exitflag) = 1;
-+ received = Quit;
-+ break;
-+ }
-+
-+ lash_event_destroy(event);
-+ }
-+ return received;
-+}
-+
-+
-+void LASHClient::confirmevent(Event event) {
-+ if (event == Save)
-+ lash_send_event(client, lash_event_new_with_type(LASH_Save_File));
-+ else if (event == Restore)
-+ lash_send_event(client, lash_event_new_with_type(LASH_Restore_File));
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/LASHClient.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/LASHClient.h
---- ZynAddSubFX-2.2.1/src/Misc/LASHClient.h 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/LASHClient.h 2005-10-02 13:51:35.000000000 +0200
-@@ -0,0 +1,35 @@
-+#ifndef LASHClient_h
-+#define LASHClient_h
-+
-+#include <string>
-+#include <pthread.h>
-+#include <lash/lash.h>
-+
-+
-+class LASHClient {
-+ public:
-+
-+ enum Event {
-+ Save,
-+ Restore,
-+ Quit,
-+ NoEvent
-+ };
-+
-+ LASHClient(int* argc, char*** argv, int* exitflag);
-+
-+ void setalsaid(int id);
-+ void setjackname(const char* name);
-+ Event checkevents(std::string& filename);
-+ void confirmevent(Event event);
-+
-+ private:
-+
-+ lash_client_t* client;
-+ pthread_t thread;
-+ int* exitflag;
-+};
-+
-+
-+#endif
-+
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Makefile ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Makefile
---- ZynAddSubFX-2.2.1/src/Misc/Makefile 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Makefile 2005-10-02 13:51:35.000000000 +0200
-@@ -1,6 +1,6 @@
- include ../Makefile.inc
-
--objects=Bank.o Master.o Microtonal.o Part.o Util.o Config.o Dump.o XMLwrapper.o
-+objects=Bank.o Master.o Microtonal.o Part.o Util.o Config.o Dump.o XMLwrapper.o LASHClient.o
-
-
- all: $(objects)
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Master.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Master.C
---- ZynAddSubFX-2.2.1/src/Misc/Master.C 2005-03-14 20:57:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Master.C 2005-10-02 13:51:35.000000000 +0200
-@@ -640,7 +640,7 @@
- delete(xml);
- };
-
--int Master::saveXML(char *filename){
-+int Master::saveXML(const char *filename){
- XMLwrapper *xml=new XMLwrapper();
-
- xml->beginbranch("MASTER");
-@@ -654,7 +654,7 @@
-
-
-
--int Master::loadXML(char *filename){
-+int Master::loadXML(const char *filename){
- XMLwrapper *xml=new XMLwrapper();
- if (xml->loadXMLfile(filename)<0) {
- delete(xml);
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Master.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Master.h
---- ZynAddSubFX-2.2.1/src/Misc/Master.h 2005-03-14 20:57:29.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/Master.h 2005-10-02 13:51:35.000000000 +0200
-@@ -43,7 +43,7 @@
-
- //saves all settings to a XML file
- //returns 0 for ok or <0 if there is an error
-- int saveXML(char *filename);
-+ int saveXML(const char *filename);
-
- //this adds the parameters to the XML data
- void add2XML(XMLwrapper *xml);
-@@ -53,7 +53,7 @@
-
- //loads all settings from a XML file
- //returns 0 for ok or -1 if there is an error
-- int loadXML(char *filename);
-+ int loadXML(const char *filename);
- void applyparameters();
-
- void getfromXML(XMLwrapper *xml);
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/XMLwrapper.C
---- ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.C 2005-04-13 00:09:34.000000000 +0200
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/XMLwrapper.C 2005-10-02 13:51:35.000000000 +0200
-@@ -162,7 +162,7 @@
-
- /* SAVE XML members */
-
--int XMLwrapper::saveXMLfile(char *filename){
-+int XMLwrapper::saveXMLfile(const char *filename){
- char *xmldata=getXMLdata();
- if (xmldata==NULL) return(-2);
-
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/XMLwrapper.h
---- ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.h 2005-03-14 20:57:17.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Misc/XMLwrapper.h 2005-10-02 13:51:35.000000000 +0200
-@@ -43,7 +43,7 @@
- /********************************/
-
- //returns 0 if ok or -1 if the file cannot be saved
-- int saveXMLfile(char *filename);
-+ int saveXMLfile(const char *filename);
-
- //returns the new allocated string that contains the XML data (used for clipboard)
- //the string is NULL terminated
-diff -ruN ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Output/JACKaudiooutput.C
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Output/JACKaudiooutput.C 2005-10-02 14:23:46.000000000 +0200
-@@ -21,11 +21,17 @@
- */
-
- #include <stdlib.h>
-+extern "C" {
-+#include <jack/midiport.h>
-+}
-+
- #include "JACKaudiooutput.h"
-
-+
- Master *jackmaster;
- jack_client_t *jackclient;
--jack_port_t *outport_left,*outport_right;
-+char jackname[100];
-+jack_port_t *outport_left,*outport_right,*midi_inport;
-
- int jackprocess(jack_nframes_t nframes,void *arg);
- int jacksrate(jack_nframes_t nframes,void *arg);
-@@ -34,12 +40,11 @@
- bool JACKaudiooutputinit(Master *master_){
- jackmaster=master_;
- jackclient=0;
-- char tmpstr[100];
-
- for (int i=0;i<15;i++){
-- if (i!=0) snprintf(tmpstr,100,"ZynAddSubFX_%d",i);
-- else snprintf(tmpstr,100,"ZynAddSubFX");
-- jackclient=jack_client_new(tmpstr);
-+ if (i!=0) snprintf(jackname,100,"ZynAddSubFX_%d",i);
-+ else snprintf(jackname,100,"ZynAddSubFX");
-+ jackclient=jack_client_new(jackname);
- if (jackclient!=0) break;
- };
-
-@@ -60,6 +65,8 @@
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
- outport_right=jack_port_register(jackclient,"out_2",
- JACK_DEFAULT_AUDIO_TYPE,JackPortIsOutput|JackPortIsTerminal,0);
-+ midi_inport=jack_port_register(jackclient,"midi_input",
-+ JACK_DEFAULT_MIDI_TYPE,JackPortIsInput|JackPortIsTerminal,0);
-
- if (jack_activate(jackclient)){
- fprintf(stderr,"Cannot activate jack client\n");
-@@ -78,6 +85,7 @@
- jack_default_audio_sample_t *outr=(jack_default_audio_sample_t *) jack_port_get_buffer (outport_right, nframes);
-
- pthread_mutex_lock(&jackmaster->mutex);
-+ JACKhandlemidi(nframes);
- jackmaster->GetAudioOutSamples(nframes,jack_get_sample_rate(jackclient),outl,outr);
- pthread_mutex_unlock(&jackmaster->mutex);
-
-@@ -97,4 +105,58 @@
- };
-
-
-+const char* JACKgetname() {
-+ if (jackclient != NULL)
-+ return jackname;
-+ return NULL;
-+}
-+
-+
-+void JACKhandlemidi(unsigned long frames) {
-+
-+ // We must have the master mutex before we run this function
-+
-+ // XXX This is really nasty, not only do we lose the sample accuracy of
-+ // JACK MIDI, but any accuracy at all below the buffer size
-+
-+ void* midi_buf = jack_port_get_buffer(midi_inport, frames);
-+ jack_midi_event_t jack_midi_event;
-+ jack_nframes_t event_index = 0;
-+ jack_nframes_t event_count =
-+ jack_midi_port_get_info(midi_buf, frames)->event_count;
-+ unsigned char* midi_data;
-+ unsigned char type, chan;
-+
-+ while (event_index < event_count) {
-+
-+ jack_midi_event_get(&jack_midi_event, midi_buf, event_index, frames);
-+ midi_data = jack_midi_event.buffer;
-+ type = midi_data[0] & 0xF0;
-+ chan = midi_data[0] & 0x0F;
-+
-+ switch (type) {
-+
-+ case 0x80: /* note-off */
-+ jackmaster->NoteOff(chan, midi_data[1]);
-+ break;
-+
-+ case 0x90: /* note-on */
-+ jackmaster->NoteOn(chan, midi_data[1], midi_data[2]);
-+ break;
-+
-+ case 0xB0: /* controller */
-+ jackmaster->SetController(chan, midi_data[1], midi_data[2]);
-+ break;
-+
-+ case 0xE0: /* pitch bend */
-+ jackmaster->SetController(chan, C_pitchwheel,
-+ ((midi_data[2] << 7) | midi_data[1]));
-+ break;
-
-+ /* XXX TODO: handle MSB/LSB controllers and RPNs and NRPNs */
-+ }
-+
-+ event_index++;
-+ }
-+
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Output/JACKaudiooutput.h
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/Output/JACKaudiooutput.h 2005-10-02 14:05:34.000000000 +0200
-@@ -40,6 +40,8 @@
-
- bool JACKaudiooutputinit(Master *master_);
- void JACKfinish();
-+const char* JACKgetname();
-+void JACKhandlemidi(unsigned long frames);
-
- #endif
-
-diff -ruN ZynAddSubFX-2.2.1/src/UI/MasterUI.fl ZynAddSubFX-2.2.1-lash-and-jackmidi/src/UI/MasterUI.fl
---- ZynAddSubFX-2.2.1/src/UI/MasterUI.fl 2005-04-08 21:50:53.000000000 +0200
-+++ ZynAddSubFX-2.2.1-lash-and-jackmidi/src/UI/MasterUI.fl 2005-10-02 13:51:35.000000000 +0200
-@@ -413,7 +413,8 @@
- decl {BankUI *bankui;} {}
- }
-
--class MasterUI {} {
-+class MasterUI {open
-+} {
- Function {make_window()} {} {
- Fl_Window masterwindow {
- label zynaddsubfx
-@@ -424,7 +425,7 @@
- config.save();
- *exitprogram=1;
- };
--\#endif} selected
-+\#endif}
- xywh {353 127 390 465} type Double hide
- } {
- Fl_Menu_Bar mastermenu {
-@@ -1701,11 +1702,16 @@
-
- updatepanel();} {}
- }
-- Function {do_load_master()} {} {
-- code {char *filename;
--filename=fl_file_chooser("Open:","({*.xmz})",NULL,0);
--if (filename==NULL) return;
--
-+ Function {do_load_master(const char* file = NULL)} {selected
-+ } {
-+ code {const char *filename;
-+ if (file == NULL) {
-+ filename=fl_file_chooser("Open:","({*.xmz})",NULL,0);
-+ if (filename==NULL) return;
-+ }
-+ else {
-+ filename = file;
-+ }
-
- pthread_mutex_lock(&master->mutex);
- //clear all parameters
-@@ -1725,20 +1731,23 @@
- if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not a zynaddsubfx parameters file.");
- else if (result<0) fl_alert("Error: Could not load the file.");} {}
- }
-- Function {do_save_master()} {} {
-+ Function {do_save_master(char* file = NULL)} {} {
- code {char *filename;
--int result=0;
--
--filename=fl_file_chooser("Save:","({*.xmz})",NULL,0);
--if (filename==NULL) return;
--filename=fl_filename_setext(filename,".xmz");
--
--result=fileexists(filename);
--if (result) {
-- result=0;
-- if (!fl_ask("The file exists. \\nOverwrite it?")) return;
--
--};
-+ int result=0;
-+ if (file == NULL) {
-+ filename=fl_file_chooser("Save:","({*.xmz})",NULL,0);
-+ if (filename==NULL) return;
-+ filename=fl_filename_setext(filename,".xmz");
-+ result=fileexists(filename);
-+ if (result) {
-+ result=0;
-+ if (!fl_ask("The file exists. Overwrite it?")) return;
-+
-+ }
-+ }
-+ else {
-+ filename = file;
-+ }
-
-
- pthread_mutex_lock(&master->mutex);
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn_lash-0.5.0pre0.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn_lash-0.5.0pre0.diff 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zyn_lash-0.5.0pre0.diff 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,541 +0,0 @@
-diff -ruN ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.C ZynAddSubFX-2.2.1_lash/src/Input/ALSAMidiIn.C
---- ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.C 2005-03-14 20:54:28.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Input/ALSAMidiIn.C 2005-09-07 10:49:26.397827208 +0200
-@@ -94,3 +94,14 @@
- };
-
-
-+int ALSAMidiIn::getalsaid() {
-+ if (midi_handle) {
-+ snd_seq_client_info_t* seq_info;
-+ snd_seq_client_info_malloc(&seq_info);
-+ snd_seq_get_client_info(midi_handle, seq_info);
-+ int id = snd_seq_client_info_get_client(seq_info);
-+ snd_seq_client_info_free(seq_info);
-+ return id;
-+ }
-+ return -1;
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.h ZynAddSubFX-2.2.1_lash/src/Input/ALSAMidiIn.h
---- ZynAddSubFX-2.2.1/src/Input/ALSAMidiIn.h 2005-03-14 20:54:19.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Input/ALSAMidiIn.h 2005-09-07 10:49:26.398827014 +0200
-@@ -32,6 +32,7 @@
- ALSAMidiIn();
- ~ALSAMidiIn();
- void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams);
-+ int getalsaid();
-
- private:
- snd_seq_t *midi_handle;
-diff -ruN ZynAddSubFX-2.2.1/src/main.C ZynAddSubFX-2.2.1_lash/src/main.C
---- ZynAddSubFX-2.2.1/src/main.C 2005-04-28 02:15:28.000000000 +0200
-+++ ZynAddSubFX-2.2.1_lash/src/main.C 2005-09-07 10:49:26.398827014 +0200
-@@ -83,6 +83,10 @@
- OSSaudiooutput *audioout;
- #endif
-
-+#include "Misc/LASHClient.h"
-+LASHClient *lash;
-+
-+
- MidiIn *Midi;
- int Pexitprogram=0;//if the UI set this to 1, the program will exit
-
-@@ -180,7 +184,20 @@
- void *thread3(void *arg){
- #ifndef DISABLE_GUI
- ui->showUI();
-- while (Pexitprogram==0) Fl::wait();
-+ while (Pexitprogram==0) {
-+ std::string filename;
-+ switch (lash->checkevents(filename)) {
-+ case LASHClient::Save:
-+ ui->do_save_master(const_cast<char*>(filename.c_str()));
-+ lash->confirmevent(LASHClient::Save);
-+ break;
-+ case LASHClient::Restore:
-+ ui->do_load_master(filename.c_str());
-+ lash->confirmevent(LASHClient::Restore);
-+ break;
-+ }
-+ Fl::wait();
-+ }
- #endif
- return(0);
- };
-@@ -312,6 +329,8 @@
- delete(Midi);
- delete(master);
-
-+ delete(lash);
-+
- // pthread_mutex_unlock(&master->mutex);
- delete(denormalkillbuf);
- delete(OscilGen::tmpsmps);
-@@ -345,6 +364,9 @@
-
- #ifndef VSTAUDIOOUT
- int main(int argc, char *argv[]){
-+
-+ lash = new LASHClient(&argc, &argv, &Pexitprogram);
-+
- config.init();
- int noui=0;
- #ifdef JACKAUDIOOUT
-@@ -488,7 +510,13 @@
- //---------
-
- initprogram();
--
-+
-+ ALSAMidiIn* alsamidi = dynamic_cast<ALSAMidiIn*>(Midi);
-+ if (alsamidi) {
-+ lash->setalsaid(alsamidi->getalsaid());
-+ lash->setjackname(JACKgetname());
-+ }
-+
- if (strlen(loadfile)>1){
- int tmp=master->loadXML(loadfile);
- if (tmp<0) {
-diff -ruN ZynAddSubFX-2.2.1/src/Makefile ZynAddSubFX-2.2.1_lash/src/Makefile
---- ZynAddSubFX-2.2.1/src/Makefile 2005-04-28 01:45:52.000000000 +0200
-+++ ZynAddSubFX-2.2.1_lash/src/Makefile 2005-09-07 10:49:26.399826821 +0200
-@@ -70,6 +70,9 @@
- LIBS+= `pkg-config --libs jack`
- endif
-
-+CXXFLAGS += `pkg-config --cflags lash-1.0`
-+LIBS += `pkg-config --libs lash-1.0`
-+
- objects=main.o
- SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
-
-diff -ruN ZynAddSubFX-2.2.1/src/Makefile.inc ZynAddSubFX-2.2.1_lash/src/Makefile.inc
---- ZynAddSubFX-2.2.1/src/Makefile.inc 2005-04-28 02:21:35.000000000 +0200
-+++ ZynAddSubFX-2.2.1_lash/src/Makefile.inc 2005-09-07 10:49:57.647780729 +0200
-@@ -29,9 +29,9 @@
- #parameters (run 'zynaddsubfx --help' for help)
-
- #LINUX_AUDIOOUT=OSS_AND_JACK
--LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
--#LINUX_AUDIOOUT=JACK
-+LINUX_AUDIOOUT=JACK
- #LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
- #for PortAudio (PA)
- #LINUX_AUDIOOUT=PA
-diff -ruN ZynAddSubFX-2.2.1/src/Makefile.inc~ ZynAddSubFX-2.2.1_lash/src/Makefile.inc~
---- ZynAddSubFX-2.2.1/src/Makefile.inc~ 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Makefile.inc~ 2005-04-28 02:21:35.000000000 +0200
-@@ -0,0 +1,80 @@
-+CXX=g++
-+
-+#You can set the on what OS is compiling (Linux/Windows)
-+OS_PORT=LINUX
-+#OS_PORT=WINDOWS
-+
-+#The version of the FFTW which is used (2 or 3)
-+#FFTW_VERSION=2
-+FFTW_VERSION=3
-+
-+#Assembler FLOAT to INT conversions
-+ASM_F2I=YES
-+#ASM_F2I=NO
-+
-+#Graphic user interface disable option (ZynAddSubFX will run only in text-mode)
-+#DISABLE_GUI=YES
-+DISABLE_GUI=NO
-+
-+# L I N U X C O N F I G U R A T I O N
-+#Next line sets the midi input. It can be "ALSA", "OSS" or "NONE".
-+LINUX_MIDIIN=ALSA
-+#LINUX_MIDIIN=OSS
-+#LINUX_MIDIIN=NONE
-+
-+#Next lines sets the audio output (OSS/JACK/PA)
-+#You may use only one at the time
-+#If you use "OSS_AND_JACK",,at runtime, zynaddsubfx will run by the default with jack support and
-+#it will try OSS if JACK fails. At runtime you can set the OSS by default by command-line
-+#parameters (run 'zynaddsubfx --help' for help)
-+
-+#LINUX_AUDIOOUT=OSS_AND_JACK
-+LINUX_AUDIOOUT=OSS
-+#LINUX_AUDIOOUT=NONE
-+#LINUX_AUDIOOUT=JACK
-+#LINUX_AUDIOOUT=JACK_RT JACK_RT support is broken
-+#for PortAudio (PA)
-+#LINUX_AUDIOOUT=PA
-+
-+
-+#Next line sets if the synth is compiled for DSSI plugin (as .so file)
-+#If this setting is "YES", MIDI in and AUDIOOUT are set automatically to DSSI
-+LINUX_DSSI=NO
-+#LINUX_DSSI=YES
-+
-+
-+# W I N D O W S C O N F I G U R A T I O N
-+
-+#Next line sets the midi input
-+#WINDOWS_MIDIIN=NONE
-+WINDOWS_MIDIIN=WIN
-+
-+#Next line sets the audio output
-+#WINDOWS_AUDIOOUT=NONE
-+WINDOWS_AUDIOOUT=PA
-+
-+#Next line sets if the synth is compiled for VST (as .dll file)
-+#If this setting is "YES", MIDI in and AUDIOOUT are set automatically to VST
-+WINDOWS_VST=NO
-+#WINDOWS_VST=YES
-+
-+#configuration end
-+
-+ifeq ($(OS_PORT),LINUX)
-+ MIDIIN=$(LINUX_MIDIIN)
-+ AUDIOOUT=$(LINUX_AUDIOOUT)
-+ WINDOWS_VST=NO
-+ ifeq ($(LINUX_DSSI),YES)
-+ MIDIIN=DSSI
-+ AUDIOOUT=DSSI
-+ endif
-+else
-+ MIDIIN=$(WINDOWS_MIDIIN)
-+ AUDIOOUT=$(WINDOWS_AUDIOOUT)
-+ LINUX_DSSI=NO
-+ ifeq ($(WINDOWS_VST),YES)
-+ MIDIIN=VST
-+ AUDIOOUT=VST
-+ endif
-+endif
-+
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/lash/lash.h ZynAddSubFX-2.2.1_lash/src/Misc/lash/lash.h
---- ZynAddSubFX-2.2.1/src/Misc/lash/lash.h 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/lash/lash.h 2005-09-07 10:52:49.060614466 +0200
-@@ -0,0 +1 @@
-+dummy
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/LASHClient.C ZynAddSubFX-2.2.1_lash/src/Misc/LASHClient.C
---- ZynAddSubFX-2.2.1/src/Misc/LASHClient.C 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/LASHClient.C 2005-09-07 10:49:26.399826821 +0200
-@@ -0,0 +1,75 @@
-+#include <unistd.h>
-+#include <iostream>
-+#include <string>
-+
-+#include "LASHClient.h"
-+
-+
-+LASHClient::LASHClient(int* argc, char*** argv, int* exitflag) {
-+ this->exitflag = exitflag;
-+ client = lash_init(lash_extract_args(argc, argv), "ZynAddSubFX",
-+ LASH_Config_File, LASH_PROTOCOL(2, 0));
-+}
-+
-+
-+void LASHClient::setalsaid(int id) {
-+ if (lash_enabled(client)) {
-+ if (id != -1)
-+ lash_alsa_client_id(client, id);
-+ }
-+}
-+
-+
-+void LASHClient::setjackname(const char* name) {
-+ if (lash_enabled(client)) {
-+ if (name != NULL)
-+ lash_jack_client_name(client, name);
-+ }
-+}
-+
-+
-+LASHClient::Event LASHClient::checkevents(std::string& filename) {
-+
-+ if (!lash_enabled(client))
-+ return NoEvent;
-+
-+ Event received = NoEvent;
-+ lash_event_t* event;
-+ while (event = lash_get_event(client)) {
-+
-+ // save
-+ if (lash_event_get_type(event) == LASH_Save_File) {
-+ std::cerr<<"LASH event: LASH_Save_File"<<std::endl;
-+ filename = std::string(lash_event_get_string(event)) + "/master.xmz";
-+ received = Save;
-+ break;
-+ }
-+
-+ // restore
-+ else if (lash_event_get_type(event) == LASH_Restore_File) {
-+ std::cerr<<"LASH event: LASH_Restore_File"<<std::endl;
-+ filename = std::string(lash_event_get_string(event)) + "/master.xmz";
-+ received = Restore;
-+ break;
-+ }
-+
-+ // quit
-+ else if (lash_event_get_type(event) == LASH_Quit) {
-+ std::cerr<<"LASH event: LASH_Quit"<<std::endl;
-+ *(exitflag) = 1;
-+ received = Quit;
-+ break;
-+ }
-+
-+ lash_event_destroy(event);
-+ }
-+ return received;
-+}
-+
-+
-+void LASHClient::confirmevent(Event event) {
-+ if (event == Save)
-+ lash_send_event(client, lash_event_new_with_type(LASH_Save_File));
-+ else if (event == Restore)
-+ lash_send_event(client, lash_event_new_with_type(LASH_Restore_File));
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/LASHClient.h ZynAddSubFX-2.2.1_lash/src/Misc/LASHClient.h
---- ZynAddSubFX-2.2.1/src/Misc/LASHClient.h 1970-01-01 01:00:00.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/LASHClient.h 2005-09-07 10:49:26.399826821 +0200
-@@ -0,0 +1,35 @@
-+#ifndef LASHClient_h
-+#define LASHClient_h
-+
-+#include <string>
-+#include <pthread.h>
-+#include <lash/lash.h>
-+
-+
-+class LASHClient {
-+ public:
-+
-+ enum Event {
-+ Save,
-+ Restore,
-+ Quit,
-+ NoEvent
-+ };
-+
-+ LASHClient(int* argc, char*** argv, int* exitflag);
-+
-+ void setalsaid(int id);
-+ void setjackname(const char* name);
-+ Event checkevents(std::string& filename);
-+ void confirmevent(Event event);
-+
-+ private:
-+
-+ lash_client_t* client;
-+ pthread_t thread;
-+ int* exitflag;
-+};
-+
-+
-+#endif
-+
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Makefile ZynAddSubFX-2.2.1_lash/src/Misc/Makefile
---- ZynAddSubFX-2.2.1/src/Misc/Makefile 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/Makefile 2005-09-07 10:49:26.400826628 +0200
-@@ -1,6 +1,6 @@
- include ../Makefile.inc
-
--objects=Bank.o Master.o Microtonal.o Part.o Util.o Config.o Dump.o XMLwrapper.o
-+objects=Bank.o Master.o Microtonal.o Part.o Util.o Config.o Dump.o XMLwrapper.o LASHClient.o
-
-
- all: $(objects)
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Master.C ZynAddSubFX-2.2.1_lash/src/Misc/Master.C
---- ZynAddSubFX-2.2.1/src/Misc/Master.C 2005-03-14 20:57:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/Master.C 2005-09-07 10:49:26.400826628 +0200
-@@ -640,7 +640,7 @@
- delete(xml);
- };
-
--int Master::saveXML(char *filename){
-+int Master::saveXML(const char *filename){
- XMLwrapper *xml=new XMLwrapper();
-
- xml->beginbranch("MASTER");
-@@ -654,7 +654,7 @@
-
-
-
--int Master::loadXML(char *filename){
-+int Master::loadXML(const char *filename){
- XMLwrapper *xml=new XMLwrapper();
- if (xml->loadXMLfile(filename)<0) {
- delete(xml);
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/Master.h ZynAddSubFX-2.2.1_lash/src/Misc/Master.h
---- ZynAddSubFX-2.2.1/src/Misc/Master.h 2005-03-14 20:57:29.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/Master.h 2005-09-07 10:49:26.401826434 +0200
-@@ -43,7 +43,7 @@
-
- //saves all settings to a XML file
- //returns 0 for ok or <0 if there is an error
-- int saveXML(char *filename);
-+ int saveXML(const char *filename);
-
- //this adds the parameters to the XML data
- void add2XML(XMLwrapper *xml);
-@@ -53,7 +53,7 @@
-
- //loads all settings from a XML file
- //returns 0 for ok or -1 if there is an error
-- int loadXML(char *filename);
-+ int loadXML(const char *filename);
- void applyparameters();
-
- void getfromXML(XMLwrapper *xml);
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.C ZynAddSubFX-2.2.1_lash/src/Misc/XMLwrapper.C
---- ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.C 2005-04-13 00:09:34.000000000 +0200
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/XMLwrapper.C 2005-09-07 10:49:26.401826434 +0200
-@@ -162,7 +162,7 @@
-
- /* SAVE XML members */
-
--int XMLwrapper::saveXMLfile(char *filename){
-+int XMLwrapper::saveXMLfile(const char *filename){
- char *xmldata=getXMLdata();
- if (xmldata==NULL) return(-2);
-
-diff -ruN ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.h ZynAddSubFX-2.2.1_lash/src/Misc/XMLwrapper.h
---- ZynAddSubFX-2.2.1/src/Misc/XMLwrapper.h 2005-03-14 20:57:17.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Misc/XMLwrapper.h 2005-09-07 10:49:26.402826241 +0200
-@@ -43,7 +43,7 @@
- /********************************/
-
- //returns 0 if ok or -1 if the file cannot be saved
-- int saveXMLfile(char *filename);
-+ int saveXMLfile(const char *filename);
-
- //returns the new allocated string that contains the XML data (used for clipboard)
- //the string is NULL terminated
-diff -ruN ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C ZynAddSubFX-2.2.1_lash/src/Output/JACKaudiooutput.C
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.C 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Output/JACKaudiooutput.C 2005-09-07 10:49:26.402826241 +0200
-@@ -25,6 +25,7 @@
-
- Master *jackmaster;
- jack_client_t *jackclient;
-+char jackname[100];
- jack_port_t *outport_left,*outport_right;
-
- int jackprocess(jack_nframes_t nframes,void *arg);
-@@ -34,12 +35,11 @@
- bool JACKaudiooutputinit(Master *master_){
- jackmaster=master_;
- jackclient=0;
-- char tmpstr[100];
-
- for (int i=0;i<15;i++){
-- if (i!=0) snprintf(tmpstr,100,"ZynAddSubFX_%d",i);
-- else snprintf(tmpstr,100,"ZynAddSubFX");
-- jackclient=jack_client_new(tmpstr);
-+ if (i!=0) snprintf(jackname,100,"ZynAddSubFX_%d",i);
-+ else snprintf(jackname,100,"ZynAddSubFX");
-+ jackclient=jack_client_new(jackname);
- if (jackclient!=0) break;
- };
-
-@@ -97,4 +97,8 @@
- };
-
-
--
-+const char* JACKgetname() {
-+ if (jackclient != NULL)
-+ return jackname;
-+ return NULL;
-+}
-diff -ruN ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h ZynAddSubFX-2.2.1_lash/src/Output/JACKaudiooutput.h
---- ZynAddSubFX-2.2.1/src/Output/JACKaudiooutput.h 2005-03-12 19:16:26.000000000 +0100
-+++ ZynAddSubFX-2.2.1_lash/src/Output/JACKaudiooutput.h 2005-09-07 10:49:26.402826241 +0200
-@@ -40,6 +40,8 @@
-
- bool JACKaudiooutputinit(Master *master_);
- void JACKfinish();
-+const char* JACKgetname();
-+
-
- #endif
-
-diff -ruN ZynAddSubFX-2.2.1/src/UI/MasterUI.fl ZynAddSubFX-2.2.1_lash/src/UI/MasterUI.fl
---- ZynAddSubFX-2.2.1/src/UI/MasterUI.fl 2005-04-08 21:50:53.000000000 +0200
-+++ ZynAddSubFX-2.2.1_lash/src/UI/MasterUI.fl 2005-09-07 10:49:26.404825854 +0200
-@@ -413,7 +413,8 @@
- decl {BankUI *bankui;} {}
- }
-
--class MasterUI {} {
-+class MasterUI {open
-+} {
- Function {make_window()} {} {
- Fl_Window masterwindow {
- label zynaddsubfx
-@@ -424,7 +425,7 @@
- config.save();
- *exitprogram=1;
- };
--\#endif} selected
-+\#endif}
- xywh {353 127 390 465} type Double hide
- } {
- Fl_Menu_Bar mastermenu {
-@@ -1701,11 +1702,16 @@
-
- updatepanel();} {}
- }
-- Function {do_load_master()} {} {
-- code {char *filename;
--filename=fl_file_chooser("Open:","({*.xmz})",NULL,0);
--if (filename==NULL) return;
--
-+ Function {do_load_master(const char* file = NULL)} {selected
-+ } {
-+ code {const char *filename;
-+ if (file == NULL) {
-+ filename=fl_file_chooser("Open:","({*.xmz})",NULL,0);
-+ if (filename==NULL) return;
-+ }
-+ else {
-+ filename = file;
-+ }
-
- pthread_mutex_lock(&master->mutex);
- //clear all parameters
-@@ -1725,20 +1731,23 @@
- if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not a zynaddsubfx parameters file.");
- else if (result<0) fl_alert("Error: Could not load the file.");} {}
- }
-- Function {do_save_master()} {} {
-+ Function {do_save_master(char* file = NULL)} {} {
- code {char *filename;
--int result=0;
--
--filename=fl_file_chooser("Save:","({*.xmz})",NULL,0);
--if (filename==NULL) return;
--filename=fl_filename_setext(filename,".xmz");
--
--result=fileexists(filename);
--if (result) {
-- result=0;
-- if (!fl_ask("The file exists. \\nOverwrite it?")) return;
--
--};
-+ int result=0;
-+ if (file == NULL) {
-+ filename=fl_file_chooser("Save:","({*.xmz})",NULL,0);
-+ if (filename==NULL) return;
-+ filename=fl_filename_setext(filename,".xmz");
-+ result=fileexists(filename);
-+ if (result) {
-+ result=0;
-+ if (!fl_ask("The file exists. Overwrite it?")) return;
-+
-+ }
-+ }
-+ else {
-+ filename = file;
-+ }
-
-
- pthread_mutex_lock(&master->mutex);
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,58 +0,0 @@
-Sounds hackish but that's the only way I found to force it to generate the
-functions in the .cxx files with fluid 1.3...
-
-Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl
-@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
-
- class BankProcess_ {} {
- Function {process()} {open return_type {virtual void}
-- } {}
-+ } {code{;}}
- decl {Bank *bank;} {public
- }
- }
-Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
-@@ -129,7 +129,7 @@ delete [] spc;} {selected
-
- class PSlider {: {public Fl_Slider}
- } {
-- Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
-+ Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
- Function {handle(int event)} {return_type int
- } {
- code {int X=x(),Y=y(),W=w(),H=h();
-Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl
-@@ -85,7 +85,7 @@ end();} {}
-
- class PartUI_ {} {
- Function {showparameters(int kititem,int engine)} {return_type virtual
-- } {}
-+ } {code{;}}
- }
-
- class PartKitItem {: {public Fl_Group}
-Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
-===================================================================
---- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl
-+++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
-@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
-
- class PresetsUI_ {} {
- Function {refresh()} {open return_type {virtual void}
-- } {}
-+ } {code{;}}
- Function {~PresetsUI_()} {open return_type virtual
-- } {}
-+ } {code{;}}
- }
-
- class PresetsUI {} {
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-docs.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-docs.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,12 +0,0 @@
-Index: ZynAddSubFX-2.4.1/CMakeLists.txt
-===================================================================
---- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
-+++ ZynAddSubFX-2.4.1/CMakeLists.txt
-@@ -5,7 +5,3 @@ project(zynaddsubfx)
- enable_testing()
- #Currently the only directory that uses cmake
- add_subdirectory(src)
--
--install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
-- DESTINATION share/doc/zynaddsubfx
-- )
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=437018
-
-Index: ZynAddSubFX-2.4.3/src/main.cpp
-===================================================================
---- ZynAddSubFX-2.4.3.orig/src/main.cpp
-+++ ZynAddSubFX-2.4.3/src/main.cpp
-@@ -37,8 +37,6 @@
- #include "Misc/Dump.h"
- extern Dump dump;
-
--#include <FL/Fl.H>
--
- //Nio System
- #include "Nio/Nio.h"
-
-@@ -51,6 +49,8 @@ QApplication *app;
-
- #elif defined FLTK_GUI
-
-+#include <FL/Fl.H>
-+
- #include "UI/MasterUI.h"
- #endif // FLTK_GUI
-
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r8.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils jackmidi
-RESTRICT="mirror"
-MY_P=ZynAddSubFX-${PV}
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-#IUSE="oss alsa jack mmx"
-IUSE="oss alsa jack jackmidi lash"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
- !jackmidi? ( media-sound/jack-audio-connection-kit )
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )"
-# portaudio? ( media-libs/portaudio )"
-
-RDEPEND="media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # jackmidi.eclass
- use jackmidi && need_jackmidi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.bz2 || die
- cd "${S}"
- use jackmidi && use lash && epatch \
- "${FILESDIR}/zyn-lash-and-jackmidi-051205.diff" \
- && epatch "${FILESDIR}/unzombify.diff"
- use jackmidi && use !lash && epatch "${FILESDIR}/zyn-jackmidi-051205.diff"
- use lash && use !jackmidi && epatch "${FILESDIR}/zyn_lash-0.5.0pre0.diff"
- # add our CXXFLAGS
- sed -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" src/Makefile
-}
-
-src_compile() {
- local FFTW_VERSION=3
- local ASM_F2I=NO
- local LINUX_MIDIIN=NONE
- local LINUX_AUDIOOUT=NONE
- local LINUX_USE_LASH=NO
-
- if use oss ; then
- LINUX_MIDIIN=OSS
- LINUX_AUDIOOUT=OSS
- use jack && LINUX_AUDIOOUT=OSS_AND_JACK
- else
- use jack && LINUX_AUDIOOUT=JACK
- fi
-
- use lash && LINUX_USE_LASH=YES
- use jackmidi && LINUX_USE_JACKMIDI=YES
- use alsa && LINUX_MIDIIN=ALSA
-# use portaudio && LINUX_AUDIOOUT=PA
-# use mmx && ASM_F2I=YES
-
- local myconf="FFTW_VERSION=${FFTW_VERSION}"
- myconf="${myconf} ASM_F2I=${ASM_F2I}"
- myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
- myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
- myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
- myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
-
- cd "${S}/src"
- echo "make ${myconf}" > gentoo_make_options # for easier debugging
- chmod +x gentoo_make_options
-
- emake ${myconf} || die "make failed with this options: ${myconf}"
-
- cd "${S}/ExternalPrograms/Spliter"
- ./compile.sh
- cd "${S}/ExternalPrograms/Controller"
- ./compile.sh
-}
-
-src_install() {
- dobin "${S}/src/zynaddsubfx"
- dobin "${S}/ExternalPrograms/Spliter/spliter"
- dobin "${S}/ExternalPrograms/Controller/controller"
- dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
- # -------- install examples presets
- [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${MY_PN}/presets
- doins "${S}/presets/"*
- insinto /usr/share/${MY_PN}/examples
- doins "${S}/examples/"*
- # --------
-
- mogrify -format png zynaddsubfx_icon.ico
- newicon "${S}/zynaddsubfx_icon.png" "zynaddsubfx_icon.png"
- make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
- "zynaddsubfx_icon.png" "AudioVideo;Audio"
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with the package zynaddsubfx-banks"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit exteutils
-RESTRICT="mirror"
-MY_P=ZynAddSubFX-${PV}
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2
- http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="oss alsa jack jackmidi lash mmx"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- media-sound/jack-audio-connection-kit
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )"
-
-RDEPEND="media-libs/zynaddsubfx-banks"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # add our CXXFLAGS
- cd src/
- esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
-}
-
-src_compile() {
- local FFTW_VERSION=3
- local ASM_F2I=NO
- local LINUX_MIDIIN=NONE
- local LINUX_AUDIOOUT=NONE
- local LINUX_USE_LASH=NO
-
- if use oss ; then
- LINUX_MIDIIN=OSS
- LINUX_AUDIOOUT=OSS
- use jack && LINUX_AUDIOOUT=OSS_AND_JACK
- else
- use jack && LINUX_AUDIOOUT=JACK
- fi
-
- use lash && LINUX_USE_LASH=YES
- use jackmidi && LINUX_USE_JACKMIDI=YES
- use alsa && LINUX_MIDIIN=ALSA
-# use portaudio && LINUX_AUDIOOUT=PA
- use mmx && ASM_F2I=YES
-
- local myconf="FFTW_VERSION=${FFTW_VERSION}"
- myconf="${myconf} ASM_F2I=${ASM_F2I}"
- myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
- myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
- myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
- myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
-
- cd "${S}/src"
- echo "make ${myconf}" > gentoo_make_options # for easier debugging
- chmod +x gentoo_make_options
-
- emake ${myconf} || die "make failed with this options: ${myconf}"
-
- cd "${S}/ExternalPrograms/Spliter"
- emake || die "emake Spliter failed"
- cd "${S}/ExternalPrograms/Controller"
- emake || die "emake Controller failed"
-}
-
-src_install() {
- dobin "${S}/src/zynaddsubfx"
- dobin "${S}/ExternalPrograms/Spliter/spliter"
- dobin "${S}/ExternalPrograms/Controller/controller"
- dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
- # -------- install examples presets
- [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${MY_PN}/presets
- doins "${WORKDIR}/presets/"*
- insinto /usr/share/${MY_PN}/examples
- doins "${WORKDIR}/examples/"*
- # --------
-
- doman zynaddsubfx.1
- newicon "${S}/zynaddsubfx.xpm" "zynaddsubfx.xpm"
- make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
- "zynaddsubfx.xpm" "AudioVideo;Audio"
-
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with the package zynaddsubfx-banks"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-inherit eutils cmake-utils
-
-MY_P=ZynAddSubFX-${PV}
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
- sci-libs/fftw:3.0
- alsa? ( media-libs/alsa-lib )
- fltk? ( >=x11-libs/fltk-1.3:1 )
- jack? ( media-sound/jack-audio-connection-kit )
- lash? ( virtual/liblash )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.3-docs.patch
- "${FILESDIR}"/${PN}-2.4.3-nofltk.patch
-)
-
-DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
-
-src_configure() {
- use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
- mycmakeargs=(
- `use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
- `use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
- `use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
- `use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- insinto /usr/share/${PN}
- doins -r "${S}"/instruments/*
-}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707-r1.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit exteutils jackmidi
-RESTRICT="mirror"
-MY_P=ZynAddSubFX-${PV}
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-zyn_patches="zynaddsubfx-patches-2.tar.gz"
-SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/${MY_P}.tar.bz2
- http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2
- http://download.tuxfamily.org/proaudio/distfiles/$zyn_patches";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-#IUSE="oss alsa jack mmx"
-IUSE="oss alsa jack jackmidi lash mmx"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- media-sound/jack-audio-connection-kit
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )"
-# portaudio? ( media-libs/portaudio )"
-
-RDEPEND="media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
-
-S="${WORKDIR}/${MY_P}"
-
-#pkg_setup() {
-# # jackmidi.eclass
-# use jackmidi && need_jackmidi
-#}
-
-src_unpack() {
- unpack ${MY_P}.tar.bz2 || die
- cd "${S}"
- unpack "zynaddsubfx-presets-0.1.tar.bz2"
- # add our CXXFLAGS
- cd src/
- esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
- esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C
-}
-
-src_compile() {
- local FFTW_VERSION=3
- local ASM_F2I=NO
- local LINUX_MIDIIN=NONE
- local LINUX_AUDIOOUT=NONE
- local LINUX_USE_LASH=NO
-
- if use oss ; then
- LINUX_MIDIIN=OSS
- LINUX_AUDIOOUT=OSS
- use jack && LINUX_AUDIOOUT=OSS_AND_JACK
- else
- use jack && LINUX_AUDIOOUT=JACK
- fi
-
- use lash && LINUX_USE_LASH=YES
- use jackmidi && LINUX_USE_JACKMIDI=YES
- use alsa && LINUX_MIDIIN=ALSA
-# use portaudio && LINUX_AUDIOOUT=PA
- use mmx && ASM_F2I=YES
-
- local myconf="FFTW_VERSION=${FFTW_VERSION}"
- myconf="${myconf} ASM_F2I=${ASM_F2I}"
- myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
- myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
- myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
- myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
-
- cd "${S}/src"
- echo "make ${myconf}" > gentoo_make_options # for easier debugging
- chmod +x gentoo_make_options
-
- emake ${myconf} || die "make failed with this options: ${myconf}"
-
- cd "${S}/ExternalPrograms/Spliter"
- ./compile.sh
- cd "${S}/ExternalPrograms/Controller"
- ./compile.sh
-}
-
-src_install() {
- dobin "${S}/src/zynaddsubfx"
- dobin "${S}/ExternalPrograms/Spliter/spliter"
- dobin "${S}/ExternalPrograms/Controller/controller"
- dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
- # -------- install examples presets
- [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${MY_PN}/presets
- doins "${S}/presets/"*
- insinto /usr/share/${MY_PN}/examples
- doins "${S}/examples/"*
- # --------
-
- doman zynaddsubfx.1
- newicon "${S}/zynaddsubfx.xpm" "zynaddsubfx.xpm"
- make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
- "zynaddsubfx.xpm" "AudioVideo;Audio"
-
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with the package zynaddsubfx-banks"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-20070707.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit exteutils jackmidi
-RESTRICT="mirror"
-MY_P=ZynAddSubFX-${PV}
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/${MY_P}.tar.bz2
- http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-#IUSE="oss alsa jack mmx"
-IUSE="oss alsa jack jackmidi lash mmx"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- media-sound/jack-audio-connection-kit
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )"
-# portaudio? ( media-libs/portaudio )"
-
-RDEPEND="media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # jackmidi.eclass
- use jackmidi && need_jackmidi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.bz2 || die
- cd "${S}"
- unpack "zynaddsubfx-presets-0.1.tar.bz2"
- # add our CXXFLAGS
- cd src/
- esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
- esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C
-}
-
-src_compile() {
- local FFTW_VERSION=3
- local ASM_F2I=NO
- local LINUX_MIDIIN=NONE
- local LINUX_AUDIOOUT=NONE
- local LINUX_USE_LASH=NO
-
- if use oss ; then
- LINUX_MIDIIN=OSS
- LINUX_AUDIOOUT=OSS
- use jack && LINUX_AUDIOOUT=OSS_AND_JACK
- else
- use jack && LINUX_AUDIOOUT=JACK
- fi
-
- use lash && LINUX_USE_LASH=YES
- use jackmidi && LINUX_USE_JACKMIDI=YES
- use alsa && LINUX_MIDIIN=ALSA
-# use portaudio && LINUX_AUDIOOUT=PA
- use mmx && ASM_F2I=YES
-
- local myconf="FFTW_VERSION=${FFTW_VERSION}"
- myconf="${myconf} ASM_F2I=${ASM_F2I}"
- myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
- myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
- myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
- myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
-
- cd "${S}/src"
- echo "make ${myconf}" > gentoo_make_options # for easier debugging
- chmod +x gentoo_make_options
-
- emake ${myconf} || die "make failed with this options: ${myconf}"
-
- cd "${S}/ExternalPrograms/Spliter"
- ./compile.sh
- cd "${S}/ExternalPrograms/Controller"
- ./compile.sh
-}
-
-src_install() {
- dobin "${S}/src/zynaddsubfx"
- dobin "${S}/ExternalPrograms/Spliter/spliter"
- dobin "${S}/ExternalPrograms/Controller/controller"
- dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
- # -------- install examples presets
- [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${MY_PN}/presets
- doins "${S}/presets/"*
- insinto /usr/share/${MY_PN}/examples
- doins "${S}/examples/"*
- # --------
-
- mogrify -format png zynaddsubfx_icon.ico
- newicon "${S}/zynaddsubfx_icon.png" "zynaddsubfx_icon.png"
- make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
- "zynaddsubfx_icon.png" "AudioVideo;Audio"
-
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with the package zynaddsubfx-banks"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}
Added: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils exteutils git-r3 jackmidi
+#patcher toolchain-funcs jackmidi
+RESTRICT="mirror"
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
+SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
+
+EGIT_REPO_URI="git://git.code.sf.net/p/zynaddsubfx/code"
+EGIT_SUBMODULES=( '*' )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="oss alsa jack jackmidi lash portaudio"
+
+DEPEND=">=x11-libs/fltk-1.1.2
+ =sci-libs/fftw-3*
+ jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
+ !jackmidi? ( media-sound/jack-audio-connection-kit )
+ >=dev-libs/mini-xml-2.2.1
+ lash? ( virtual/liblash )
+ portaudio? ( media-libs/portaudio )"
+
+RDEPEND="!media-libs/zynaddsubfx-banks
+ !media-sound/zynaddsubfx-cvs"
+
+PATCHES=( "${FILESDIR}/gnustd.diff" )
+
+#pkg_setup() {
+ # jackmidi.eclass
+# use jackmidi && need_jackmidi
+#}
+
+src_unpack() {
+ git-r3_src_unpack
+ unpack "zynaddsubfx-presets-0.1.tar.bz2"
+}
+
+src_configure() {
+ # the last used flag is used as default input and output
+ # it doesn't work, comment everything
+# INPUT="null"
+# OUTPUT="null"
+# if use oss ; then
+# WOSS="1"
+# INPUT="oss"
+# OUTPUT="oss"
+# else
+# WOSS="0"
+# fi
+# if use portaudio ; then
+# WPA="1"
+# OUTPUT="portaudio"
+# else
+# WPA="0"
+# fi
+# if use alsa ; then
+# WALSA="1"
+# INPUT="alsa"
+# OUTPUT="alsa"
+# else
+# WALSA="0"
+# fi
+# if use jack ; then
+# WJACK="1"
+# INPUT="jack"
+# OUTPUT="jack"
+# else
+# WJACK="0"
+# fi
+
+# local mycmakeargs=(
+# -OssEnable="${WOSS}"
+# -PaEnable="${WPA}"
+# -AlsaEnable="${WALSA}"
+# -JackEnable="${WJACK}"
+# -DefaultInput="${INPUT}"
+# -DefaultOuput="${OUTPUT}"
+# )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ cd "${S}"/ExternalPrograms/Spliter
+ emake
+ cd "${S}"/ExternalPrograms/Controller
+ emake
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # -------- install examples presets
+## [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
+ insinto /usr/share/${PN}/presets
+ doins "${WORKDIR}/presets/"*
+ insinto /usr/share/${PN}/examples
+ doins "${WORKDIR}/examples/"*
+ doins "${S}/instruments/examples/"*
+ # --------
+}
+
+pkg_postinst() {
+ einfo "Banks are now provided with this package"
+ einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
+}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils exteutils git-r3 jackmidi
-#patcher toolchain-funcs jackmidi
-RESTRICT="mirror"
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
-
-EGIT_REPO_URI="git://git.code.sf.net/p/zynaddsubfx/code"
-EGIT_SUBMODULES=( '*' )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="oss alsa jack jackmidi lash portaudio"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
- !jackmidi? ( media-sound/jack-audio-connection-kit )
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )
- portaudio? ( media-libs/portaudio )"
-
-RDEPEND="!media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
-
-PATCHES=( "${FILESDIR}/gnustd.diff" )
-
-#pkg_setup() {
- # jackmidi.eclass
-# use jackmidi && need_jackmidi
-#}
-
-src_unpack() {
- git-r3_src_unpack
- unpack "zynaddsubfx-presets-0.1.tar.bz2"
-}
-
-src_configure() {
- # the last used flag is used as default input and output
- # it doesn't work, comment everything
-# INPUT="null"
-# OUTPUT="null"
-# if use oss ; then
-# WOSS="1"
-# INPUT="oss"
-# OUTPUT="oss"
-# else
-# WOSS="0"
-# fi
-# if use portaudio ; then
-# WPA="1"
-# OUTPUT="portaudio"
-# else
-# WPA="0"
-# fi
-# if use alsa ; then
-# WALSA="1"
-# INPUT="alsa"
-# OUTPUT="alsa"
-# else
-# WALSA="0"
-# fi
-# if use jack ; then
-# WJACK="1"
-# INPUT="jack"
-# OUTPUT="jack"
-# else
-# WJACK="0"
-# fi
-
-# local mycmakeargs=(
-# -OssEnable="${WOSS}"
-# -PaEnable="${WPA}"
-# -AlsaEnable="${WALSA}"
-# -JackEnable="${WJACK}"
-# -DefaultInput="${INPUT}"
-# -DefaultOuput="${OUTPUT}"
-# )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- cd "${S}"/ExternalPrograms/Spliter
- emake
- cd "${S}"/ExternalPrograms/Controller
- emake
-}
-
-src_install() {
- cmake-utils_src_install
-
- # -------- install examples presets
-## [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${PN}/presets
- doins "${WORKDIR}/presets/"*
- insinto /usr/share/${PN}/examples
- doins "${WORKDIR}/examples/"*
- doins "${S}/instruments/examples/"*
- # --------
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with this package"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}
Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
@@ -1,122 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit exteutils cvs patcher toolchain-funcs jackmidi
-RESTRICT="mirror"
-
-MY_P=ZynAddSubFX-${PV}
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/";
-SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
-
-ECVS_SERVER="zynaddsubfx.cvs.sourceforge.net:/cvsroot/zynaddsubfx"
-ECVS_MODULE="zynaddsubfx"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="oss alsa jack jackmidi lash"
-
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
- jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
- !jackmidi? ( media-sound/jack-audio-connection-kit )
- >=dev-libs/mini-xml-2.2.1
- lash? ( virtual/liblash )"
-
-RDEPEND="media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
-
-S=${WORKDIR}/${ECVS_MODULE}
-MY_PN="${PN/-cvs/}"
-
-pkg_setup() {
- # jackmidi.eclass
- use jackmidi && need_jackmidi
-}
-
-src_unpack() {
- cvs_src_unpack
- cd "${S}"
- patcher "${FILESDIR}/zynaddsubfx-2.4.1-fltk13.patch" -a -f
- patcher "${FILESDIR}/01-mutex-split.patch" -a -f
- patcher "${FILESDIR}/02-ifdef-jackmidi.patch" -a -f
-
- #fixup 01-mutex-split patch
- esed_check -i -e 's@\(applyparameters(\)true@\1@g' src/Params/PADnoteParameters.C
- cd "${S}"
- unpack "zynaddsubfx-presets-0.1.tar.bz2"
- cd src/
- # add our CXXFLAGS
- esed_check -i "s@\(CXXFLAGS.\+=.*OS_PORT.*\)@\1 ${CXXFLAGS}@g" Makefile
- esed_check -i "s@&master->mutex@\&master->processMutex@g" main.C
- # add compiler and CFLAGS
- esed_check -i "s\gcc\\$(tc-getCC) ${CFLAGS}\g" "${S}/ExternalPrograms/Spliter/Makefile"
- esed_check -i "s\gcc\\$(tc-getCC) ${CFLAGS}\g" "${S}/ExternalPrograms/Controller/Makefile"
-}
-
-src_compile() {
- local FFTW_VERSION=3
- local ASM_F2I=NO
- local LINUX_MIDIIN=NONE
- local LINUX_AUDIOOUT=NONE
- local LINUX_USE_LASH=NO
-
- if use oss ; then
- LINUX_MIDIIN=OSS
- LINUX_AUDIOOUT=OSS
- use jack && LINUX_AUDIOOUT=OSS_AND_JACK
- else
- use jack && LINUX_AUDIOOUT=JACK
- fi
-
- use lash && LINUX_USE_LASH=YES
- use jackmidi && LINUX_USE_JACKMIDI=YES
- use alsa && LINUX_MIDIIN=ALSA
-# use portaudio && LINUX_AUDIOOUT=PA
-# use mmx && ASM_F2I=YES
-
- local myconf="FFTW_VERSION=${FFTW_VERSION}"
- myconf="${myconf} ASM_F2I=${ASM_F2I}"
- myconf="${myconf} LINUX_MIDIIN=${LINUX_MIDIIN}"
- myconf="${myconf} LINUX_AUDIOOUT=${LINUX_AUDIOOUT}"
- myconf="${myconf} LINUX_USE_LASH=${LINUX_USE_LASH}"
- myconf="${myconf} LINUX_USE_JACKMIDI=${LINUX_USE_JACKMIDI}"
-
- cd "${S}/src"
- echo "make ${myconf}" > gentoo_make_options # for easier debugging
- chmod +x gentoo_make_options
-
- emake -j1 ${myconf} || die "make failed with this options: ${myconf}"
-
- cd "${S}/ExternalPrograms/Spliter"
- emake
- cd "${S}/ExternalPrograms/Controller"
- emake
-}
-
-src_install() {
- dobin "${S}/src/zynaddsubfx"
- dobin "${S}/ExternalPrograms/Spliter/spliter"
- dobin "${S}/ExternalPrograms/Controller/controller"
- dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
- # -------- install examples presets
- [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${MY_PN}/presets
- doins "${S}/presets/"*
- insinto /usr/share/${MY_PN}/examples
- doins "${S}/examples/"*
- # --------
-
- mogrify -format png zynaddsubfx_icon.ico
- newicon "${S}/zynaddsubfx_icon.png" "zynaddsubfx_icon.png"
- make_desktop_entry "${PN}" "ZynAddSubFx-Synth" \
- "zynaddsubfx_icon.png" "AudioVideo;Audio"
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with the package zynaddsubfx-banks"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
-}