diff --git a/ChangeLog b/ChangeLog index 7d2ab394..cdf06edd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ * added -v/--version command line argument to output version information (Ticket #121) - * added bodhran instrument icon, created by bomm (Ticket #131) + * added bodhran and other instrument icons, bodhran created by bomm (Ticket #131) * bug fix: if small network buffers are used we get much better audio quality when drop outs occur diff --git a/Jamulus.pro b/Jamulus.pro index e01b8460..4bc0ceea 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -549,6 +549,7 @@ DISTFILES += ChangeLog \ src/res/instruments/instrviolin.png \ src/res/instruments/instrvocal.png \ src/res/instruments/instrguitarvocal.png \ + src/res/instruments/instrkeyboardvocal.png \ src/res/instruments/bodhran.svg \ src/res/instruments/bodhran.png \ src/res/flags/flagnone.png \ diff --git a/src/res/instruments/instrkeyboardvocal.png b/src/res/instruments/instrkeyboardvocal.png new file mode 100644 index 00000000..b1a77290 Binary files /dev/null and b/src/res/instruments/instrkeyboardvocal.png differ diff --git a/src/resources.qrc b/src/resources.qrc index dac712b4..77f355ec 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -48,6 +48,7 @@ res/instruments/instrlistener.png res/instruments/instrstreamer.png res/instruments/instrguitarvocal.png + res/instruments/instrkeyboardvocal.png res/instruments/bodhran.png diff --git a/src/util.cpp b/src/util.cpp index 225bc594..d7d6bc7e 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -962,6 +962,7 @@ CVector& CInstPictures::GetTable() vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) ); vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) ); 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 ) ); // now the table is initialized