ff tooltip, shcmds doc, bld_prepare fix, edl load_xml fix

diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/bld_scripts/bld_prepare.sh
index 9b9a1056fe284ba7059d3c4180ac7d1824c6c9d0..8aea5d836af4c04410ffb04888982ed59d5279d4 100755 (executable)
--- a/cinelerra-5.1/bld_scripts/bld_prepare.sh
+++ b/cinelerra-5.1/bld_scripts/bld_prepare.sh
@@ -70,7 +70,7 @@ case "$dir" in
     libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \
     libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \
     fonts-dejavu libopenexr-dev festival libfftw3-dev gdb \
     libncurses5-dev libxinerama-dev libfreetype6-dev libxft-dev libgif-dev \
     libtiff5-dev exuberant-ctags ttf-bitstream-vera xfonts-75dpi xfonts-100dpi \
     fonts-dejavu libopenexr-dev festival libfftw3-dev gdb \

-    libdc1394-22-dev libesd0-dev libflac-dev libjbig-dev libvdpau-dev
+    libdc1394-22-dev libesd0-dev libflac-dev libjbig-dev libvdpau-dev \

     inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
     autoconf automake debhelper
   ;;
     inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
     autoconf automake debhelper
   ;;

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 3dc2153e7c7d09cb6d83c5bec671842e0f7ed058..9e14b082d9c003af3c534cee3bff931f5718054b 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -301,7 +301,8 @@ int EDL::load_xml(FileXML *file,
                                else
                                if(file->tag.title_is("ASSETS"))
                                {
                                else
                                if(file->tag.title_is("ASSETS"))
                                {

-                                       if(load_flags & LOAD_ASSETS)
+                                       if((load_flags & LOAD_ASSETS) &&
+                                               !parent_edl)

                                                assets->load(file, load_flags);
                                        else
                                                result = file->skip_tag();
                                                assets->load(file, load_flags);
                                        else
                                                result = file->skip_tag();

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 5301f7d1ff4d555491a8f11d06a7f40e9cc9361a..2923c7461b366ba74272c6a83ff337188494756b 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -1672,6 +1672,7 @@ char File::cincfg_path[BCTEXTLEN];
 char File::cinplg_path[BCTEXTLEN];
 char File::cinlad_path[BCTEXTLEN];
 char File::cinlcl_path[BCTEXTLEN];
 char File::cinplg_path[BCTEXTLEN];
 char File::cinlad_path[BCTEXTLEN];
 char File::cinlcl_path[BCTEXTLEN];

+char File::cinbwr_path[BCTEXTLEN];

 
 void File::init_cin_path()
 {
 
 void File::init_cin_path()
 {


@@ -1706,6 +1707,13 @@ void File::init_cin_path()
        getenv_path(env_path, LOCALE_DIR);
        snprintf(cinlcl_path, sizeof(cinlcl_path), "CIN_LOCALE=%s", env_path);
        putenv(cinlcl_path);
        getenv_path(env_path, LOCALE_DIR);
        snprintf(cinlcl_path, sizeof(cinlcl_path), "CIN_LOCALE=%s", env_path);
        putenv(cinlcl_path);

+
+#ifndef CIN_BROWSER
+#define CIN_BROWSER "firefox"
+#endif
+       getenv_path(env_path, CIN_BROWSER);
+       snprintf(cinbwr_path, sizeof(cinlcl_path), "CIN_BROWSER=%s", env_path);
+       putenv(cinbwr_path);

 }
 
 
 }
 
 

diff --git a/cinelerra-5.1/cinelerra/file.h b/cinelerra-5.1/cinelerra/file.h
index a2ed78d55cec022902bc17d168ec2f3e911d1558..08fdf709724faea0cc02202f76c341d84fe2e7f8 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.h
+++ b/cinelerra-5.1/cinelerra/file.h
@@ -321,6 +321,7 @@ public:
        static char cindat_path[BCTEXTLEN], cinlib_path[BCTEXTLEN];
        static char cincfg_path[BCTEXTLEN], cinplg_path[BCTEXTLEN];
        static char cinlad_path[BCTEXTLEN], cinlcl_path[BCTEXTLEN];
        static char cindat_path[BCTEXTLEN], cinlib_path[BCTEXTLEN];
        static char cincfg_path[BCTEXTLEN], cinplg_path[BCTEXTLEN];
        static char cinlad_path[BCTEXTLEN], cinlcl_path[BCTEXTLEN];

+       static char cinbwr_path[BCTEXTLEN];

        static const char *get_cin() { return getenv("CIN_PKG"); }
        static const char *get_cin_path() { return getenv("CIN_PATH"); }
        static const char *get_cindat_path() { return getenv("CIN_DAT"); }
        static const char *get_cin() { return getenv("CIN_PKG"); }
        static const char *get_cin_path() { return getenv("CIN_PATH"); }
        static const char *get_cindat_path() { return getenv("CIN_DAT"); }


@@ -329,6 +330,7 @@ public:
        static const char *get_plugin_path() { return getenv("CIN_PLUGIN"); }
        static const char *get_ladspa_path() { return getenv("CIN_LADSPA"); }
        static const char *get_locale_path() { return getenv("CIN_LOCALE"); }
        static const char *get_plugin_path() { return getenv("CIN_PLUGIN"); }
        static const char *get_ladspa_path() { return getenv("CIN_LADSPA"); }
        static const char *get_locale_path() { return getenv("CIN_LOCALE"); }

+       static const char *get_browser_path() { return getenv("CIN_BROWSER"); }

 
        static const char *default_probes[];
        static const int nb_probes;
 
        static const char *default_probes[];
        static const int nb_probes;

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index a39e7f9ee8072ae8a283551ab9102d8db02da73e..78cbb2a149f0f939e8f7c653f3f5f8179b4e4bcb 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -2289,7 +2289,9 @@ FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;

-       set_tooltip( !get_value() ? _("Try FFMpeg first") : _("Try FFMpeg last") );
+       set_tooltip(!get_value() ?
+               _("Currently: Try FFMpeg last\n   Click to: Try FFMpeg first") :
+               _("Currently: Try FFMpeg first\n   Click to: Try FFMpeg last"));

 }
 
 FFMpegToggle::~FFMpegToggle()
 }
 
 FFMpegToggle::~FFMpegToggle()


@@ -2299,7 +2301,9 @@ FFMpegToggle::~FFMpegToggle()
 int FFMpegToggle::handle_event()
 {
        int ffmpeg_early_probe = get_value();
 int FFMpegToggle::handle_event()
 {
        int ffmpeg_early_probe = get_value();

-       set_tooltip( !ffmpeg_early_probe ?  _("Try FFMpeg first") : _("Try FFMpeg last"));
+       set_tooltip(!ffmpeg_early_probe ?
+               _("Currently: Try FFMpeg last\n   Click to: Try FFMpeg first") :
+               _("Currently: Try FFMpeg first\n   Click to: Try FFMpeg last"));

        mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
        mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
        
        mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
        mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
        

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 5bc21f62d77829c2b0bbef4f5ec63abb32fbe981..0e2629ac6dc192e15bb31f347b5f705d0aba998e 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -392,9 +392,10 @@ int Preferences::load_defaults(BC_Hash *defaults)
        shbtn_prefs.remove_all_objects();
        int shbtns_total = defaults->get("SHBTNS_TOTAL", -1);
        if( shbtns_total < 0 ) {
        shbtn_prefs.remove_all_objects();
        int shbtns_total = defaults->get("SHBTNS_TOTAL", -1);
        if( shbtns_total < 0 ) {

-               shbtn_prefs.append(new ShBtnPref("Features5", "firefox file://$CIN_DAT/doc/Features5.pdf", 0));
-               shbtn_prefs.append(new ShBtnPref("Online Help", "firefox https://cinelerra-cv.org/docs.php", 0));
-               shbtn_prefs.append(new ShBtnPref("Orignal Manual", "firefox file://$CIN_DAT/doc/cinelerra.html", 0));
+               shbtn_prefs.append(new ShBtnPref(_("Features5"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0));
+               shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0));
+               shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 0));
+               shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0));

                shbtns_total = 0;
        }
        for( int i=0; i<shbtns_total; ++i ) {
                shbtns_total = 0;
        }
        for( int i=0; i<shbtns_total; ++i ) {

diff --git a/cinelerra-5.1/doc/Makefile b/cinelerra-5.1/doc/Makefile
index 84b6c650897419671ab93ac3fd5b76deaecb2071..29617eca681c7a6af29bef2707d5204e632310bd 100644 (file)
--- a/cinelerra-5.1/doc/Makefile
+++ b/cinelerra-5.1/doc/Makefile
@@ -53,6 +53,7 @@ $(IMAGES):
 install:       all
        mkdir -p $(TARGET_DIR)
        cp -a *.png $(TARGET_DIR)/.
 install:       all
        mkdir -p $(TARGET_DIR)
        cp -a *.png $(TARGET_DIR)/.

+       cp -a ShellCmds.* $(TARGET_DIR)/.

        cp -a cinelerra.html $(TARGET_DIR)/.
        cp -a Features5.pdf $(TARGET_DIR)/.
 
        cp -a cinelerra.html $(TARGET_DIR)/.
        cp -a Features5.pdf $(TARGET_DIR)/.
 

diff --git a/cinelerra-5.1/doc/ShellCmds.html b/cinelerra-5.1/doc/ShellCmds.html
new file mode 100644 (file)
index 0000000..f3874fd
--- /dev/null
+++ b/cinelerra-5.1/doc/ShellCmds.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html><html>
+<head>
+<title></title>
+<style type="text/css">
+<!--
+.xflip {
+    -moz-transform: scaleX(-1);
+    -webkit-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
+    transform: scaleX(-1);
+    filter: fliph;
+}
+.yflip {
+    -moz-transform: scaleY(-1);
+    -webkit-transform: scaleY(-1);
+    -o-transform: scaleY(-1);
+    transform: scaleY(-1);
+    filter: flipv;
+}
+.xyflip {
+    -moz-transform: scaleX(-1) scaleY(-1);
+    -webkit-transform: scaleX(-1) scaleY(-1);
+    -o-transform: scaleX(-1) scaleY(-1);
+    transform: scaleX(-1) scaleY(-1);
+    filter: fliph + flipv;
+}
+-->
+</style>
+</head>
+<body>
+<a name=1></a>The&#160;Shell&#160;Cmds&#160;popup menu&#160;items&#160;are&#160;configured&#160;in:<br/>
+<b>Settings-&gt;Preferences-&gt;Interface-&gt;Shell&#160;Commands</b><br/>
+This&#160;runs&#160;a&#160;dialog that&#160;lets&#160;you&#160;Add/Del/Edit&#160;the&#160;items&#160;in the&#160;main menu popup. &#160;Possible&#160;options&#160;are:<br/>&#160;<br/>1)&#160;Add a&#160;new&#160;menu item/script:&#160;<br/>&#160; &#160;&#160;click&#160;Add<br/>&#160; &#160;&#160;in the&#160;Label&#160;box, change&#160;the&#160;word &#34;new&#34; to the&#160;desired menu label<br/>&#160; &#160;&#160;in the&#160;Commands&#160;box, type&#160;the&#160;command lines&#160;to be&#160;included in the&#160;script<br/>&#160; &#160;&#160;(for example:&#160;Label&#160;=&gt;&#160;gimp;&#160;Commands&#160;=&gt;&#160;gimp)<br/>&#160; &#160;&#160;check-OK&#160;in the&#160;Commands&#160;window<br/>&#160; &#160;&#160;check-OK&#160;in the&#160;Shell&#160;window<br/>&#160; &#160;&#160;click on OK&#160;or&#160;Apply in the&#160;Preferences&#160;window&#160;(WILL&#160;NOT&#160;TAKE&#160;EFFECT&#160;UNTIL&#160;CLICK)<br/>
+2) Del&#160;to delete&#160;an&#160;existing menu item&#160;(for example&#160;manual):<br/>&#160; &#160; &#160;select&#160;to highlight&#160;an entry in the&#160;Cinelerra:&#160;Shell&#160;listbox<br/>&#160; &#160; &#160;click Del&#160;<br/>&#160; &#160; &#160;check-OK&#160;in the&#160;Shell&#160;window<br/>&#160; &#160; &#160;click on OK&#160;or&#160;Apply in the&#160;Preferences&#160;window&#160;(the&#160;entry is&#160;destroyed)<br/>
+3) Edit&#160;an existing menu item:<br/>&#160; &#160;&#160;click Edit<br/>&#160; &#160;&#160;select&#160;to highlight&#160;an entry in the&#160;Cinelerra:&#160;Shell&#160;listbox<br/>&#160; &#160;&#160;click edit&#160;(the&#160;edit&#160;dialog appears)<br/>&#160; &#160;&#160;set&#160;the&#160;label&#160;and/or&#160;commands&#160;to&#160;the&#160;new&#160;desired values<br/>&#160; &#160;&#160;check-OK&#160;in the&#160;Shell&#160;window<br/>&#160; &#160;&#160;click on OK&#160;or&#160;Apply in the&#160;Preferences&#160;window<br/>
+<hr/>
+<a name="outline"></a><h1>Document Outline</h1>
+<ul>
+<li><a href="ShellCmdss.html#1">Slide 1</a></li>
+</ul>
+<hr/>
+</body>
+</html>

diff --git a/cinelerra-5.1/doc/ShellCmds.pdf b/cinelerra-5.1/doc/ShellCmds.pdf
new file mode 100644 (file)
index 0000000..38ff4b0
Binary files /dev/null and b/cinelerra-5.1/doc/ShellCmds.pdf differ