sams ladspa icons, fix icon drag image, awdw layout, main prints build ts

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index a984e20cdf66c45455fc08607471f5ed8bd0292b..d7301b48c5ac256c076fb50a6d1c3a870abb3455 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -297,25 +297,25 @@ void AssetPicon::create_objects()
                                else {
                                        gui->lock_window("AssetPicon::create_objects 2");
                                        icon = gui->video_icon;
-                                       icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+                                       icon_vframe = gui->video_vframe;
                                }
                        }
                        else {
                                icon = gui->video_icon;
-                               icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+                               icon_vframe = gui->video_vframe;
                        }
                }
                else
                if( asset->audio_data ) {
                        icon = gui->audio_icon;
-                       icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_SOUND];
+                       icon_vframe = gui->audio_vframe;
                }
 
        }
        else
        if( indexable && !indexable->is_asset ) {
                icon = gui->video_icon;
-               icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM];
+               icon_vframe = gui->video_vframe;
        }
        else
        if( edl ) {
@@ -373,9 +373,7 @@ void AssetPicon::create_objects()
                              mwindow->edl->session->frames_per_foot);
                set_text(name);
                icon = gui->label_icon;
-               icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_LABEL];
-               set_icon(icon);
-               set_icon_vframe(icon_vframe);
+               icon_vframe = gui->label_vframe;
        }
        if( !icon ) {
                icon = gui->file_icon;
@@ -616,9 +614,9 @@ void AWindowGUI::create_objects()
        mwindow->theme->get_awindow_sizes(this);
        load_defaults(mwindow->defaults);
 
-       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
        int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-       search_text = new AWindowSearchText(mwindow, this, x1, y1);
+       search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
        search_text->create_objects();
        int dy = search_text->get_h() + 10;
        y1 += dy;  h1 -= dy;
@@ -720,9 +718,9 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
-       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y + 5;
+       int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
        int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-       search_text->reposition_window(x1, y1, w1);
+       search_text->reposition_window(x1, y1+5, w1);
        int dy = search_text->get_h() + 10;
        y1 += dy;  h1 -= dy;
        asset_list->reposition_window(x1, y1, w1, h1);
@@ -837,6 +835,7 @@ void AWindowRemovePlugin::handle_close_event(int result)
 {
        if( !result ) {
                printf(_("remove %s\n"), plugin->path);
+               awindow->gui->lock_window("AWindowRemovePlugin::handle_close_event");
                ArrayList<BC_ListBoxItem*> *folder =
                        plugin->audio ? plugin->transition ?
                                &awindow->gui->atransitions :
@@ -846,14 +845,14 @@ void AWindowRemovePlugin::handle_close_event(int result)
                                &awindow->gui->veffects :
                        0;
                if( folder ) remove_plugin(plugin, *folder);
+               MWindow *mwindow = awindow->mwindow;
+               awindow->gui->unlock_window();
                char plugin_path[BCTEXTLEN];
                strcpy(plugin_path, plugin->path);
-               MWindow *mwindow = awindow->mwindow;
                mwindow->plugindb->remove(plugin);
                remove(plugin_path);
                char index_path[BCTEXTLEN];
-               snprintf(index_path, sizeof(index_path), "%s/%s",
-                       mwindow->preferences->plugin_dir, PLUGIN_FILE);
+               mwindow->create_defaults_path(index_path, PLUGIN_FILE);
                remove(index_path);
                char picon_path[BCTEXTLEN];
                FileSystem fs;

diff --git a/cinelerra-5.1/cinelerra/main.C b/cinelerra-5.1/cinelerra/main.C
index e41f0cbe9c9369c28491e70839d9d0264c6c3f0b..e7fe8f676fffbcca353d9e5b3bb771cdfd7d2430 100644 (file)
--- a/cinelerra-5.1/cinelerra/main.C
+++ b/cinelerra-5.1/cinelerra/main.C
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aboutprefs.h"
 #include "arraylist.h"
 #include "batchrender.h"
 #include "bcsignals.h"
@@ -265,7 +266,6 @@ int main(int argc, char *argv[])
                operation == DO_USAGE ||
                operation == DO_BATCHRENDER) {
 
-               fprintf(stderr, PROGRAM_NAME " " CINELERRA_VERSION);
 #ifndef REPOMAINTXT
 #define REPOMAINTXT ""
 #endif
@@ -275,13 +275,13 @@ int main(int argc, char *argv[])
 #ifndef COPYRIGHTTEXT2
 #define COPYRIGHTTEXT2 ""
 #endif
-#ifndef COMPILEDATE
-#define COMPILEDATE ""
-#endif
-               fprintf(stderr, REPOMAINTXT COPYRIGHTTEXT1 COPYRIGHTTEXT2 COMPILEDATE
-                       PROGRAM_NAME " is free software, covered by the GNU General Public License,\n"
+               fprintf(stderr, "%s %s - %s\n%s",
+                       PROGRAM_NAME,CINELERRA_VERSION, AboutPrefs::build_timestamp,
+                       REPOMAINTXT COPYRIGHTTEXT1 COPYRIGHTTEXT2);
+               fprintf(stderr, "%s is free software, covered by the GNU General Public License,\n"
                        "and you are welcome to change it and/or distribute copies of it under\n"
-                       "certain conditions. There is absolutely no warranty for " PROGRAM_NAME ".\n\n");
+                       "certain conditions. There is absolutely no warranty for %s.\n\n",
+                       PROGRAM_NAME, PROGRAM_NAME);
        }
 
        switch(operation)

diff --git a/cinelerra-5.1/cinelerra/versioninfo.h b/cinelerra-5.1/cinelerra/versioninfo.h
index 7eaf05f3153b20aa74aceebdb33b1fd12ffeb385..21621aec005e657f06dfd9e9041de8c2f18a4f38 100644 (file)
--- a/cinelerra-5.1/cinelerra/versioninfo.h
+++ b/cinelerra-5.1/cinelerra/versioninfo.h
@@ -2,9 +2,9 @@
 #define __VERSIONINFO_H__
 
 #define CINELERRA_VERSION "5.1"
-#define REPOMAINTXT " git://git.cinelerra-cv.org/goodguy/cinelerra.git\n"
+#define REPOMAINTXT "git://git.cinelerra-cv.org/goodguy/cinelerra.git\n"
 #define COPYRIGHT_DATE "2017"
-#define COPYRIGHTTEXT1 "(c) 2006-2016 Heroine Virtual Ltd. by Adam Williams\n"
+#define COPYRIGHTTEXT1 "(c) 2006-2017 Heroine Virtual Ltd. by Adam Williams\n"
 #define COPYRIGHTTEXT2 "(c) 2007-2017 cin5 derivative by W.P. Morrow aka goodguy\n"
 #undef COMPILEDATE
 

diff --git a/cinelerra-5.1/picon/cinfinity/alias_1407.png b/cinelerra-5.1/picon/cinfinity/alias_1407.png
new file mode 100644 (file)
index 0000000..7040eec
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/alias_1407.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/allpass_1895.png b/cinelerra-5.1/picon/cinfinity/allpass_1895.png
new file mode 100644 (file)
index 0000000..f18ea6b
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/allpass_1895.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/am_pitchshift_1433.png b/cinelerra-5.1/picon/cinfinity/am_pitchshift_1433.png
new file mode 100644 (file)
index 0000000..f4275cc
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/am_pitchshift_1433.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/analogue_osc_1416.png b/cinelerra-5.1/picon/cinfinity/analogue_osc_1416.png
new file mode 100644 (file)
index 0000000..eec3d90
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/analogue_osc_1416.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/bode_shifter_1431.png b/cinelerra-5.1/picon/cinfinity/bode_shifter_1431.png
new file mode 100644 (file)
index 0000000..cf47594
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/bode_shifter_1431.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/bode_shifter_cv_1432.png b/cinelerra-5.1/picon/cinfinity/bode_shifter_cv_1432.png
new file mode 100644 (file)
index 0000000..3e75a2a
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/bode_shifter_cv_1432.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/chebstortion_1430.png b/cinelerra-5.1/picon/cinfinity/chebstortion_1430.png
new file mode 100644 (file)
index 0000000..6b86a1a
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/chebstortion_1430.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/comb_1190.png b/cinelerra-5.1/picon/cinfinity/comb_1190.png
new file mode 100644 (file)
index 0000000..1fc013e
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/comb_1190.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/comb_1887.png b/cinelerra-5.1/picon/cinfinity/comb_1887.png
new file mode 100644 (file)
index 0000000..12e93dc
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/comb_1887.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/comb_splitter_1411.png b/cinelerra-5.1/picon/cinfinity/comb_splitter_1411.png
new file mode 100644 (file)
index 0000000..74198bd
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/comb_splitter_1411.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/divider_1186.png b/cinelerra-5.1/picon/cinfinity/divider_1186.png
new file mode 100644 (file)
index 0000000..af42edd
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/divider_1186.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/latency_1914.png b/cinelerra-5.1/picon/cinfinity/latency_1914.png
new file mode 100644 (file)
index 0000000..33fec6c
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/latency_1914.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/phasers_1217.png b/cinelerra-5.1/picon/cinfinity/phasers_1217.png
new file mode 100644 (file)
index 0000000..a820474
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/phasers_1217.png differ

diff --git a/cinelerra-5.1/picon/cinfinity/satan_maximiser_1408.png b/cinelerra-5.1/picon/cinfinity/satan_maximiser_1408.png
new file mode 100644 (file)
index 0000000..b0eea29
Binary files /dev/null and b/cinelerra-5.1/picon/cinfinity/satan_maximiser_1408.png differ