Ticket #446: slv2-0.6.6-haiku.diff

src/world.c

@@ -30 +30 @@
 #include "slv2/util.h"
 #include "slv2_internal.h"
 
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#include <fs_info.h>
+#endif
 
 /* private */
 static SLV2World
@@ -442 +446 @@
         if (lv2_path) {
                 slv2_world_load_path(world, lv2_path);
         } else {
+#ifdef __HAIKU__
+                char common[B_PATH_NAME_LENGTH + 1];
+                char user[B_PATH_NAME_LENGTH + 1];
+
+                if (find_directory(B_COMMON_ADDONS_DIRECTORY, NULL, false, common, B_PATH_NAME_LENGTH) == B_OK)
+                        lv2_path = slv2_strjoin(common, "/lv2");
+
+                if (find_directory(B_USER_ADDONS_DIRECTORY, NULL, false, common, B_PATH_NAME_LENGTH) == B_OK) {
+                        if (lv2_path)
+                                lv2_path = slv2_strjoin(lv2_path, ":", user, "/lv2");
+                        else
+                                lv2_path = slv2_strjoin(user, "/lv2");
+                }
+
+                if (!lv2_path)
+                        return;
+#else
                 const char* const home = getenv("HOME");
                 if (home) {
 #ifdef __APPLE__
@@ -454 +475 @@
                 } else {
 #ifdef __APPLE__
                         lv2_path = strdup("/Library/Audio/Plug-Ins/LV2:/usr/local/lib/lv2:/usr/lib/lv2");
-#else
                         lv2_path = strdup("/usr/local/lib/lv2:/usr/lib/lv2");
 #endif
                 }
+#endif
 
                 slv2_world_load_path(world, lv2_path);
 

slv2-0.6.6

@@ -1 @@
-#!/usr/bin/env python
+#!/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2005-2009
 

slv2-0.6.6

@@ -1 @@
-#!/usr/bin/env python
+#!/bin