From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 3 Jun 2018 23:44:43 +0000 (-0600)
Subject: sams icons, bsd fixups, lv2 deps
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=5877eaa318ed3060f57621657c0888258da41a59;p=goodguy%2Fhistory.git

sams icons, bsd fixups, lv2 deps
---

diff --git a/cinelerra-5.1/cinelerra/ctracking.C b/cinelerra-5.1/cinelerra/ctracking.C
index 5de2a20c..52549c3d 100644
--- a/cinelerra-5.1/cinelerra/ctracking.C
+++ b/cinelerra-5.1/cinelerra/ctracking.C
@@ -113,7 +113,7 @@ int CTracking::update_scroll(double position)
 
 			if(position < right_boundary &&
 				position > left_boundary &&
-				mwindow->edl->local_session->view_start > 0)
+				mwindow->edl->local_session->view_start[pane->number] > 0)
 			{
 				int pixels = Units::to_int64((right_boundary - position) *
 						mwindow->edl->session->sample_rate /
diff --git a/cinelerra-5.1/cinelerra/loadmode.C b/cinelerra-5.1/cinelerra/loadmode.C
index 41b0f687..76f30465 100644
--- a/cinelerra-5.1/cinelerra/loadmode.C
+++ b/cinelerra-5.1/cinelerra/loadmode.C
@@ -168,10 +168,10 @@ LoadModeListBox::~LoadModeListBox()
 
 int LoadModeListBox::handle_event()
 {
-	if(get_selection(0, 0) >= 0)
-	{
-		loadmode->textbox->update(get_selection(0, 0)->get_text());
-		*(loadmode->output) = ((LoadModeItem*)get_selection(0, 0))->value;
+	LoadModeItem *item = (LoadModeItem *)get_selection(0, 0);
+	if( item ) {
+		loadmode->textbox->update(item->get_text());
+		*(loadmode->output) = item->value;
 	}
 	return 1;
 }
diff --git a/cinelerra-5.1/cinelerra/pluginlv2gui.C b/cinelerra-5.1/cinelerra/pluginlv2gui.C
index f6e3518f..e9e62d53 100644
--- a/cinelerra-5.1/cinelerra/pluginlv2gui.C
+++ b/cinelerra-5.1/cinelerra/pluginlv2gui.C
@@ -1,3 +1,4 @@
+#ifdef HAVE_LV2
 
 /*
  * CINELERRA
@@ -360,3 +361,4 @@ void PluginLV2ClientWindow::lv2_set(int idx, float val)
 	lv2_update();
 }
 
+#endif
diff --git a/cinelerra-5.1/cinelerra/renderprofiles.C b/cinelerra-5.1/cinelerra/renderprofiles.C
index 471c7ccd..26d195ca 100644
--- a/cinelerra-5.1/cinelerra/renderprofiles.C
+++ b/cinelerra-5.1/cinelerra/renderprofiles.C
@@ -173,10 +173,10 @@ RenderProfileListBox::~RenderProfileListBox()
 
 int RenderProfileListBox::handle_event()
 {
-	if(get_selection(0, 0) >= 0)
-	{
-		renderprofile->textbox->update(get_selection(0, 0)->get_text());
-		renderprofile->rwindow->load_profile(((RenderProfileItem*)get_selection(0, 0))->value);
+	RenderProfileItem *item = (RenderProfileItem *)get_selection(0, 0);
+	if( item ) {
+		renderprofile->textbox->update(item->get_text());
+		renderprofile->rwindow->load_profile(item->value);
 	}
 	return 1;
 }
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 72cb4eeb..60497a06 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -11,10 +11,13 @@ AC_PROG_CXX
 CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
 CFG_CFLAGS+=" -pthread -Wall"
 # misguided pedantic warnings
+CFG_CFLAGS+=" -Wno-unknown-warning"
 CFG_CFLAGS+=" -Wno-unused-result"
 CFG_CFLAGS+=" -Wno-stringop-overflow"
 CFG_CFLAGS+=" -Wno-format-truncation"
 CFG_CFLAGS+=" -Wno-format-overflow"
+CFG_CFLAGS+=" -Wno-parentheses"
+CFG_CFLAGS+=" -Wno-stringop-truncation"
 CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
 CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 2d5f0d58..50f5aa11 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -93,7 +93,7 @@ all: $(OUTPUT) $(UTILS)
 
 $(BCXFER):	bccmdl.py bcxfer.C bcxfer.h
 	python2.7 < ./bccmdl.py
-	+make -C xfer
+	+$(MAKE) -C xfer
 
 $(OUTPUT): $(OBJS) $(BCXFER)
 	ar rc $(OUTPUT) `cat $(OBJDIR)/objs` `ls -1 $(dir $(BCXFER))/xfer*.o`
@@ -110,7 +110,7 @@ $(OBJDIR)/pngtoraw: pngtoraw.c
 
 clean:
 	rm -rf $(OBJDIR)
-	make -C xfer clean
+	$(MAKE) -C xfer clean
 
 install:
 
diff --git a/cinelerra-5.1/picon/cinfinity/L2_calf.png b/cinelerra-5.1/picon/cinfinity/L2_calf.png
new file mode 100644
index 00000000..625128ec
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/L2_calf.png differ
diff --git a/cinelerra-5.1/picon/cinfinity/ff_acontrast.png b/cinelerra-5.1/picon/cinfinity/ff_acontrast.png
new file mode 100644
index 00000000..5beb61b7
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/ff_acontrast.png differ
diff --git a/cinelerra-5.1/picon/cinfinity/ff_drmeter.png b/cinelerra-5.1/picon/cinfinity/ff_drmeter.png
new file mode 100644
index 00000000..55ce6bcc
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/ff_drmeter.png differ
diff --git a/cinelerra-5.1/picon/cinfinity/ff_hilbert.png b/cinelerra-5.1/picon/cinfinity/ff_hilbert.png
new file mode 100644
index 00000000..08461e4b
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/ff_hilbert.png differ
diff --git a/cinelerra-5.1/picon/cinfinity/ff_mcompand.png b/cinelerra-5.1/picon/cinfinity/ff_mcompand.png
new file mode 100644
index 00000000..726bbf86
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/ff_mcompand.png differ
diff --git a/cinelerra-5.1/picon/cinfinity2/L2_calf.png b/cinelerra-5.1/picon/cinfinity2/L2_calf.png
new file mode 100644
index 00000000..f003014c
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/L2_calf.png differ
diff --git a/cinelerra-5.1/picon/cinfinity2/ff_acontrast.png b/cinelerra-5.1/picon/cinfinity2/ff_acontrast.png
new file mode 100644
index 00000000..cca5763a
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/ff_acontrast.png differ
diff --git a/cinelerra-5.1/picon/cinfinity2/ff_drmeter.png b/cinelerra-5.1/picon/cinfinity2/ff_drmeter.png
new file mode 100644
index 00000000..8391e2af
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/ff_drmeter.png differ
diff --git a/cinelerra-5.1/picon/cinfinity2/ff_hilbert.png b/cinelerra-5.1/picon/cinfinity2/ff_hilbert.png
new file mode 100644
index 00000000..2fd267cd
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/ff_hilbert.png differ
diff --git a/cinelerra-5.1/picon/cinfinity2/ff_mcompand.png b/cinelerra-5.1/picon/cinfinity2/ff_mcompand.png
new file mode 100644
index 00000000..a24099ef
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity2/ff_mcompand.png differ
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 9bcbab0d..b5bb2e7e 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -245,7 +245,7 @@ suil.cfg_params?= --static --no-qt
 $(eval $(call waf-setup,lv2))
 $(eval $(call waf-setup,serd))
 $(eval $(call waf-setup,sord, serd))
-$(eval $(call waf-setup,sratom, serd sord))
+$(eval $(call waf-setup,sratom, serd sord lv2))
 $(eval $(call waf-setup,lilv, lv2 sratom serd sord))
 $(eval $(call waf-setup,suil, lv2))
 
@@ -310,7 +310,7 @@ $(call rules,$(call std-build,libvpx))
 $(call rules,$(call std-build,lv2))
 $(call rules,$(call std-build,serd))
 $(call rules,$(call std-build,sord, serd))
-$(call rules,$(call std-build,sratom, serd sord))
+$(call rules,$(call std-build,sratom, serd sord lv2))
 $(call rules,$(call std-build,lilv, lv2 sratom serd sord))
 $(call rules,$(call std-build,suil, lv2))