sams icons, bsd fixups, lv2 deps

diff --git a/cinelerra-5.1/cinelerra/ctracking.C b/cinelerra-5.1/cinelerra/ctracking.C
index 5de2a20c578420fda5b068b0faf7cba6c43985d1..52549c3dc50edf11223cbd86e8c6ae99fb9ae07d 100644 (file)
--- 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 41b0f687aa8a6aa7cdf94f525aa1ce3e5c928a77..76f30465909b969dc2987dcd4b90a79f1727996d 100644 (file)
--- 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 f6e3518fa1662ecbf74c1a97b3ad3d191874db78..e9e62d533cf1b4b7ef108d85fc29dd93ea767634 100644 (file)
--- 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 471c7ccd4c268e44ae85e74c101015143c1c2fc6..26d195ca024a394dab80435bb32e69a2d3139606 100644 (file)
--- 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 72cb4eeb04857afebaa14e6cc7e0d6ccb172fdd8..60497a06150dce72d15a1f6cac4f81bed6dad61f 100644 (file)
--- 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 2d5f0d5815749baef936b89fccb3a3463d3e2f67..50f5aa11e5ae626001e30262d674927333b32815 100644 (file)
--- 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 (file)
index 0000000..625128e
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 (file)
index 0000000..5beb61b
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 (file)
index 0000000..55ce6bc
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 (file)
index 0000000..08461e4
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 (file)
index 0000000..726bbf8
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 (file)
index 0000000..f003014
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 (file)
index 0000000..cca5763
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 (file)
index 0000000..8391e2a
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 (file)
index 0000000..2fd267c
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 (file)
index 0000000..a24099e
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 9bcbab0deb9799f17544325c13cb16d6e301737d..b5bb2e7e7fbf711f92b09cdc98b471e32f984a16 100644 (file)
--- 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))