From a41879e6b7771dd55aca95700e42cc6ee20bab14 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 1 May 2020 19:45:07 +0200 Subject: [PATCH] added bassoon instrument icon, created by dszgit (Ticket #131) --- ChangeLog | 2 + Jamulus.pro | 2 + src/res/instruments/bassoon.png | Bin 0 -> 910 bytes src/res/instruments/bassoon.svg | 227 ++++++++++++++++++++++++++++++++ src/resources.qrc | 1 + src/util.cpp | 1 + 6 files changed, 233 insertions(+) create mode 100644 src/res/instruments/bassoon.png create mode 100644 src/res/instruments/bassoon.svg diff --git a/ChangeLog b/ChangeLog index d6813a3f..7cbb928d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4 + * added bassoon instrument icon, created by dszgit (Ticket #131) + * bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137) diff --git a/Jamulus.pro b/Jamulus.pro index 80e04633..c5361185 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -564,6 +564,8 @@ DISTFILES += ChangeLog \ src/res/instruments/instrkeyboardvocal.png \ src/res/instruments/bodhran.svg \ src/res/instruments/bodhran.png \ + src/res/instruments/bassoon.svg \ + src/res/instruments/bassoon.png \ src/res/flags/flagnone.png \ src/res/flags/ad.png \ src/res/flags/ae.png \ diff --git a/src/res/instruments/bassoon.png b/src/res/instruments/bassoon.png new file mode 100644 index 0000000000000000000000000000000000000000..d002ab6789285f48088f339c1e054416b6271ec3 GIT binary patch literal 910 zcmV;919AL`P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Q<&L_t(I%cYcENRv?*$N$@$ zbDPuYoMTRt+0<&`OdW|I49X}23(77OQp`#yDY_|1h1UcTx)Gv_@WLR2pt{kbi;6NW z)Fx`0`MK0->ZWtf_uaRiZnEqm@mA42I0!P^t6C;#=P2|L&?2bXTc|jNXYL|d;(udo`h~}+1&enh`&HudLP@FzF z-q%pw*i=JNBnm(dfKL>~u>e40BMJ9-kSCLj@UCWRKXS4#zf~XfdmHJVdt5$Rgv4J2 zpccSMiozp`!m+wKA|?bpw;QxliMEOgt*>$?${t7dOcdZt!u zmmRh_tx|c@>9mX4fOy-JRWFz@u3M54t2nnp_uyjj>CzYPx*oFz0f5PY?xZkZL8#wx zz%$d!llz&j5eF=+j`k}&UzX^muwbtItJz{njz&#DMgU-@F_@K+RUi-Hr}}BDH(r9- zAseRH8UX-#`{89(us|x9rQuVFP`$(2e;Wb790OCl1ZjGGcAnGiSkQ`@O`{e4Y>fZ_ zgVW|}e@LQh%@ZV(g`hGy3KG^v0I=wSHBR8sB*sjy4 zuef_X_K;p7kVxZ2Hq+CAY0EOJqXEFMg;`>pKSrEOG^eAbVOU`wx)zWT01S_Pd#Lg` zOUQg*9EbSA;YY+egZ7`#n_@whhC=m(W%UTAZ&lYK~lgk!lw4&d+bwH+?JT%tax50yr%i_@%07*qoM6N<$g34u^q5uE@ literal 0 HcmV?d00001 diff --git a/src/res/instruments/bassoon.svg b/src/res/instruments/bassoon.svg new file mode 100644 index 00000000..ed6d31a3 --- /dev/null +++ b/src/res/instruments/bassoon.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/resources.qrc b/src/resources.qrc index 77f355ec..f8cb0795 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -50,6 +50,7 @@ res/instruments/instrguitarvocal.png res/instruments/instrkeyboardvocal.png res/instruments/bodhran.png + res/instruments/bassoon.png res/fronticon.png diff --git a/src/util.cpp b/src/util.cpp index 6c0fb46a..12a336e9 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -964,6 +964,7 @@ CVector& CInstPictures::GetTable() vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( "Keyboard+Vocal", ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( "Bodhran", ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) ); + vecDataBase.Add ( CInstPictProps ( "Bassoon", ":/png/instr/res/instruments/bassoon.png", IC_WIND_INSTRUMENT ) ); // now the table is initialized TableIsInitialized = true;