added bassoon instrument icon, created by dszgit (Ticket #131)
This commit is contained in:
Volker Fischer
parent
3f43732790
commit
a41879e6b7
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 910 B |
|
|
@ -0,0 +1,227 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="11in"
|
||||
height="8.5in"
|
||||
viewBox="0 0 279.4 215.9"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
|
||||
sodipodi:docname="bassoon.svg"
|
||||
inkscape:export-filename="/home/david/Music/Instruments/bassoon.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.70710678"
|
||||
inkscape:cx="297.27202"
|
||||
inkscape:cy="623.34622"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
showguides="false"
|
||||
inkscape:snap-global="false"
|
||||
units="in"
|
||||
showborder="false"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="749"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid10" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-81.1)">
|
||||
<g
|
||||
id="g4796"
|
||||
transform="rotate(-29.01229,73.046042,121.22491)">
|
||||
<path
|
||||
sodipodi:nodetypes="cssccssccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path12"
|
||||
d="m 46.367866,43.314518 c 0,0 1.58921,3.69544 0,8.60447 -1.83477,5.66754 -0.701362,12.20664 -0.0767,16.8528 1.21491,9.03635 0.0767,88.764332 0.0767,131.881532 h 8.070518 c 0,-46.46672 -1.75839,-123.432682 -0.0927,-131.850152 0.99457,-5.026 1.68155,-9.92635 0.0927,-16.77595 -1.16203,-5.00954 0,-5.85039 0,-9.51137 h -8.070518 z"
|
||||
style="opacity:1;vector-effect:none;fill:#803300;fill-opacity:1;stroke:#000000;stroke-width:0.85982138;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<ellipse
|
||||
ry="2.2148652"
|
||||
rx="9.4134111"
|
||||
cy="42.129814"
|
||||
cx="50.668777"
|
||||
id="path14"
|
||||
style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1.15859199;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
transform="rotate(-90)"
|
||||
y="54.915047"
|
||||
x="-201.91927"
|
||||
height="3.3675961"
|
||||
width="95.415215"
|
||||
id="rect3725"
|
||||
style="opacity:1;vector-effect:none;fill:#aa4400;fill-opacity:1;stroke:#000000;stroke-width:0.70599997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
transform="rotate(-90)"
|
||||
y="45.518219"
|
||||
x="-202.79692"
|
||||
height="13.548525"
|
||||
width="11.935585"
|
||||
id="rect3729"
|
||||
style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#333333;stroke-width:0.63450718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="csssssc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3731"
|
||||
d="m 56.613851,106.16137 c 0,0 -0.24168,-6.398058 1.02098,-9.693309 0.78131,-2.039027 2.42033,-4.09041 4.49792,-4.7625 1.79385,-0.5803 3.09877,-0.51589 4.76513,0.36611 2.53543,1.34199 2.27053,2.97449 4.53263,6.216388 1.36878,1.961631 3.71629,3.306381 6.03967,3.875121 7.39159,1.80937 18.94588,1.58749 16.02175,1.58749"
|
||||
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8080ff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4544"
|
||||
d="m 94.703667,102.81387 c 3.262067,1.23276 10.142893,-0.35753 10.142893,-0.35753 l -2.96326,4.31989 c 0,0 -3.909421,-2.97182 -7.476951,-2.05203 z"
|
||||
style="opacity:1;vector-effect:none;fill:#ffcc00;fill-opacity:1;stroke:#ffcc00;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
y="81.27993"
|
||||
x="47.143467"
|
||||
height="6.2547331"
|
||||
width="6.2547321"
|
||||
id="rect4550"
|
||||
style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:1.83068395;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:2.27667642;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect4552"
|
||||
width="10.416251"
|
||||
height="5.8087401"
|
||||
x="47.101879"
|
||||
y="145.00291" />
|
||||
<rect
|
||||
y="106.55724"
|
||||
x="55.002777"
|
||||
height="2.5712204"
|
||||
width="3.1803987"
|
||||
id="rect4554"
|
||||
style="opacity:1;vector-effect:none;fill:#b3b3b3;fill-opacity:1;stroke:#b3b3b3;stroke-width:0.83697993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<circle
|
||||
r="1.7972932"
|
||||
cy="69.529976"
|
||||
cx="50.709747"
|
||||
id="path4556"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.60041487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<circle
|
||||
r="1.4766704"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.49330565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="circle4580"
|
||||
cx="49.806404"
|
||||
cy="185.79163" />
|
||||
<circle
|
||||
r="1.1560477"
|
||||
cy="175.58247"
|
||||
cx="51.01973"
|
||||
id="circle4582"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.38619646;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<circle
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.46652839;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="circle4584"
|
||||
cx="50.177826"
|
||||
cy="171.44269"
|
||||
r="1.3965148" />
|
||||
<ellipse
|
||||
transform="matrix(-0.9676937,-0.25212875,-0.2886886,-0.95742305,0,0)"
|
||||
ry="0.56005347"
|
||||
rx="1.2347096"
|
||||
cy="-137.54945"
|
||||
cx="-11.971257"
|
||||
id="path4586"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.33503741;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<ellipse
|
||||
inkscape:transform-center-y="0.49806172"
|
||||
inkscape:transform-center-x="-0.77738863"
|
||||
transform="matrix(-0.98472888,-0.17409487,0.17196262,-0.98510348,0,0)"
|
||||
ry="0.62549603"
|
||||
rx="1.8658425"
|
||||
cy="-121.87131"
|
||||
cx="-73.939224"
|
||||
id="path4588"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.4565016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<ellipse
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.32630903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="ellipse4592"
|
||||
cx="105.17155"
|
||||
cy="-179.23906"
|
||||
rx="1.2218931"
|
||||
ry="0.536825"
|
||||
transform="matrix(-0.94648072,0.32276035,-0.84098337,-0.54106097,0,0)" />
|
||||
<ellipse
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.24506681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="ellipse4594"
|
||||
cx="-34.641891"
|
||||
cy="-123.9094"
|
||||
rx="0.93775296"
|
||||
ry="0.39453751"
|
||||
transform="matrix(-0.92026936,-0.39128546,-0.14973615,-0.98872599,0,0)" />
|
||||
<ellipse
|
||||
transform="matrix(-0.76478399,0.64428677,-0.94974484,-0.31302514,0,0)"
|
||||
ry="0.39453751"
|
||||
rx="0.93775296"
|
||||
cy="-154.59048"
|
||||
cx="125.81667"
|
||||
id="ellipse4596"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.24506681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4598"
|
||||
d="M 50.207146,125.41978 50.962303,71.546673"
|
||||
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#aaaaff;stroke-width:0.57336599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#aaaaff;stroke-width:0.57336599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
d="m 49.002555,185.15586 0.755157,-53.87311"
|
||||
id="path4600"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4602"
|
||||
d="m 48.334921,170.75003 0.755157,-53.8731"
|
||||
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#aaaaff;stroke-width:0.57336599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#aaaaff;stroke-width:0.39104879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
d="m 47.585808,166.63427 0.543936,-34.79044"
|
||||
id="path4604"
|
||||
inkscape:connector-curvature="0" />
|
||||
<ellipse
|
||||
ry="1.2653216"
|
||||
rx="0.89114428"
|
||||
style="opacity:1;vector-effect:none;fill:#d5e5ff;fill-opacity:1;stroke:#d5e5ff;stroke-width:0.3547374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="circle4608"
|
||||
cx="48.125366"
|
||||
cy="117.46767" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 12 KiB |
|
|
@ -50,6 +50,7 @@
|
|||
<file>res/instruments/instrguitarvocal.png</file>
|
||||
<file>res/instruments/instrkeyboardvocal.png</file>
|
||||
<file>res/instruments/bodhran.png</file>
|
||||
<file>res/instruments/bassoon.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/png/main">
|
||||
<file>res/fronticon.png</file>
|
||||
|
|
|
|||
|
|
@ -964,6 +964,7 @@ CVector<CInstPictures::CInstPictProps>& 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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue