Commit 04e25fe2 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'recording'

Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp
parents adaf3d43 c5202fcb
......@@ -2,6 +2,6 @@ icondir = $(datadir)/pixmaps
icon_DATA = sflphone.png
buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg sflphone.png stock_person.svg
buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg sflphone.png stock_person.svg rec_call.svg record.svg icon_rec.svg
buttonsdir = $(datadir)/sflphone
EXTRA_DIST = $(buttons_DATA) $(icon_DATA)
<?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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.46"
version="1.0"
sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
sodipodi:docname="icon_rec.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient2491"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
x1="2.0651877"
y1="12.625902"
x2="6.8378897"
y2="13.920053" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient2489"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0.426158,-2.762136)"
x1="7.8517423"
y1="15.912388"
x2="7.1114841"
y2="11.597325" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2487"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.947018,-0.885198)"
x1="31.692968"
y1="11.264216"
x2="23.888865"
y2="13.35532" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2485"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.262691,-1.100752)"
x1="10.57493"
y1="12.115559"
x2="-0.68574232"
y2="12.115559" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2483"
gradientUnits="userSpaceOnUse"
x1="15.647213"
y1="2.7028866"
x2="14.013638"
y2="10.576721" />
<linearGradient
inkscape:collect="always"
id="linearGradient2433">
<stop
style="stop-color:#008000;stop-opacity:1;"
offset="0"
id="stop2435" />
<stop
style="stop-color:#008000;stop-opacity:0;"
offset="1"
id="stop2437" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2433"
id="linearGradient2439"
x1="2.965755"
y1="-0.80084854"
x2="32.578228"
y2="16.739393"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective4283" />
<linearGradient
id="linearGradient3370">
<stop
style="stop-color:#d7d7d7;stop-opacity:1;"
offset="0"
id="stop3372" />
<stop
style="stop-color:#7c7c7c;stop-opacity:1;"
offset="1"
id="stop3374" />
</linearGradient>
<linearGradient
id="linearGradient3362">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3364" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3366" />
</linearGradient>
<linearGradient
id="linearGradient4045">
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="0"
id="stop4047" />
<stop
style="stop-color:#fcfbcb;stop-opacity:1"
offset="1"
id="stop4049" />
</linearGradient>
<linearGradient
id="linearGradient4269">
<stop
style="stop-color:#1db000;stop-opacity:1;"
offset="0"
id="stop4271" />
<stop
style="stop-color:#1db000;stop-opacity:0;"
offset="1"
id="stop4273" />
</linearGradient>
<linearGradient
id="linearGradient4183">
<stop
id="stop4185"
offset="0"
style="stop-color:#1db000;stop-opacity:1;" />
<stop
id="stop4187"
offset="1"
style="stop-color:#0f5f00;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient4167">
<stop
style="stop-color:#80000e;stop-opacity:1;"
offset="0"
id="stop4169" />
<stop
style="stop-color:#b00014;stop-opacity:0;"
offset="1"
id="stop4171" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2224"
x1="16.826796"
y1="6.7288713"
x2="27.5625"
y2="22.512505"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
<linearGradient
y2="13.920053"
x2="6.8378897"
y1="12.625902"
x1="2.0651877"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
gradientUnits="userSpaceOnUse"
id="linearGradient1388"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(0.426158,-2.762136)"
gradientUnits="userSpaceOnUse"
y2="13.920053"
x2="6.8378897"
y1="12.625902"
x1="2.0651877"
id="linearGradient1386"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="10.576721"
x2="14.013638"
y1="2.7028866"
x1="15.647213"
id="linearGradient1384"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(-0.947018,-0.885198)"
gradientUnits="userSpaceOnUse"
y2="12.535715"
x2="31.31678"
y1="12.535715"
x1="24.397505"
id="linearGradient1382"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(1.262691,-1.100752)"
gradientUnits="userSpaceOnUse"
y2="12.825893"
x2="7.9239235"
y1="12.825893"
x1="1.0046476"
id="linearGradient1380"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
id="linearGradient1374">
<stop
id="stop1376"
offset="0"
style="stop-color:#80000e;stop-opacity:1;" />
<stop
id="stop1378"
offset="1"
style="stop-color:#b00014;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient1368">
<stop
style="stop-color:#26b000;stop-opacity:1;"
offset="0"
id="stop1370" />
<stop
style="stop-color:#145f00;stop-opacity:1;"
offset="1"
id="stop1372" />
</linearGradient>
<linearGradient
id="linearGradient1362">
<stop
id="stop1364"
offset="0"
style="stop-color:#26b000;stop-opacity:1;" />
<stop
id="stop1366"
offset="1"
style="stop-color:#26b000;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient1406"
gradientUnits="userSpaceOnUse"
x1="15.647213"
y1="2.7028866"
x2="14.013638"
y2="10.576721" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient1408"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.262691,-1.100752)"
x1="10.57493"
y1="12.115559"
x2="-0.68574232"
y2="12.115559" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient1410"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.947018,-0.885198)"
x1="31.692968"
y1="11.264216"
x2="23.888865"
y2="13.35532" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient1412"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0.426158,-2.762136)"
x1="7.8517423"
y1="15.912388"
x2="7.1114841"
y2="11.597325" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient1414"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
x1="2.0651877"
y1="12.625902"
x2="6.8378897"
y2="13.920053" />
<linearGradient
y2="13.920053"
x2="6.8378897"
y1="12.625902"
x1="2.0651877"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
gradientUnits="userSpaceOnUse"
id="linearGradient2925"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
y2="12.113755"
x2="7.293807"
y1="16.110582"
x1="11.408385"
gradientTransform="translate(0.426158,-2.762136)"
gradientUnits="userSpaceOnUse"
id="linearGradient3160"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
y2="13.35532"
x2="23.888865"
y1="11.264216"
x1="31.692968"
gradientTransform="translate(-0.947018,-0.885198)"
gradientUnits="userSpaceOnUse"
id="linearGradient2921"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
y2="12.949513"
x2="2.7672646"
y1="12.115559"
x1="10.57493"
gradientTransform="translate(1.262691,-1.100752)"
gradientUnits="userSpaceOnUse"
id="linearGradient2919"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
y2="10.576721"
x2="14.013638"
y1="2.7028866"
x1="15.647213"
gradientUnits="userSpaceOnUse"
id="linearGradient2917"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient2762"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
x1="2.0651877"
y1="12.625902"
x2="6.8378897"
y2="13.920053" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient2764"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0.426158,-2.762136)"
x1="7.8517423"
y1="15.912388"
x2="7.1114841"
y2="11.597325" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2766"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.947018,-0.885198)"
x1="31.692968"
y1="11.264216"
x2="23.888865"
y2="13.35532" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2768"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.262691,-1.100752)"
x1="10.57493"
y1="12.115559"
x2="-0.68574232"
y2="12.115559" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2770"
gradientUnits="userSpaceOnUse"
x1="15.647213"
y1="2.7028866"
x2="14.013638"
y2="10.576721" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2433"
id="linearGradient3144"
x1="2.965755"
y1="-0.80084854"
x2="32.578228"
y2="16.739393"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective3142" />
<linearGradient
id="linearGradient3136">
<stop
style="stop-color:#d7d7d7;stop-opacity:1;"
offset="0"
id="stop3138" />
<stop
style="stop-color:#7c7c7c;stop-opacity:1;"
offset="1"
id="stop3140" />
</linearGradient>
<linearGradient
id="linearGradient3130">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3132" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3134" />
</linearGradient>
<linearGradient
id="linearGradient2783">
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="0"
id="stop2785" />
<stop
style="stop-color:#fcfbcb;stop-opacity:1"
offset="1"
id="stop2787" />
</linearGradient>
<linearGradient
id="linearGradient2789">
<stop
style="stop-color:#1db000;stop-opacity:1;"
offset="0"
id="stop2791" />
<stop
style="stop-color:#1db000;stop-opacity:0;"
offset="1"
id="stop2793" />
</linearGradient>
<linearGradient
id="linearGradient2795">
<stop
id="stop2797"
offset="0"
style="stop-color:#1db000;stop-opacity:1;" />
<stop
id="stop2799"
offset="1"
style="stop-color:#0f5f00;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient2801">
<stop
style="stop-color:#80000e;stop-opacity:1;"
offset="0"
id="stop2803" />
<stop
style="stop-color:#b00014;stop-opacity:0;"
offset="1"
id="stop2805" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2807"
x1="16.826796"
y1="6.7288713"
x2="27.5625"
y2="22.512505"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
<linearGradient
y2="13.920053"
x2="6.8378897"
y1="12.625902"
x1="2.0651877"
gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
gradientUnits="userSpaceOnUse"
id="linearGradient2809"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(0.426158,-2.762136)"
gradientUnits="userSpaceOnUse"
y2="13.920053"
x2="6.8378897"
y1="12.625902"
x1="2.0651877"
id="linearGradient2811"
xlink:href="#linearGradient4269"
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="10.576721"
x2="14.013638"
y1="2.7028866"
x1="15.647213"
id="linearGradient2813"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(-0.947018,-0.885198)"
gradientUnits="userSpaceOnUse"
y2="12.535715"
x2="31.31678"
y1="12.535715"
x1="24.397505"
id="linearGradient2815"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(1.262691,-1.100752)"
gradientUnits="userSpaceOnUse"
y2="12.825893"
x2="7.9239235"
y1="12.825893"
x1="1.0046476"
id="linearGradient2817"
xlink:href="#linearGradient4183"
inkscape:collect="always" />
<linearGradient
id="linearGradient2819">
<stop
id="stop2821"
offset="0"
style="stop-color:#80000e;stop-opacity:1;" />
<stop
id="stop2823"
offset="1"
style="stop-color:#b00014;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2825">
<stop
style="stop-color:#26b000;stop-opacity:1;"
offset="0"
id="stop2827" />
<stop
style="stop-color:#145f00;stop-opacity:1;"
offset="1"
id="stop2829" />
</linearGradient>
<linearGradient
id="linearGradient2831">
<stop
id="stop2833"
offset="0"
style="stop-color:#26b000;stop-opacity:1;" />
<stop
id="stop2835"
offset="1"
style="stop-color:#26b000;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2837"
gradientUnits="userSpaceOnUse"
x1="15.647213"
y1="2.7028866"
x2="14.013638"
y2="10.576721" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2839"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1.262691,-1.100752)"
x1="10.57493"
y1="12.115559"
x2="-0.68574232"
y2="12.115559" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4183"
id="linearGradient2841"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.947018,-0.885198)"
x1="31.692968"
y1="11.264216"
x2="23.888865"
y2="13.35532" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"
id="linearGradient2843"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0.426158,-2.762136)"
x1="7.8517423"
y1="15.912388"
x2="7.1114841"
y2="11.597325" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4269"