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 00000000..d002ab67 Binary files /dev/null and b/src/res/instruments/bassoon.png differ 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;