[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/3rdparty/slv2/src/world.c src/engi...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso src/3rdparty/slv2/src/world.c src/engi... |
Date: |
Mon, 04 Jun 2007 08:53:39 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/06/04 08:53:39
Modified files:
src/3rdparty/slv2/src: world.c
src/engine : AudioDevice.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso : traverso.pro
Added files:
resources/images: traverso-document.svg
Log message:
add patch from T. Morton
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/traverso-document.svg?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/3rdparty/slv2/src/world.c?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.51&r2=1.52
Patches:
Index: src/3rdparty/slv2/src/world.c
===================================================================
RCS file: /sources/traverso/traverso/src/3rdparty/slv2/src/world.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/3rdparty/slv2/src/world.c 23 Apr 2007 11:59:22 -0000 1.1
+++ src/3rdparty/slv2/src/world.c 4 Jun 2007 08:53:38 -0000 1.2
@@ -174,7 +174,7 @@
slv2_world_load_path(world, lv2_path);
} else {
const char* const home = getenv("HOME");
- const char* const suffix =
"/.lv2:/usr/local/lib/lv2:usr/lib/lv2";
+ const char* const suffix =
"/.lv2:/usr/local/lib/lv2:/usr/lib/lv2";
lv2_path = slv2_strjoin(home, suffix, NULL);
//fprintf(stderr, "$LV2_PATH is unset. Using default path
%s\n", lv2_path);
Index: src/engine/AudioDevice.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/engine/AudioDevice.cpp 14 May 2007 18:05:29 -0000 1.29
+++ src/engine/AudioDevice.cpp 4 Jun 2007 08:53:39 -0000 1.30
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioDevice.cpp,v 1.29 2007/05/14 18:05:29 r_sijrier Exp $
+$Id: AudioDevice.cpp,v 1.30 2007/06/04 08:53:39 r_sijrier Exp $
*/
#include "AudioDevice.h"
@@ -28,6 +28,7 @@
#endif
#if defined (JACK_SUPPORT)
+RELAYTOOL_JACK
#include "JackDriver.h"
#endif
@@ -149,6 +150,7 @@
m_driverType = tr("No Driver Loaded");
#if defined (JACK_SUPPORT)
+ if (libjack_is_present)
availableDrivers << "Jack";
#endif
@@ -362,6 +364,7 @@
#if defined (JACK_SUPPORT)
// This will activate the jack client
+ if (libjack_is_present) {
if (driverType == "Jack") {
if (driver->start() == -1) {
@@ -372,6 +375,7 @@
connect(&jackShutDownChecker, SIGNAL(timeout()), this,
SLOT(check_jack_shutdown()));
jackShutDownChecker.start(500);
}
+ }
#endif
if (driverType == "PortAudio") {
@@ -388,6 +392,7 @@
{
#if defined (JACK_SUPPORT)
+ if (libjack_is_present) {
if (driverType == "Jack") {
driver = new JackDriver(this, m_rate, m_bufferSize);
if (driver->setup(capture, playback) < 0) {
@@ -399,6 +404,7 @@
m_driverType = driverType;
return 1;
}
+ }
#endif
#if defined (ALSA_SUPPORT)
@@ -622,6 +628,7 @@
trav_time_t AudioDevice::get_cpu_time( )
{
#if defined (JACK_SUPPORT)
+ if (libjack_is_present)
if (driver && m_driverType == "Jack")
return ((JackDriver*)driver)->get_cpu_load();
#endif
@@ -717,6 +724,7 @@
#if defined (JACK_SUPPORT)
void AudioDevice::check_jack_shutdown()
{
+ if (libjack_is_present) {
JackDriver* jackdriver = qobject_cast<JackDriver*>(driver);
if (jackdriver) {
if ( ! jackdriver->is_jack_running()) {
@@ -728,6 +736,7 @@
set_parameters(44100, m_bufferSize, "Null Driver");
}
}
+ }
}
#endif
Index: src/traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/traverso/dialogs/settings/Pages.cpp 17 May 2007 08:39:23 -0000
1.19
+++ src/traverso/dialogs/settings/Pages.cpp 4 Jun 2007 08:53:39 -0000
1.20
@@ -32,6 +32,10 @@
#include <InputEngine.h>
#include <QDomDocument>
+#if defined (JACK_SUPPORT)
+RELAYTOOL_JACK
+#endif
+
/****************************************/
/* AudioDriver */
@@ -143,6 +147,7 @@
config().set_property("Hardware", "carddevice", "hw:0");
config().set_property("Hardware", "numberofperiods", 2);
#elif defined (JACK_SUPPORT)
+ if (libjack_is_present)
config().set_property("Hardware", "drivertype", "Jack");
#else
config().set_property("Hardware", "drivertype", "Null Driver");
Index: src/traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- src/traverso/traverso.pro 15 May 2007 17:41:22 -0000 1.51
+++ src/traverso/traverso.pro 4 Jun 2007 08:53:39 -0000 1.52
@@ -120,11 +120,8 @@
contains(DEFINES, PORTAUDIO_SUPPORT): LIBS += -lportaudio
!contains(DEFINES, PORTAUDIO_SUPPORT): FORMS -= ui/PaDriverPage.ui
-
-contains(DEFINES, JACK_SUPPORT): LIBS += -ljack
-
contains(DEFINES, LV2_SUPPORT){
- LIBS += -lrdf -lrasqal -lslv2
+ LIBS += -lslv2 -lrdf -lrasqal -lraptor #slv2 needs to come before rdf so
the bogus dep stripper (-Wl,--as-needed) doesn't remove it
INCLUDEPATH += ../3rdparty/slv2 ../plugins/LV2
}
@@ -148,9 +145,21 @@
# perhaps this doesn't cover mac os x ?
# if so, copy paste into macx section...
LIBS += $$system(pkg-config --libs glib-2.0)
+
+ contains(DEFINES, JACK_SUPPORT) {
+ system(which relaytool 2>/dev/null >/dev/null) {
+ LIBS += `relaytool --multilink libjack.so.0 libjack-0.100.0.so.0
--relay jack -ljack`
+ } else {
+ LIBS += -ljack
+ }
+ }
}
macx{
+ contains(DEFINES, JACK_SUPPORT) {
+ LIBS += -ljack
+ }
+
contains(DEFINES, LV2_SUPPORT){
LIBS += -lraptor
}
Index: resources/images/traverso-document.svg
===================================================================
RCS file: resources/images/traverso-document.svg
diff -N resources/images/traverso-document.svg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ resources/images/traverso-document.svg 4 Jun 2007 08:53:38 -0000
1.1
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0.3, SVG Export Plug-In . SVG Version:
3.0.0 Build 77) -->
+<svg
+ xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ 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="128"
+ height="128"
+ viewBox="0 0 128 128"
+ overflow="visible"
+ enable-background="new 0 0 128 128"
+ xml:space="preserve"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ sodipodi:docname="traverso-document.svg"
+ sodipodi:docbase="/home/taj/traverso/traverso-cvs/traverso/resources/images"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+ id="metadata598"><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>Traverso Document Icon</dc:title><dc:description>Background page
comes from crystalsvg icon
set</dc:description></cc:Work></rdf:RDF></metadata><defs
+ id="defs596"><linearGradient
+ id="linearGradient6461"><stop
+ style="stop-color:#eb9200;stop-opacity:1;"
+ offset="0"
+ id="stop6463" /><stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="1"
+ id="stop6465" /></linearGradient><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6461"
+ id="linearGradient3180"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(325.6079,-1066.644)"
+ x1="-111.43661"
+ y1="1353.2247"
+ x2="-164.98152"
+ y2="1338.1276" />
+
+
+
+
+ <linearGradient
+ id="XMLID_4_"
+ gradientUnits="userSpaceOnUse"
+ x1="-2.4960999"
+ y1="10.6514"
+ x2="119.5032"
+ y2="10.6514">
+ <stop
+ offset="0"
+ style="stop-color:#FF4C00"
+ id="stop39" />
+ <stop
+ offset="1"
+ style="stop-color:#A20000"
+ id="stop41" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#FF4C00" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#FF4C00" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#A20000" />
+ </linearGradient>
+
+
+
+
+ </defs><sodipodi:namedview
+ inkscape:window-height="692"
+ inkscape:window-width="1016"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="2.2483786"
+ inkscape:cx="97.645973"
+ inkscape:cy="57.591489"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="svg2" />
+ <g
+ id="g7">
+ <path
+ d="M 121.164,1.052 L 6.836,1.052 L 6.836,126.948 L 87.537,126.948 L
121.164,93.321 L 121.164,1.052 L 121.164,1.052 z "
+ id="path9"
+ style="fill:#ffffff" />
+ <linearGradient
+ id="XMLID_1_"
+ gradientUnits="userSpaceOnUse"
+ x1="63.920399"
+ y1="154.5645"
+ x2="63.920399"
+ y2="-100.9347">
+ <stop
+ offset="0"
+ style="stop-color:#FFFFFF"
+ id="stop12" />
+ <stop
+ offset="0.2457"
+ style="stop-color:#F6F6F6"
+ id="stop14" />
+ <stop
+ offset="0.6374"
+ style="stop-color:#DFDFDF"
+ id="stop16" />
+ <stop
+ offset="1"
+ style="stop-color:#C4C4C4"
+ id="stop18" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.6045"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#C4C4C4" />
+ </linearGradient>
+ <path
+ d="M 117.734,4.019 L 10.266,4.019 L 10.106,126.673 L 86.563,126.673 L
117.735,95.421 L 117.735,4.019 L 117.734,4.019 z "
+ id="path20"
+ style="fill:url(#XMLID_1_)" />
+ <linearGradient
+ id="XMLID_2_"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.333"
+ y1="-26.333"
+ x2="56.166199"
+ y2="56.166199">
+ <stop
+ offset="0"
+ style="stop-color:#B3B3B3"
+ id="stop23" />
+ <stop
+ offset="1"
+ style="stop-color:#828282"
+ id="stop25" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B3B3B3" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B3B3B3" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#828282" />
+ </linearGradient>
+ <path
+ d="M 121.164,0.552 L 6.336,0.552 L 6.336,127.448 L 87.744,127.448 L
121.664,93.528 L 121.664,0.552 L 121.164,0.552 z M 120.664,1.552 C
120.664,2.539 120.664,92.704 120.664,93.114 C 120.375,93.403 87.619,126.159
87.33,126.448 C 86.92,126.448 8.32,126.448 7.336,126.448 C 7.336,125.46
7.336,2.539 7.336,1.552 C 8.322,1.552 119.678,1.552 120.664,1.552 z "
+ id="path27"
+ style="fill:url(#XMLID_2_)" />
+ <linearGradient
+ id="XMLID_3_"
+ gradientUnits="userSpaceOnUse"
+ x1="43.0229"
+ y1="25.4214"
+ x2="204.00729"
+ y2="111.0652">
+ <stop
+ offset="0"
+ style="stop-color:#FFFFFF"
+ id="stop30" />
+ <stop
+ offset="0.8603"
+ style="stop-color:#DADADA"
+ id="stop32" />
+ <stop
+ offset="1"
+ style="stop-color:#D4D4D4"
+ id="stop34" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.5254"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#D4D4D4" />
+ </linearGradient>
+ <path
+ d="M 118.006,15.223 L 118.006,3.94 L 10.199,3.94 L 10.103,69.28 C
20.078,73.827 31.254,76.376 43.057,76.376 C 80.402,76.376 111.455,48.876
118.006,15.223 z "
+ id="path36"
+ style="fill:url(#XMLID_3_)" />
+ </g><g
+ id="g3554"
+ transform="matrix(0.25648,0,0,0.25648,26.341279,22.302077)"><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccccc"
+ id="path3144"
+ d="M 193.71443,138.20568 L 144.10813,308.50428 L 117.23003,384.23189 L
214.08253,389.24999 L 311.11193,163.38459 L 193.71443,138.20568 z "
+
style="fill:url(#linearGradient3180);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="czcccczcc"
+ id="path3146"
+ d="M 200.03873,54.17229 C 200.03873,54.17229 186.84153,65.21399
161.01633,117.09298 C 134.81783,169.72179 310.02553,165.54389
310.02553,165.54389 L 212.20963,390.42909 L 261.57463,363.00408 L
356.26943,130.64868 C 302.80293,138.53828 187.75683,139.76898
193.92633,115.26468 C 200.18953,90.38789 234.46333,53.41499 234.46333,53.41499
L 200.03873,54.17229 z "
+
style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3148"
+ d="M 285.74283,165.45799 L 192.07153,390.72229 L 199.44653,393.78479 L
293.76433,165.53079 L 285.74283,165.45799 z "
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3150"
+ d="M 263.67723,164.40479 L 170.57153,387.97229 L 177.97773,391.03479 L
271.89153,164.91289 L 263.67723,164.40479 z "
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3152"
+ d="M 238.72993,162.36729 L 144.97773,387.06599 L 152.38403,390.12849 L
246.78263,163.16739 L 238.72993,162.36729 z "
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="cscsc"
+ id="path3154"
+ d="M 200.71813,77.07779 C 200.71813,77.07779 159.01383,118.84718
177.23093,134.25688 C 214.12343,165.46389 317.44733,146.77408
317.44733,146.77408 C 317.44733,146.77408 215.19473,149.43118
193.50223,129.62108 C 176.62773,114.21098 200.71813,77.07779 200.71813,77.07779
z "
+
style="fill:#ffa6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="cccc"
+ id="path3156"
+ d="M 332.81783,154.77578 L 257.25563,348.31318 L 241.40893,361.09418 L
332.81783,154.77578 z "
+
style="fill:#ffa6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3158"
+ d="M 243.75073,162.84889 L 149.08433,388.69029 L 152.49113,390.15299 L
246.88973,163.30609 L 243.75073,162.84889 z "
+
style="fill:#9c9c9c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3160"
+ d="M 268.94743,164.33439 L 174.28113,390.17589 L 177.68783,391.63859 L
272.08643,164.79169 L 268.94743,164.33439 z "
+
style="fill:#9c9c9c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ sodipodi:nodetypes="ccccc"
+ id="path3162"
+ d="M 290.88743,166.16279 L 196.22113,392.00419 L 199.62793,393.46689 L
294.02653,166.61999 L 290.88743,166.16279 z "
+
style="fill:#9c9c9c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="cscsc"
+ id="path3164"
+ d="M 191.40663,232.43575 C 191.40663,232.43575 233.11093,190.66635
214.89383,175.25665 C 178.00133,144.04964 74.677426,162.73945
74.677426,162.73945 C 74.677426,162.73945 176.93003,160.08235
198.62253,179.89245 C 215.49703,195.30255 191.40663,232.43575
191.40663,232.43575 z "
+
style="fill:#ffa6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3166"
+ d="M 247.60873,162.58969 L 152.94233,388.43109 L 156.34913,389.89379 L
250.74773,163.04689 L 247.60873,162.58969 z "
+
style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="ccccc"
+ id="path3168"
+ d="M 272.80543,164.07519 L 178.13913,389.91669 L 181.54583,391.37939 L
275.94443,164.53249 L 272.80543,164.07519 z "
+
style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ sodipodi:nodetypes="ccccc"
+ id="path3170"
+ d="M 294.74543,165.90359 L 200.07913,391.74499 L 203.48593,393.20769 L
297.88453,166.36079 L 294.74543,165.90359 z "
+
style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="cscczcc"
+ id="path3172"
+ d="M 155.10303,7.8125026e-08 C 155.10303,7.8125026e-08 53.107426,84.27631
40.744826,152.40802 C 28.139726,221.87576 179.70023,222.24766
179.70023,222.24766 L 192.18483,196.76976 C 192.18483,196.76976
55.206226,196.32036 66.352626,147.64227 C 77.542826,98.77304 184.83803,1.29283
184.83803,1.29283 L 155.10303,7.8125026e-08 z "
+
style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/><path
+ inkscape:export-ydpi="22.855124"
+ inkscape:export-xdpi="22.855124"
+ inkscape:export-filename="/home/tomveens/Desktop/allnew2_100.png"
+ sodipodi:nodetypes="cscsc"
+ id="path3174"
+ d="M 60.847126,128.09438 C 60.847126,128.09438 39.652226,175.4219
61.585426,184.81642 C 119.50383,209.62424 163.40683,208.30357
163.40683,208.30357 C 163.40683,208.30357 121.23483,205.24343
73.742926,181.09478 C 51.112726,169.58781 60.847126,128.09438
60.847126,128.09438 z "
+
style="fill:#ffa6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/></g><g
+ id="g560">
+
+ <radialGradient
+ id="XMLID_60_"
+ cx="108.4668"
+ cy="118.249"
+ r="34.736401"
+ fx="108.4668"
+ fy="118.249"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#000000"
+ id="stop563" />
+ <stop
+ offset="1"
+ style="stop-color:#000000"
+ id="stop565" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#000000" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#000000" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#000000" />
+ </radialGradient>
+ <path
+ d="M 85.191,90.976 L 85.191,126.73 L 86.984,126.73 L 120.623,93.091 L
120.623,90.976 L 85.191,90.976 L 85.191,90.976 z "
+ id="path567"
+ style="opacity:0.1;fill:url(#XMLID_60_)" />
+ <path
+ d="M 87.537,126.948 L 121.164,93.321 L 87.537,93.321 L 87.537,126.948 z "
+ id="path569"
+ style="fill:#ffffff" />
+ <linearGradient
+ id="XMLID_61_"
+ gradientUnits="userSpaceOnUse"
+ x1="104.0166"
+ y1="98.180702"
+ x2="95.088303"
+ y2="135.79379">
+ <stop
+ offset="0"
+ style="stop-color:#FFFFFF"
+ id="stop572" />
+ <stop
+ offset="1"
+ style="stop-color:#CCCCCC"
+ id="stop574" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#FFFFFF" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#CCCCCC" />
+ </linearGradient>
+ <path
+ d="M 89.865,125.056 L 119.459,95.464 L 89.865,95.464 L 89.865,125.056 z "
+ id="path576"
+ style="fill:url(#XMLID_61_)" />
+ <linearGradient
+ id="XMLID_62_"
+ gradientUnits="userSpaceOnUse"
+ x1="82.308601"
+ y1="88.092796"
+ x2="96.104301"
+ y2="101.8885">
+ <stop
+ offset="0"
+ style="stop-color:#B3B3B3"
+ id="stop579" />
+ <stop
+ offset="1"
+ style="stop-color:#828282"
+ id="stop581" />
+ <a:midPointStop
+ offset="0"
+ style="stop-color:#B3B3B3" />
+ <a:midPointStop
+ offset="0.5"
+ style="stop-color:#B3B3B3" />
+ <a:midPointStop
+ offset="1"
+ style="stop-color:#828282" />
+ </linearGradient>
+ <path
+ d="M 87.537,92.821 C 87.26,92.821 87.037,93.044 87.037,93.321 L
87.037,126.948 C 87.037,127.151 87.158,127.333 87.346,127.411 C 87.532,127.487
87.748,127.444 87.891,127.302 L 121.518,93.675 C 121.661,93.53 121.704,93.316
121.627,93.13 C 121.549,92.942 121.367,92.821 121.164,92.821 L 87.537,92.821 L
87.537,92.821 z M 119.957,93.821 C 118.377,95.399 89.615,124.161 88.037,125.741
C 88.037,123.532 88.037,94.755 88.037,93.821 C 88.971,93.821 117.748,93.821
119.957,93.821 z "
+ id="path583"
+ style="fill:url(#XMLID_62_)" />
+ </g><g
+ id="g585">
+ <path
+ d="M 12.359,14.948 L 12.359,6.354 L 14.96,6.354 L 16.508,12.216 L
18.046,6.354 L 20.657,6.354 L 20.657,14.948 L 19.048,14.948 L 19.04,8.183 L
17.329,14.948 L 15.663,14.948 L 13.977,8.183 L 13.969,14.948 L 12.359,14.948 z "
+ id="path587"
+ style="fill:#ffffff" />
+ <path
+ d="M 22.012,10.704 C 22.012,9.827 22.143,9.091 22.405,8.495 C 22.6,8.057
22.866,7.663 23.204,7.314 C 23.541,6.965 23.912,6.707 24.314,6.539 C
24.849,6.312 25.465,6.198 26.165,6.198 C 27.43,6.198 28.442,6.592 29.202,7.379
C 29.962,8.166 30.341,9.261 30.341,10.663 C 30.341,12.054 29.964,13.142
29.211,13.927 C 28.458,14.712 27.45,15.105 26.189,15.105 C 24.912,15.105
23.897,14.714 23.144,13.933 C 22.391,13.152 22.012,12.075 22.012,10.704 z M
23.793,10.646 C 23.793,11.623 24.018,12.362 24.469,12.865 C 24.919,13.369
25.491,13.621 26.185,13.621 C 26.879,13.621 27.447,13.371 27.892,12.871 C
28.336,12.372 28.559,11.623 28.559,10.623 C 28.559,9.636 28.342,8.898
27.91,8.413 C 27.478,7.928 26.902,7.684 26.185,7.684 C 25.468,7.684 24.89,7.929
24.451,8.42 C 24.012,8.912 23.793,9.654 23.793,10.646 z "
+ id="path589"
+ style="fill:#ffffff" />
+ <path
+ d="M 30.955,14.948 L 30.955,13.386 L 35.476,7.808 L 31.47,7.808 L
31.47,6.354 L 37.751,6.354 L 37.751,7.698 L 33.052,13.495 L 37.923,13.495 L
37.923,14.948 L 30.955,14.948 z "
+ id="path591"
+ style="fill:#ffffff" />
+ </g><path
+ style="fill:none"
+ id="path593"
+ d="M 128,128 L 0,128 L 0,0 L 128,0 L 128,128 z " />
+<path
+
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="M 90.87104,124.33069 L 107.23005,107.97168 L 103.18547,119.71625 L
91.538187,125.4982 L 90.87104,124.33069 z "
+ id="path3595" /></svg>
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/3rdparty/slv2/src/world.c src/engi...,
Remon Sijrier <=