Fixed missing include in flowcanvas (uint32_t).

Added new temporary (yet spiffy if I do say so myself) icon.
Added desktop entry so Ingenuity shows up in desktop menus all spiff like.


git-svn-id: http://svn.drobilla.net/lad/ingen@159 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 62 insertions, 54 deletions

diff --git a/configure.ac b/configure.ac
index 1f9ce7eb..e8ce24b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,7 +352,6 @@ AM_CONDITIONAL(MONOLITHIC_INGENUITY, [test "$monolithic_ingenuity" = "yes"])
 # Build client lib if anything above that depends on it is to be built
 AM_CONDITIONAL(BUILD_CLIENT_LIB, [test "$build_console_clients" = "yes" -o "$build_gtk_client" = "yes"])
 
-
 # Write Makefiles
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([src/Makefile])
@@ -371,9 +370,9 @@ AC_CONFIG_FILES([src/progs/python/scripts/Makefile])
 AC_CONFIG_FILES([src/progs/demolition/Makefile])
 AC_CONFIG_FILES([src/progs/patch_loader/Makefile])
 AC_CONFIG_FILES([src/progs/ingenuity/Makefile])
+AC_CONFIG_FILES([src/progs/ingenuity/ingenuity.desktop])
 AC_CONFIG_FILES([patches/Makefile])
 AC_CONFIG_FILES([doc/Doxyfile])
-
 AC_OUTPUT
 
 AC_MSG_RESULT([])
