From 941d9132d0d292b3d999735fbdc879b9f495916f Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Wed, 4 Feb 2015 07:06:56 +0000
Subject: [PATCH] added new instrument picture for "Guitar+Vocal"

---
 Jamulus.pro                  |   1 +
 src/res/instrguitarvocal.png | Bin 0 -> 1492 bytes
 src/resources.qrc            |   1 +
 src/util.cpp                 |   1 +
 4 files changed, 3 insertions(+)
 create mode 100644 src/res/instrguitarvocal.png

diff --git a/Jamulus.pro b/Jamulus.pro
index 4f0112de..8cedca76 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -500,6 +500,7 @@ DISTFILES += AUTHORS \
     src/res/instrtuba.png \
     src/res/instrviolin.png \
     src/res/instrvocal.png \
+    src/res/instrguitarvocal.png \
     src/res/flags/flagnone.png \
     src/res/flags/ad.png \
     src/res/flags/ae.png \
diff --git a/src/res/instrguitarvocal.png b/src/res/instrguitarvocal.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd707936f632ee3508a9c1cc0eceef25be94fabf
GIT binary patch
literal 1492
zcmV;_1uOcAP)<h;3K|Lk000e1NJLTq000pH000{Z1^@s6n)YOz00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vR;@A|!w7HtYZZ03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00lTnL_t(I%axOBP?S{|
z$N%T-yX=MCg?ASakO{<46a%>qB9L8}Mj;JHEyEIq$;$_{=;EZ=7i+3%#56OnjhZ59
zsi?_B1`NtY0UZpL^@f0;0&-bc*vtE#(+5~UooVX%cFuX8-}yiPa~?%#S~9wBHe*)K
zBBiaPf3Z@j3exEH&rNzc=26$pW+(n@grv+$F^Hy4z21`>MHBZjdUM~fkQDr%(0hu^
z-QB<=!opZnc_FVlzME&}WN!Gkn$?#NjV&UUrD}CL1NWQY#|(N;&hOWA=}rx+JCT11
z05Y@J6o_6vyY!yMGJ~h_u7|gGb5KI0|9Bv+KlJ;cpjGcx2m;C9wh6WYD`Z(lQ)7z=
z0E{uUR<AP~0=z%vjQjR=b_U+7ywd)RG*f`TpVnQ^zFN1I4c@5WgN>EE{qngTPv>pl
zpZ|GbX@&Obed-k$fXDaSAJ{0ercZsI5JJ#v>4$&RtGT&r*F2G|^Y+~5WAf3@UBB{K
zlhU)Z0v9fS_fhJS#jN`DVK&rQ!Ioxc4Y|(aUY~<^&VGlg`dj*f;*x1k*OTC^1ypQ$
zSWO*rEFs{WbFyO5LR@Gt!+iI44>zbnFP<vx0Dx0vl}eN7waWbWgQVITx3~dEe{h>y
z5u>J-&NmbeDV7j$#uy<4`0?m(XlZNXlHDe<o`G|&8|TkSa6*<+J098+v?>}X`rkGD
zwRH<9k!1x40RS>04uXQBr@M<#N;z{%FGSRCBQB6=G?mp}X}9PNmgeR2BP|Qoy$2GV
z7?Yx4ycmRlF$PL0IOmX@GL&utWLX9gbsn`v=Pdw`z2TE2p~G6fYtIj(VCrPD86#$l
z8bt_XCPS8F5JEugPD9+=X^5KllA@vb{NdQ7Ia>fAe(qbtkgJtfS{S&6jP&FRwOR$L
zpu<3?)8kV98AMDB$kM1)M*pC|E&!-5Dj0?UfDGi02e?EH3=D!00?NsS@T8azs8!x`
z;OmdoT8&x{0Gsyh8iNo8{h1S3D5YSGfsBaKXw=}GgD~!?aR_+;fljAYXf?Wri7OU)
zY|LIc27yu`an5^WnSn75#u#MT20{cdW&^0AMx)fgP1NSJT6!mR_B}4%n!7n;)I$J>
zN=YEpYP%IVC1mpMFV>^5xCDp)6yfjpBCOU{+%xAvVwQ_#<t6d1!b=TJf5gq0^xCKr
zIzi-wP{(ESE#BJNhIxtchz}2gBn_gcs}{1<3rR^nN=%<OHgpPl^Oxch`o#Z_nH^mj
zn-I+tlB0Ojg_FFyzJee9se+f4mhvS_GDe@j=Gs*N!0ePa_lf~CUm5cR01+s>Oi7p=
z{26wfoCsM47A8|f7zws--Hh*dRx~x-yBZxE7CvmFpr{U;7P=GwgneIfoNYQld^C~n
zlqkSCL;n!)NY+6$)B!>%(9?=3Ar5&)P<UN&RXGkGIfnHgZafP{GNw-|7&dm<>cUhH
zW$+o!IVXgW&dx@t-L4~VQwHklyP-DNu_|XBbn!lhn%yV+0bo{Ux^N=znBCVXxKRL5
z2_C5<-<@#I;o}pAerq5yRvv-q>klt)6PU~(UF-kG)qd6f6H<3ycU|rE=BX3_EPXBa
z$IlJtGW`6a5Ii{zzaH;~-KGNPoO8RJF*7rD)W@!#uAO?Feg*}AJ9iE(kfb4uo5A6k
zk?j~5018i=p;RgeA;b;0Z3b6Pa@6#L4u?I3rhogsz#NXahHKkkcl3@zoX%bhS~~y`
uT)$BSK~RDNDk@Mf07%=g8UQ3pY3M&aP(Ftj6l-$;0000<MNUMnLSTZREvdHv

literal 0
HcmV?d00001

diff --git a/src/resources.qrc b/src/resources.qrc
index 64945ad8..1a31c8f2 100755
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -47,6 +47,7 @@
         <file>res/instrrecorder.png</file>
         <file>res/instrlistener.png</file>
         <file>res/instrstreamer.png</file>
+        <file>res/instrguitarvocal.png</file>
     </qresource>
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>
diff --git a/src/util.cpp b/src/util.cpp
index fdaf2e86..226ba526 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -886,6 +886,7 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         vecDataBase.Add ( CInstPictProps ( "Recorder", ":/png/instr/res/instrrecorder.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instrlistener.png", IC_OTHER_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
 
         // now the table is initialized
         TableIsInitialized = true;