Fix warnings.

Don't build broken GUI stuff.


git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2676 a436a847-0d15-0410-975c-d299462d15a1

9 files changed, 15 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 94e6ea3..691082b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 BUILD_GUI = ! `pkg-config --exists gtk+-2.0`
 GUI_CFLAGS = $(CFLAGS) -Ivstgui `pkg-config --cflags gtk+-2.0 libpng`
 
-all: lvz/gendata libs data gui_libs
+all: lvz/gendata libs data # gui_libs
 
 bundle:
 	mkdir -p ./mda.lv2
@@ -60,8 +60,8 @@ libs: bundle \
 	mda.lv2/mdaTracker.so \
 	mda.lv2/mdaTransient.so \
 	mda.lv2/mdaVocInput.so \
-	mda.lv2/mdaVocoder.so \
-	mda.lv2/mdaSpecMeter.so
+	mda.lv2/mdaVocoder.so
+#	mda.lv2/mdaSpecMeter.so
 
 pixmaps:
 	cp src/mdaSpecMeter.png mda.lv2
@@ -69,9 +69,9 @@ pixmaps:
 gui_libs: bundle pixmaps \
 	mda.lv2/mdaSpecMeterGUI.so
 
-data: libs gui_libs lvz/gendata
+data: libs lvz/gendata #gui_libs
 	cd ./mda.lv2 && ../lvz/gendata ./*.so > manifest.ttl
-	@echo "*** Ignore the above non-error about loading images! ***"
+#	@echo "*** Ignore the above non-error about loading images! ***"
 
 install:
 	if [ "x$(INSTALL_DIR)" = "x" ]; then \
@@ -82,9 +82,9 @@ install:
 	else \
 		install -d $(INSTALL_DIR)/mda.lv2; \
 		install -m 644 ./mda.lv2/*.ttl $(INSTALL_DIR)/mda.lv2; \
-		install -m 644 ./mda.lv2/*.png $(INSTALL_DIR)/mda.lv2; \
 		install -m 755 ./mda.lv2/*.so $(INSTALL_DIR)/mda.lv2; \
 	fi
+#		install -m 644 ./mda.lv2/*.png $(INSTALL_DIR)/mda.lv2; \
 
 install-user:
 	INSTALL_DIR=$(USER_INSTALL_DIR) make install
diff --git a/src/mdaDX10.cpp b/src/mdaDX10.cpp
index 2e911c4..d6bc0ab 100644
--- a/src/mdaDX10.cpp
+++ b/src/mdaDX10.cpp
@@ -167,7 +167,7 @@ void mdaDX10::setParameter(LvzInt32 index, float value)
 }
 
 
-void mdaDX10::fillpatch(LvzInt32 p, char *name,
+void mdaDX10::fillpatch(LvzInt32 p, const char *name,
                      float p0,  float p1,  float p2,  float p3,  float p4,  float p5,
                      float p6,  float p7,  float p8,  float p9,  float p10, float p11,
                      float p12, float p13, float p14, float p15)
diff --git a/src/mdaDX10.h b/src/mdaDX10.h
index 2de75a3..a738dc9 100644
--- a/src/mdaDX10.h
+++ b/src/mdaDX10.h
@@ -76,7 +76,7 @@ public:
 private:
 	void update();  //my parameter update
   void noteOn(LvzInt32 note, LvzInt32 velocity);
-  void fillpatch(LvzInt32 p, char *name,
+  void fillpatch(LvzInt32 p, const char *name,
                  float p0,  float p1,  float p2,  float p3,  float p4,  float p5,
                  float p6,  float p7,  float p8,  float p9,  float p10, float p11,
                  float p12, float p13, float p14, float p15);
diff --git a/src/mdaEPiano.cpp b/src/mdaEPiano.cpp
index 342d8a5..a68baf1 100644
--- a/src/mdaEPiano.cpp
+++ b/src/mdaEPiano.cpp
@@ -187,7 +187,7 @@ void mdaEPiano::setParameter(LvzInt32 index, float value)
 }
 
 
-void mdaEPiano::fillpatch(LvzInt32 p, char *name, float p0, float p1, float p2, float p3, float p4,
+void mdaEPiano::fillpatch(LvzInt32 p, const char *name, float p0, float p1, float p2, float p3, float p4,
                       float p5, float p6, float p7, float p8, float p9, float p10,float p11)
 {
   strcpy(programs[p].name, name);
diff --git a/src/mdaEPiano.h b/src/mdaEPiano.h
index 7d58a53..354c037 100644
--- a/src/mdaEPiano.h
+++ b/src/mdaEPiano.h
@@ -92,7 +92,7 @@ public:
 private:
 	void update();  //my parameter update
   void noteOn(LvzInt32 note, LvzInt32 velocity);
-  void fillpatch(LvzInt32 p, char *name, float p0, float p1, float p2, float p3, float p4,
+  void fillpatch(LvzInt32 p, const char *name, float p0, float p1, float p2, float p3, float p4,
                  float p5, float p6, float p7, float p8, float p9, float p10,float p11);
 
   mdaEPianoProgram* programs;
diff --git a/src/mdaJX10.cpp b/src/mdaJX10.cpp
index a5804a1..2a7737a 100644
--- a/src/mdaJX10.cpp
+++ b/src/mdaJX10.cpp
@@ -254,7 +254,7 @@ void mdaJX10::setParameter(LvzInt32 index, float value)
 }

 

 

-void mdaJX10::fillpatch(LvzInt32 p, char *name,

+void mdaJX10::fillpatch(LvzInt32 p, const char *name,

                       float p0,  float p1,  float p2,  float p3,  float p4,  float p5, 

                       float p6,  float p7,  float p8,  float p9,  float p10, float p11,

                       float p12, float p13, float p14, float p15, float p16, float p17, 

diff --git a/src/mdaJX10.h b/src/mdaJX10.h
index a08aa37..f570998 100644
--- a/src/mdaJX10.h
+++ b/src/mdaJX10.h
@@ -107,7 +107,7 @@ public:
 private:

 	void update();  //my parameter update

   void noteOn(LvzInt32 note, LvzInt32 velocity);

-  void fillpatch(LvzInt32 p, char *name,

+  void fillpatch(LvzInt32 p, const char *name,

                  float p0,  float p1,  float p2,  float p3,  float p4,  float p5, 

                  float p6,  float p7,  float p8,  float p9,  float p10, float p11,

                  float p12, float p13, float p14, float p15, float p16, float p17, 

diff --git a/src/mdaPiano.cpp b/src/mdaPiano.cpp
index ccaa9f5..5162771 100644
--- a/src/mdaPiano.cpp
+++ b/src/mdaPiano.cpp
@@ -170,7 +170,7 @@ void mdaPiano::setParameter(LvzInt32 index, float value)
 }
 
 
-void mdaPiano::fillpatch(LvzInt32 p, char *name, float p0, float p1, float p2, float p3, float p4,
+void mdaPiano::fillpatch(LvzInt32 p, const char *name, float p0, float p1, float p2, float p3, float p4,
                       float p5, float p6, float p7, float p8, float p9, float p10,float p11)
 {
   strcpy(programs[p].name, name);
diff --git a/src/mdaPiano.h b/src/mdaPiano.h
index 865911c..96d2c07 100644
--- a/src/mdaPiano.h
+++ b/src/mdaPiano.h
@@ -1,3 +1,4 @@
+
 //See associated .cpp file for copyright and other info
 
 #ifndef __mdaPiano__
@@ -96,7 +97,7 @@ public:
 private:
 	void update();  //my parameter update
   void noteOn(LvzInt32 note, LvzInt32 velocity);
-  void fillpatch(LvzInt32 p, char *name, float p0, float p1, float p2, float p3, float p4,
+  void fillpatch(LvzInt32 p, const char *name, float p0, float p1, float p2, float p3, float p4,
                  float p5, float p6, float p7, float p8, float p9, float p10,float p11);
 
   float param[NPARAMS];