diff --git a/ingen.spec b/ingen.spec
deleted file mode 100644
index acc550fb..00000000
--- a/ingen.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-Summary: A realtime modular synthesizer for GNU/Linux audio systems with support Jack and LADSPA or DSSI plugins.
-Name: ingen
-Version: 0.3.0pre
-Release: 1
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.nongnu.org/om-synth/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires:	liblo jackit libxml2 libalsa2 ladspa libdssi0 libgtkmm2.4_1 libglademm2.4_1 libgnomecanvasmm2.6_1
-BuildRequires: liblo-devel libjack0-devel libxml2-devel libalsa2-devel ladspa-devel libdssi0-devel libgtkmm2.4_1-devel libglademm2.4_1-devel libgnomecanvasmm2.6_1-devel
-
-%description
-Ingen is a modular synthesizer for GNU/Linux audio systems with:
-Completely OSC controlled engine, (meaning you can control Ingen over a network, from any number of clients),
-LADSPA and DSSI plugin support, A minimal number of special internal "plugins" (MIDI in, audio outputs, transport, etc.), Polyphony, Multiple top-level patches, with subpatching (unlimited depth).
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} install \
-	DESTDIR="%{buildroot}"
-
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/om
-%{_bindir}/ingenuity
-%{_bindir}/om_patch_loader
-%dir %{_datadir}/om
-%{_datadir}/om/patches/*.om
-%dir %{_datadir}/om-gtk
-%{_datadir}/om-gtk/ingenuity.glade
-%{_datadir}/om-gtk/om-icon.png
-
-
-%doc AUTHORS ChangeLog COPYING NEWS README THANKS
-
-
-%changelog
-* Tue Apr 26 2005 Loki Davison <loki@berlios.de>
-- initial package, v0.0.1
-
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am
index 85a23011..a54f00c8 100644
--- a/src/progs/ingenuity/Makefile.am
+++ b/src/progs/ingenuity/Makefile.am
@@ -4,7 +4,13 @@ EXTRA_DIST = ingenuity.gladep
 MAINTAINERCLEANFILES = Makefile.in
 
 sharefilesdir = $(pkgdatadir)
-dist_sharefiles_DATA = ingenuity.glade om-icon.png
+dist_sharefiles_DATA = ingenuity.glade ingen-icon.svg
+
+desktopfilesdir = $(datadir)/applications
+dist_desktopfiles_DATA = ingenuity.desktop
+
+globalpixmapsdir = $(datadir)/pixmaps
+dist_globalpixmaps_DATA = ingen-icon.svg
 
 ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@
 ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ ../../libs/client/libingenclient.la
diff --git a/src/progs/ingenuity/ingen-icon.svg b/src/progs/ingenuity/ingen-icon.svg
new file mode 100644
index 00000000..a15ed7e7
--- /dev/null
+++ b/src/progs/ingenuity/ingen-icon.svg
@@ -0,0 +1,54 @@
+<?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://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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   width="64"
+   height="64"
+   version="1.0"
+   sodipodi:docbase="/home/dave/code/codesonnet/ingen/src/progs/ingenuity"
+   sodipodi:docname="ingen-icon.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="575"
+     inkscape:window-width="853"
+     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="5.921875"
+     inkscape:cx="32"
+     inkscape:cy="31.915567"
+     inkscape:window-x="569"
+     inkscape:window-y="167"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:black"
+     d="M 7.3978252,58.655244 C 3.8646112,57.233665 3.1688652,52.819494 3.1688652,31.824538 C 3.1688652,10.379073 3.8359622,6.4337347 7.7136682,4.9457196 C 9.8253032,4.135409 54.512427,4.135409 56.624063,4.9457196 C 60.501768,6.4337347 61.168865,10.379073 61.168865,31.824538 C 61.168865,53.270003 60.501768,57.215342 56.624063,58.703357 C 54.702346,59.440788 9.2397932,59.396354 7.3978252,58.655244 z M 55.234606,55.289354 C 57.058692,54.313133 57.168865,52.976602 57.168865,31.824538 C 57.168865,10.672474 57.058692,9.3359433 55.234606,8.3597221 C 52.64791,6.9753642 11.68982,6.9753642 9.1031242,8.3597221 C 7.2790962,9.3359123 7.1688652,10.672309 7.1688652,31.810032 C 7.1688652,52.102806 7.3345622,54.321667 8.9188652,55.244439 C 11.279929,56.619633 52.673952,56.659775 55.234606,55.289354 z M 37.168865,48.891926 C 37.168865,47.331323 36.446365,46.230001 35.153333,45.819608 C 34.04479,45.46777 31.607131,42.787082 29.736313,39.862522 C 25.549347,33.31724 24.555639,32.64737 23.756486,35.831449 C 23.178349,38.13493 22.684027,38.324538 17.256802,38.324538 C 10.799575,38.324538 10.168865,37.746144 10.168865,31.824538 C 10.168865,25.902932 10.799575,25.324538 17.256802,25.324538 C 22.684027,25.324538 23.178349,25.514146 23.756486,27.817627 C 24.555639,31.001706 25.549347,30.331836 29.736313,23.786554 C 31.607131,20.861994 34.04479,18.181306 35.153333,17.829468 C 36.446365,17.419075 37.168865,16.317753 37.168865,14.75715 C 37.168865,12.479647 37.514343,12.324538 42.587078,12.324538 C 50.54284,12.324538 51.168865,12.761099 51.168865,18.309082 C 51.168865,24.371452 49.795116,25.518459 43.000041,25.129613 C 38.343077,24.86312 37.628453,24.53999 37.349314,22.574538 C 36.852569,19.076888 35.536131,19.853195 31.414126,26.074538 L 27.604413,31.824538 L 31.418918,37.574538 C 35.547694,43.798272 36.853067,44.568677 37.349314,41.074538 C 37.628453,39.109086 38.343077,38.785956 43.000041,38.519463 C 49.795116,38.130617 51.168865,39.277624 51.168865,45.339994 C 51.168865,50.887977 50.54284,51.324538 42.587078,51.324538 C 37.514343,51.324538 37.168865,51.169429 37.168865,48.891926 z "
+     id="path1873" />
+</svg>
diff --git a/src/progs/ingenuity/om-icon.png b/src/progs/ingenuity/om-icon.png
deleted file mode 100644
index b26dd942..00000000
--- a/src/progs/ingenuity/om-icon.png
+++ /dev/null