7 files changed, 21 insertions, 72 deletions
diff --git a/src/include/common.h b/src/include/common.h
index 26a405a..0f30aa1 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -17,8 +17,8 @@
   along with this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef blop_common_h
-#define blop_common_h
+#ifndef blip_common_h
+#define blip_common_h
 
 #include "math_func.h"
 
@@ -51,4 +51,4 @@ f_clip (float x, float a, float b)
 	return 0.5f * (FABSF (x - a) + a + b - FABSF (x - b));
 }
 
-#endif /* blop_common_h */
+#endif /* blip_common_h */
diff --git a/src/include/interpolate.h b/src/include/interpolate.h
index 304a817..5fba16a 100644
--- a/src/include/interpolate.h
+++ b/src/include/interpolate.h
@@ -1,8 +1,8 @@
-#ifndef blop_interpolate_h
-#define blop_interpolate_h
+#ifndef blip_interpolate_h
+#define blip_interpolate_h
 
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "blop_config.h"
+#include "blip_config.h"
 #include "math_func.h"
 
 /**
@@ -72,4 +72,4 @@ f_lerp (float value,
 	return value;
 }
 
-#endif /* blop_interpolate_h */
+#endif /* blip_interpolate_h */
diff --git a/src/include/lp4pole_filter.h b/src/include/lp4pole_filter.h
index a6b27f1..adc5cba 100644
--- a/src/include/lp4pole_filter.h
+++ b/src/include/lp4pole_filter.h
@@ -30,8 +30,8 @@
   along with this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef blop_lp4pole_filter_h
-#define blop_lp4pole_filter_h
+#ifndef blip_lp4pole_filter_h
+#define blip_lp4pole_filter_h
 
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "common.h"
@@ -134,4 +134,4 @@ lp4pole_run(LP4PoleFilter* lpf,
 	return lpf->out4;
 }
 
-#endif /* blop_lp4pole_filter_h */
+#endif /* blip_lp4pole_filter_h */
diff --git a/src/include/math_func.h b/src/include/math_func.h
index 60f7ce0..2e4b6e4 100644
--- a/src/include/math_func.h
+++ b/src/include/math_func.h
@@ -7,7 +7,7 @@
 #define math_func_h
 
 #include <math.h>
-#include "blop_config.h"
+#include "blip_config.h"
 
 #ifndef M_PI
 #    define M_PI 3.14159265358979323846 /* pi */
diff --git a/src/include/uris.h b/src/include/uris.h
deleted file mode 100644
index 538bd05..0000000
--- a/src/include/uris.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Common URIs used by plugins.
-  Copyright 2012 David Robillard
-
-  This is free software: you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this software.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef blop_uris_h
-#define blop_uris_h
-
-#include <string.h>
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
-typedef struct {
-	LV2_URID lv2_CVPort;
-	LV2_URID lv2_ControlPort;
-} URIs;
-
-static inline void
-map_uris(URIs*                     uris,
-         const LV2_Feature* const* features)
-{
-	LV2_URID_Map* map = NULL;
-	for (int i = 0; features[i]; ++i) {
-		if (!strcmp(features[i]->URI, LV2_URID__map)) {
-			map = (LV2_URID_Map*)features[i]->data;
-			break;
-		}
-	}
-
-	if (map) {
-		uris->lv2_ControlPort = map->map(map->handle, LV2_CORE__ControlPort);
-		uris->lv2_CVPort      = map->map(map->handle, LV2_CORE__CVPort);
-	} else {
-		memset(uris, 0, sizeof(*uris));
-	}
-}
-
-#endif /* blop_uris_h */
diff --git a/src/include/wavedata.h b/src/include/wavedata.h
index 9d24823..9bd313c 100644
--- a/src/include/wavedata.h
+++ b/src/include/wavedata.h
@@ -17,19 +17,19 @@
   along with this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef blop_wavedata_h
-#define blop_wavedata_h
+#ifndef blip_wavedata_h
+#define blip_wavedata_h
 
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "blop_config.h"
+#include "blip_config.h"
 #include "math_func.h"
 #include "interpolate.h"
 #include "common.h"
 
 /* Functions identifying wavedata dlls */
-#define BLOP_DLSYM_SAWTOOTH "blop_get_sawtooth"
-#define BLOP_DLSYM_SQUARE   "blop_get_square"
-#define BLOP_DLSYM_PARABOLA "blop_get_parabola"
+#define BLOP_DLSYM_SAWTOOTH "blip_get_sawtooth"
+#define BLOP_DLSYM_SQUARE   "blip_get_square"
+#define BLOP_DLSYM_PARABOLA "blip_get_parabola"
 
 /*
  * Structure holding a single segment of sample data
@@ -191,4 +191,4 @@ wavedata_get_table(Wavedata* w,
 } /* extern "C" { */
 #endif
 
-#endif /* blop_wavedata_h */
+#endif /* blip_wavedata_h */
diff --git a/src/include/wdatutil.h b/src/include/wdatutil.h
index a084c7a..931a7f3 100644
--- a/src/include/wdatutil.h
+++ b/src/include/wdatutil.h
@@ -17,8 +17,8 @@
   along with this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef blop_wdatutil_h
-#define blop_wdatutil_h
+#ifndef blip_wdatutil_h
+#define blip_wdatutil_h
 
 #include <stdio.h>
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
@@ -138,4 +138,4 @@ int wavedata_write(Wavedata* w,
 } /* extern "C" { */
 #endif
 
-#endif /* blop_wdatutil_h */
+#endif /* blip_wdatutil_h */