[SCM] calf/master: + AutoHell: add .desktop file (no icon for now, because I can't draw :) ) + LV2: add support for Lars Luthman's Port Groups extension + .svnignore additions

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0714302725beefe6a7924ecaf85a3fdbdea206bb
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Thu Jun 12 20:14:32 2008 +0000

    + AutoHell: add .desktop file (no icon for now, because I can't draw :) )
    + LV2: add support for Lars Luthman's Port Groups extension
    + .svnignore additions
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@197 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/.svnignore b/.svnignore
index 9ec7652..ca2496e 100644
--- a/.svnignore
+++ b/.svnignore
@@ -11,3 +11,5 @@ aclocal.m4
 Makefile.in
 config.status
 ltmain.sh
+calf.desktop
+Makefile
diff --git a/Makefile.am b/Makefile.am
index 91c8a76..5480dc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,9 @@ SUBDIRS = $(SRCDIRS)
 
 distdir = $(PACKAGE)-$(VERSION)
 
+desktopfilesdir = $(datadir)/applications
+dist_desktopfiles_DATA = calf.desktop
+
 EXTRA_DIST = COPYING.GPL TODO autogen.sh calf.glade presets.xml knob.png calf.7 calfjackhost.1
 
 dist_man_MANS = calf.7 calfjackhost.1
diff --git a/calf.desktop.in b/calf.desktop.in
new file mode 100644
index 0000000..4303713
--- /dev/null
+++ b/calf.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Calf Plugin Pack for JACK
+Name[pl]=Zestaw wtyczek Calf
+Comment=Process and produce sounds using a set of plugins with JACK interface
+Comment[pl]=Przetwarzaj i generuj dźwięk używając zestawu wtyczek zgodnych z JACK
+Exec=calfjackhost
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;Audio
diff --git a/configure.ac b/configure.ac
index debf402..df1e268 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ fi
 AC_CHECK_FUNCS([floor memset pow])
 
 AC_CONFIG_FILES([Makefile
+                 calf.desktop
                  src/Makefile
                  src/calf/Makefile])
 AC_MSG_RESULT([
diff --git a/src/makerdf.cpp b/src/makerdf.cpp
index 38cbccb..3d822c1 100644
--- a/src/makerdf.cpp
+++ b/src/makerdf.cpp
@@ -81,6 +81,17 @@ static void add_port(string &ports, const char *symbol, const char *name, const
         // XXXKF add a correct timestamp type here
         ss << ind << "lv2ev:supportsTimestamp <lv2ev:TimeStamp> ;\n";
     }
+    if (!strcmp(symbol, "in_l")) 
+        ss << ind << "pg:membership [ pg:group <#stereoIn>; pg:role pg:leftChannel ] ;" << endl;
+    else
+    if (!strcmp(symbol, "in_r")) 
+        ss << ind << "pg:membership [ pg:group <#stereoIn>; pg:role pg:rightChannel ] ;" << endl;
+    else
+    if (!strcmp(symbol, "out_l")) 
+        ss << ind << "pg:membership [ pg:group <#stereoOut>; pg:role pg:leftChannel ] ;" << endl;
+    else
+    if (!strcmp(symbol, "out_r")) 
+        ss << ind << "pg:membership [ pg:group <#stereoOut>; pg:role pg:rightChannel ] ;" << endl;
     ss << "    ]";
     ports += ss.str();
 }
@@ -128,6 +139,7 @@ void make_ttl(string path_prefix)
         "@prefix uiext: <http://lv2plug.in/ns/extensions/ui#> .\n"
         "@prefix lv2ev: <http://lv2plug.in/ns/ext/event#> .\n"
         "@prefix lv2midi: <http://lv2plug.in/ns/ext/midi#> .\n"
+        "@prefix pg: <http://ll-plugins.nongnu.org/lv2/ext/portgroups#>.\n"
 
         "\n"
     ;

-- 
calf audio plugins packaging