lv2_blklst additions, ffmpeg est/bad times, proxy preview, cin.svg icon

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 009647b3dbc7daeb084fd2fc56173be89e4f4ab5..f4a2474b3c2d1c3b6581d2fd6417e15983ca2802 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -92,7 +92,7 @@ const char *AWindowGUI::folder_names[] =
 
 
 AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)
 
 
 AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)

- : VIcon(w, h, framerate)
+ : VIcon(w, h, framerate), Garbage("AssetVIcon")

 {
        this->picon = picon;
        this->length = length;
 {
        this->picon = picon;
        this->length = length;


@@ -101,6 +101,7 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_
 
 AssetVIcon::~AssetVIcon()
 {
 
 AssetVIcon::~AssetVIcon()
 {

+       picon->gui->vicon_thread->del_vicon(this);

        delete temp;
 }
 
        delete temp;
 }
 


@@ -415,8 +416,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::~AssetPicon()
 {
 
 AssetPicon::~AssetPicon()
 {

-       if( vicon )
-               gui->vicon_thread->del_vicon(vicon);
+       if( vicon ) vicon->remove_user();

        delete vicon_frame;
        if( indexable ) indexable->remove_user();
        if( edl ) edl->remove_user();
        delete vicon_frame;
        if( indexable ) indexable->remove_user();
        if( edl ) edl->remove_user();


@@ -597,6 +597,24 @@ void AssetPicon::create_objects()
                                                }
                                                gui->vicon_thread->add_vicon(vicon);
                                        }
                                                }
                                                gui->vicon_thread->add_vicon(vicon);
                                        }

+                                       else if( asset->folder_no == AW_PROXY_FOLDER ) {
+                                               char unproxy_path[BCTEXTLEN];
+                                               int proxy_scale = mwindow->edl->session->proxy_scale;
+                                               if( !ProxyRender::from_proxy_path(unproxy_path, asset, proxy_scale) ) {
+                                                       Asset *unproxy = mwindow->edl->assets->get_asset(unproxy_path);
+                                                       if( unproxy ) {
+                                                               int i = gui->assets.total;
+                                                               while( --i >= 0 ) {
+                                                                       AssetPicon *picon = (AssetPicon*)gui->assets[i];
+                                                                       if( picon->id == unproxy->id ) {
+                                                                               vicon = picon->vicon;
+                                                                               if( vicon ) vicon->add_user();
+                                                                               break;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }

 
                                }
                                else {
 
                                }
                                else {


@@ -1250,6 +1268,7 @@ void AWindowGUI::start_vicon_drawing()
 {
        if( !vicon_drawing || !vicon_thread->interrupted ) return;
        if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
 {
        if( !vicon_drawing || !vicon_thread->interrupted ) return;
        if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||

+           mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||

            mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
                switch( mwindow->edl->session->assetlist_format ) {
                case ASSETS_ICONS:
            mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
                switch( mwindow->edl->session->assetlist_format ) {
                case ASSETS_ICONS:


@@ -1836,8 +1855,8 @@ void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList<BC_ListBoxItem*> *src)
                        if( text && text[0] )
                                visible = bstrcasestr(picon->get_text(), text) ? 1 : 0;
                }
                        if( text && text[0] )
                                visible = bstrcasestr(picon->get_text(), text) ? 1 : 0;
                }

-               if( picon->vicon )
-                       picon->vicon->hidden = !visible ? 1 : 0;
+               if( visible && picon->vicon && picon->vicon->hidden )
+                       picon->vicon->hidden = 0;

                if( visible ) {
                        BC_ListBoxItem *item2, *item1;
                        dst[0].append(item1 = picon);
                if( visible ) {
                        BC_ListBoxItem *item2, *item1;
                        dst[0].append(item1 = picon);


@@ -2372,6 +2391,7 @@ int AWindowAssets::selection_changed()
        }
        else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 &&
                 ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
        }
        else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 &&
                 ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||

+                  mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||

                   mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
                   (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
                VIcon *vicon = 0;
                   mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
                   (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
                VIcon *vicon = 0;

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index d135145555cd4bb8552cea543ff19d37d20ea4ea..436965c9b5cffeaffd2df12a66473b3c7a842620 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -35,6 +35,7 @@
 #include "edl.inc"
 #include "effectlist.inc"
 #include "folderlistmenu.inc"
 #include "edl.inc"
 #include "effectlist.inc"
 #include "folderlistmenu.inc"

+#include "garbage.h"

 #include "guicast.h"
 #include "labeledit.inc"
 #include "labelpopup.inc"
 #include "guicast.h"
 #include "labeledit.inc"
 #include "labelpopup.inc"


@@ -107,7 +108,7 @@ public:
        double sort_key;
        PluginServer *plugin;
        Label *label;
        double sort_key;
        PluginServer *plugin;
        Label *label;

-       VIcon *vicon;
+       AssetVIcon *vicon;

        RenderEngine *render_engine;
 };
 
        RenderEngine *render_engine;
 };
 


@@ -130,7 +131,7 @@ public:
        int audio_pos;
 };
 
        int audio_pos;
 };
 

-class AssetVIcon : public VIcon {
+class AssetVIcon : public VIcon, public Garbage {

 public:
        AssetPicon *picon;
        VFrame *temp;
 public:
        AssetPicon *picon;
        VFrame *temp;

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 65e0c780e793cfaa82b04cd3860cafbe8cb98066..873abc2e45992454e00887dff701616f478f747d 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -48,6 +48,9 @@
 #define AUDIO_REFILL_THRESH 0x1000
 #define AUDIO_MIN_FRAME_SZ 128
 
 #define AUDIO_REFILL_THRESH 0x1000
 #define AUDIO_MIN_FRAME_SZ 128
 

+#define FF_ESTM_TIMES 0x0001
+#define FF_BAD_TIMES  0x0002
+

 Mutex FFMPEG::fflock("FFMPEG::fflock");
 
 static void ff_err(int ret, const char *fmt, ...)
 Mutex FFMPEG::fflock("FFMPEG::fflock");
 
 static void ff_err(int ret, const char *fmt, ...)


@@ -1325,6 +1328,7 @@ FFMPEG::FFMPEG(FileBase *file_base)
        opt_duration = -1;
        opt_video_filter = 0;
        opt_audio_filter = 0;
        opt_duration = -1;
        opt_video_filter = 0;
        opt_audio_filter = 0;

+       fflags = 0;

        char option_path[BCTEXTLEN];
        set_option_path(option_path, "%s", "ffmpeg.opts");
        read_options(option_path, opts);
        char option_path[BCTEXTLEN];
        set_option_path(option_path, "%s", "ffmpeg.opts");
        read_options(option_path, opts);


@@ -1999,10 +2003,10 @@ int FFMPEG::open_decoder()
                        estimated = 1;
                }
        }
                        estimated = 1;
                }
        }

-       static int notified = 0;
-       if( !notified && estimated ) {
-               notified = 1;
-               printf("FFMPEG::open_decoder: some stream times estimated\n");
+       if( estimated && !(fflags & FF_ESTM_TIMES) ) {
+               fflags |= FF_ESTM_TIMES;
+               printf("FFMPEG::open_decoder: some stream times estimated: %s\n",
+                       fmt_ctx->url);

        }
 
        ff_lock("FFMPEG::open_decoder");
        }
 
        ff_lock("FFMPEG::open_decoder");


@@ -2058,8 +2062,11 @@ int FFMPEG::open_decoder()
                default: break;
                }
        }
                default: break;
                }
        }

-       if( bad_time )
-               printf("FFMPEG::open_decoder: some stream have bad times\n");
+       if( bad_time && !(fflags & FF_BAD_TIMES) ) {
+               fflags |= FF_BAD_TIMES;
+               printf("FFMPEG::open_decoder: some stream have bad times: %s\n",
+                       fmt_ctx->url);
+       }

        ff_unlock();
        return ret < 0 ? -1 : 0;
 }
        ff_unlock();
        return ret < 0 ? -1 : 0;
 }

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 5c9b1ea1e1d0c5fe91f61d96eac480f6261ff332..ec17c9b2cdb60974c4e3425b12cbb5cdbc7bc8ef 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -315,6 +315,7 @@ public:
        char *opt_video_filter;
        char *opt_audio_filter;
        char file_format[BCTEXTLEN];
        char *opt_video_filter;
        char *opt_audio_filter;
        char file_format[BCTEXTLEN];

+       int fflags;

 
        class ffidx {
        public:
 
        class ffidx {
        public:

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index f9978b26ebf0e917b1d7f6852a26b72dbf670c6d..e9a23f4a82bdcac6a426286e734d538fcba478cf 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -222,13 +222,12 @@ void VIconThread::add_vicon(VIcon *vip)
        t_heap[i] = vip;
 }
 
        t_heap[i] = vip;
 }
 

-int VIconThread::del_vicon(VIcon *&vicon)
+int VIconThread::del_vicon(VIcon *vicon)

 {
        int i = t_heap.size();
        while( --i >= 0 && t_heap[i] != vicon );
        if( i < 0 ) return 0;
        remove_vicon(i);
 {
        int i = t_heap.size();
        while( --i >= 0 && t_heap[i] != vicon );
        if( i < 0 ) return 0;
        remove_vicon(i);

-       delete vicon;  vicon = 0;

        return 1;
 }
 
        return 1;
 }
 

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index 6ffe3b174de09e310241f71bed895a0b5e4c2bcc..274051fa3586e6d4b70c3e228dd9c6cb8f3d939f 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.h
+++ b/cinelerra-5.1/guicast/vicon.h
@@ -84,7 +84,7 @@ public:
        ArrayList<VIcon *>t_heap;
        VIcon *low_vicon();
        void add_vicon(VIcon *vicon);
        ArrayList<VIcon *>t_heap;
        VIcon *low_vicon();
        void add_vicon(VIcon *vicon);

-       int del_vicon(VIcon *&vicon);
+       int del_vicon(VIcon *vicon);

        void run();
        void flash();
        int draw(VIcon *vicon);
        void run();
        void flash();
        int draw(VIcon *vicon);

diff --git a/cinelerra-5.1/image/cin.svg b/cinelerra-5.1/image/cin.svg
index 955a42824651419f7578353c561802d5aef8df63..5b3ee248775cf73cebf994f15ccf3ed28014bfe1 100644 (file)
--- a/cinelerra-5.1/image/cin.svg
+++ b/cinelerra-5.1/image/cin.svg
@@ -15,11 +15,11 @@
    viewBox="0 0 47.999998 54.515269"
    version="1.1"
    id="svg124"
    viewBox="0 0 47.999998 54.515269"
    version="1.1"
    id="svg124"

-   sodipodi:docname="cin-app-icon.svg"
+   sodipodi:docname="cin_icon.svg"

    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    inkscape:export-filename="/home/spc/Bilder/Cinfinity_new_buttons/cin-app-icon.png"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    inkscape:export-filename="/home/spc/Bilder/Cinfinity_new_buttons/cin-app-icon.png"

-   inkscape:export-xdpi="960"
-   inkscape:export-ydpi="960">
+   inkscape:export-xdpi="128"
+   inkscape:export-ydpi="128">

   <title
      id="title9470">Cinelerra GG Uifiy app icon</title>
   <metadata
   <title
      id="title9470">Cinelerra GG Uifiy app icon</title>
   <metadata


@@ -95,8 +95,8 @@
      inkscape:snap-midpoints="true"
      inkscape:pagecheckerboard="true"
      inkscape:zoom="11.313708"
      inkscape:snap-midpoints="true"
      inkscape:pagecheckerboard="true"
      inkscape:zoom="11.313708"

-     inkscape:cx="26.778367"
-     inkscape:cy="23.930022"
+     inkscape:cx="39.282147"
+     inkscape:cy="31.776759"

      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"


@@ -118,7 +118,7 @@
        position="40.999998,27.257635"
        orientation="1,0"
        id="guide9369"
        position="40.999998,27.257635"
        orientation="1,0"
        id="guide9369"

-       inkscape:locked="true"
+       inkscape:locked="false"

        inkscape:label=""
        inkscape:color="rgb(0,0,255)" />
     <sodipodi:guide
        inkscape:label=""
        inkscape:color="rgb(0,0,255)" />
     <sodipodi:guide


@@ -761,7 +761,7 @@
          id="stop12-3" />
     </linearGradient>
     <linearGradient
          id="stop12-3" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="g-1-1"
        x1="107.34"
        x2="74.809998"
        id="g-1-1"
        x1="107.34"
        x2="74.809998"


@@ -794,7 +794,7 @@
          id="stop25-5-4" />
     </linearGradient>
     <linearGradient
          id="stop25-5-4" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="a-3-9"
        x1="75.961998"
        x2="107.32"
        id="a-3-9"
        x1="75.961998"
        x2="107.32"


@@ -827,7 +827,7 @@
          id="stop103-6-1" />
     </linearGradient>
     <linearGradient
          id="stop103-6-1" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="f-7-1"
        x1="86.549004"
        x2="164.52"
        id="f-7-1"
        x1="86.549004"
        x2="164.52"


@@ -860,7 +860,7 @@
          id="stop38-3-7" />
     </linearGradient>
     <linearGradient
          id="stop38-3-7" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="e-7-3"
        x1="134.61"
        x2="209.19"
        id="e-7-3"
        x1="134.61"
        x2="209.19"


@@ -893,7 +893,7 @@
          id="stop51-9-4" />
     </linearGradient>
     <linearGradient
          id="stop51-9-4" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="c-3-8"
        x1="186.36"
        x2="219.41"
        id="c-3-8"
        x1="186.36"
        x2="219.41"


@@ -926,7 +926,7 @@
          id="stop77-1-0" />
     </linearGradient>
     <linearGradient
          id="stop77-1-0" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="b-2-8"
        x1="218.00999"
        x2="187.5"
        id="b-2-8"
        x1="218.00999"
        x2="187.5"


@@ -959,7 +959,7 @@
          id="stop90-9-3" />
     </linearGradient>
     <linearGradient
          id="stop90-9-3" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="d-8-8"
        x1="208.17"
        x2="123.71"
        id="d-8-8"
        x1="208.17"
        x2="123.71"


@@ -992,7 +992,7 @@
          id="stop64-3-9" />
     </linearGradient>
     <linearGradient
          id="stop64-3-9" />
     </linearGradient>
     <linearGradient

-       gradientTransform="matrix(-0.07501631,-0.08489229,0.08489229,-0.07501631,21.420996,42.132878)"
+       gradientTransform="matrix(-0.07501632,-0.08489229,0.08489229,-0.07501632,21.420997,42.132879)"

        id="h-0-8"
        x1="161.42"
        x2="83.68"
        id="h-0-8"
        x1="161.42"
        x2="83.68"


@@ -1025,102 +1025,76 @@
          id="stop12-3-0" />
     </linearGradient>
   </defs>
          id="stop12-3-0" />
     </linearGradient>
   </defs>

-  <rect
-     style="fill:#1d1d1d;fill-opacity:1;stroke:none;stroke-width:1.18365693;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect1718"
-     width="54.51527"
-     height="54.51527"
-     x="-3.2576356"
-     y="-1.9694521e-14"
-     rx="11.817431"
-     ry="11.855737" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:17.90217972px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:0.44755435;"
-     x="3.7193985"
-     y="46.668816"
-     id="text1087"><tspan
-       sodipodi:role="line"
-       id="tspan1085"
-       x="3.7193985"
-       y="46.668816"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';fill:#ececec;fill-opacity:1;stroke-width:0.44755435;">C</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:17.90217972px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:0.44755435;"
-     x="32.812527"
-     y="-30.395861"
-     id="text1087-29"
-     transform="rotate(90)"><tspan
-       sodipodi:role="line"
-       id="tspan1085-1"
-       x="32.812527"
-       y="-30.395861"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';fill:#ececec;fill-opacity:1;stroke-width:0.44755435;">C</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:17.69849777px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ececec;fill-opacity:1;stroke:none;stroke-width:0.44246233;"
-     x="22.030775"
-     y="46.183079"
-     id="text1087-4"
-     transform="scale(0.98922673,1.0108906)"><tspan
-       sodipodi:role="line"
-       id="tspan1085-7"
-       x="22.030775"
-       y="46.183079"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';fill:#ececec;fill-opacity:1;stroke-width:0.44246233;">I</tspan></text>
+  <path
+     style="opacity:1;fill:#1d1d1d;fill-opacity:1;stroke:none;stroke-width:1.57965505;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.0997109,0 H 39.900288 c 6.29197,0 11.357347,5.0653766 11.357347,11.357347 v 31.800577 c 0,6.29197 -5.065377,11.357346 -11.357347,11.357346 H 8.0997109 c -6.2919699,0 -11.3573465,-5.065376 -11.3573465,-11.357346 V 11.357347 C -3.2576356,5.0653766 1.807741,0 8.0997109,0 Z"
+     id="rect1080" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:1;fill:url(#g-1-1);stroke-width:0.11328788"
+     d="m 30.355234,17.827931 -6.725679,11.603571 c 0.202409,0.01011 0.402846,0.03105 0.607795,0.03105 3.105755,0 5.921671,-1.185147 8.052183,-3.114397 z"
+     id="path110-4" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#g-1-1);stroke-width:0.11328788"
-     d="m 30.355414,17.828456 2.000384,8.810807 c -2.154624,2.411092 -5.119461,3.416971 -8.875654,3.050342 z"
-     id="path110-4"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#a-3-9);stroke-width:0.11328788"
+     d="m 28.829091,13.391467 3.44935,12.967784 c 2.294075,-2.071951 3.777561,-5.012222 3.93958,-8.311715 z"
+     id="path122-4" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#a-3-9);stroke-width:0.11328788"
-     d="m 28.82948,13.391305 3.525478,13.248548 c 3.055994,-2.219933 5.056211,-4.810604 4.11915,-8.432704 z"
-     id="path122-4"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#f-7-1);stroke-width:0.11328788"
+     d="m 33.136898,9.3964309 -8.524667,1.9342981 11.60579,6.727898 c 0.01011,-0.202766 0.03105,-0.402478 0.03105,-0.607796 0,-3.104939 -1.183832,-5.923627 -3.112179,-8.0544001 z"
+     id="path112-4" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#f-7-1);stroke-width:0.11328788"
-     d="m 24.613061,11.331486 11.861057,6.875503 c 0.472104,-3.120996 -0.577252,-6.076015 -3.050259,-8.8757273 z"
-     id="path112-4"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#e-7-3);stroke-width:0.11328788"
+     d="M 24.829619,5.4679419 20.175767,12.856872 33.143552,9.4053038 C 31.070755,7.1106986 28.130072,5.6288625 24.829619,5.4679419 Z"
+     id="path114-4" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#e-7-3);stroke-width:0.11328788"
-     d="M 20.176076,12.856067 33.424454,9.330737 C 31.615128,7.0150263 29.493528,4.9932218 24.991749,5.2115862 Z"
-     id="path114-4"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#c-3-8);stroke-width:0.11328788"
+     d="m 24.23735,5.4368867 c -3.10576,3e-7 -5.92565,1.1846861 -8.056619,3.1143978 l 1.936517,8.5202295 6.72568,-11.6035721 C 24.64089,5.457868 24.441921,5.4368864 24.23735,5.4368867 Z"
+     id="path118-7" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#c-3-8);stroke-width:0.11328788"
-     d="M 18.11633,17.072568 16.116258,8.2619418 c 3.215196,-3.6171075 6.084814,-3.7328194 8.875653,-3.0503461 z"
-     id="path118-7"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#b-2-8);stroke-width:0.11328788"
+     d="M 16.191823,8.5424116 C 13.897364,10.615264 12.415954,13.55642 12.254461,16.856345 l 7.386712,4.653851 z"
+     id="path120-6" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#b-2-8);stroke-width:0.11328788"
-     d="m 19.641362,21.510065 -7.644403,-4.815591 c -0.47961,-3.304923 1.43348,-5.971791 4.119224,-8.4326169 z"
-     id="path120-6"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#d-8-8);stroke-width:0.11328788"
+     d="m 12.254461,16.843036 c -0.01011,0.202769 -0.03105,0.402478 -0.03105,0.607795 10e-7,3.104912 1.18341,5.921871 3.11218,8.052183 l 8.522443,-1.932081 z"
+     id="path116-3" />

   <path
      inkscape:connector-curvature="0"
   <path
      inkscape:connector-curvature="0"

-     style="fill:url(#d-8-8);stroke-width:0.11328788"
-     d="M 23.858003,23.570139 11.996939,16.694794 c -0.322906,3.355476 0.508975,6.368793 3.050182,8.875643 z"
-     id="path116-3"
-     sodipodi:nodetypes="cccc" />
+     style="opacity:1;fill:url(#h-0-8);stroke-width:0.11328788"
+     d="m 27.837541,22.173448 -12.510829,3.320693 c 2.070323,2.291438 5.007604,3.772846 8.302843,3.937361 z"
+     id="path108-1" />
+  <g
+     aria-label="C"
+     style="font-style:normal;font-weight:normal;font-size:17.90217972px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.44755435"
+     id="text1087-3">
+    <path
+       d="M 17.575686,36.142334 H 7.2103235 q -0.1253152,0 -0.1253152,0.125315 v 7.912764 q 0,0.125315 0.1253152,0.125315 H 17.575686 v 2.363088 H 7.2103235 q -1.0383264,0 -1.7723157,-0.716088 -0.7160872,-0.733989 -0.7160872,-1.772315 v -7.912764 q 0,-1.038326 0.7160872,-1.754413 0.7339893,-0.73399 1.7723157,-0.73399 H 17.575686 Z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';fill:#e6e6e6;fill-opacity:1;stroke-width:0.44755435"
+       id="path1027" />
+  </g>

   <path
   <path

+     d="M 22.791377,46.686041 V 33.804344 h 2.311034 v 12.881697 z"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.69849777px;line-height:1.25;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';letter-spacing:0px;word-spacing:0px;display:inline;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.44246235;opacity:1"
+     id="path1130"

      inkscape:connector-curvature="0"
      inkscape:connector-curvature="0"

-     style="fill:url(#h-0-8);stroke-width:0.11328788"
-     d="m 27.83723,22.172804 -4.357255,7.516951 c -3.436819,0.544877 -6.088156,-1.31737 -8.432854,-4.119318 z"
-     id="path108-1"
-     sodipodi:nodetypes="cccc" />
-  <circle
-     style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.25750458;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path5332"
-     cx="24.23587"
-     cy="17.450661"
-     r="12.641537" />
+     inkscape:label="I" />
+  <g
+     aria-label="C"
+     transform="rotate(90)"
+     style="font-style:normal;font-weight:normal;font-size:17.90217972px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0.44755435"
+     id="text1087-29-5"
+     inkscape:label="N">
+    <path
+       d="M 46.668814,-40.922342 H 36.303452 q -0.125316,0 -0.125316,0.125315 v 7.912763 q 0,0.125316 0.125316,0.125316 h 10.365362 v 2.363087 H 36.303452 q -1.038327,0 -1.772316,-0.716087 -0.716087,-0.733989 -0.716087,-1.772316 v -7.912763 q 0,-1.038327 0.716087,-1.754414 0.733989,-0.733989 1.772316,-0.733989 h 10.365362 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';display:inline;fill:#e6e6e6;fill-opacity:1;stroke-width:0.44755435"
+       id="path1158"
+       inkscape:connector-curvature="0"
+       inkscape:label="N" />
+  </g>

 </svg>
 </svg>

diff --git a/cinelerra-5.1/lv2_blacklist.txt b/cinelerra-5.1/lv2_blacklist.txt
index 795f8b3c7f3b93b48bd9e68b0a07c84632e38e11..5e57df09eaca306dc94583c92b1c02f30aa53e8f 100644 (file)
--- a/cinelerra-5.1/lv2_blacklist.txt
+++ b/cinelerra-5.1/lv2_blacklist.txt
@@ -1,4 +1,4 @@
-# last updated 2018/06/13 gg/pys
+# last updated 2018/11/03 gg/pys/andrea

 http:*midi*
 http:*MIDI*
 
 http:*midi*
 http:*MIDI*
 


@@ -24,6 +24,17 @@ http://lsp-plug.in/plugins/lv2/sc_dyna_processor_lr
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_mono
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_ms
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_stereo
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_mono
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_ms
 http://lsp-plug.in/plugins/lv2/sc_dyna_processor_stereo

+#
+# Andrea Paz tested and bad for at least Arch
+#
+http://lsp-plug.in/plugins/lv2/mb_compressor_lr
+http://lsp-plug.in/plugins/lv2/mb_compressor_ms
+http://lsp-plug.in/plugins/lv2/mb_compressor_stereo
+http://lsp-plug.in/plugins/lv2/sc_mb_compressor_lr
+http://lsp-plug.in/plugins/lv2/sc_mb_compressor_mono
+http://lsp-plug.in/plugins/lv2/sc_mb_compressor_ms
+http://lsp-plug.in/plugins/lv2/sc_mb_compressor_stereo
+#

 http://plugin.org.uk/swh-plugins/bandpass_a_iir
 http://plugin.org.uk/swh-plugins/bandpass_iir
 http://plugin.org.uk/swh-plugins/butthigh_iir
 http://plugin.org.uk/swh-plugins/bandpass_a_iir
 http://plugin.org.uk/swh-plugins/bandpass_iir
 http://plugin.org.uk/swh-plugins/butthigh_iir

diff --git a/cinelerra-5.1/plugins/histogram/histogram.C b/cinelerra-5.1/plugins/histogram/histogram.C
index 33091111dbbb05aa5217effc5d425784796c064c..da67c208694425820ffdc42af07f0949562086d7 100644 (file)
--- a/cinelerra-5.1/plugins/histogram/histogram.C
+++ b/cinelerra-5.1/plugins/histogram/histogram.C
@@ -321,11 +321,13 @@ float HistogramMain::calculate_level(float input,
 
 void HistogramMain::calculate_histogram(VFrame *data, int do_value)
 {
 
 void HistogramMain::calculate_histogram(VFrame *data, int do_value)
 {

-
-       if(!engine) engine = new HistogramEngine(this,
-               get_project_smp() + 1,
-               get_project_smp() + 1);
-
+       if( !engine )
+       {
+               int cpus = data->get_w() * data->get_h() / 0x80000 + 2;
+               int smps = get_project_smp();
+               if( cpus > smps ) cpus = smps;
+               engine = new HistogramEngine(this, cpus, cpus);
+       }

        if(!accum[0])
        {
                for(int i = 0; i < HISTOGRAM_MODES; i++)
        if(!accum[0])
        {
                for(int i = 0; i < HISTOGRAM_MODES; i++)


@@ -446,11 +448,15 @@ int HistogramMain::process_buffer(VFrame *frame,
 // Apply histogram in hardware
        if(use_opengl) return run_opengl();
 
 // Apply histogram in hardware
        if(use_opengl) return run_opengl();
 

-       if(!engine) engine = new HistogramEngine(this,
-               get_project_smp() + 1,
-               get_project_smp() + 1);

        this->input = frame;
        this->output = frame;
        this->input = frame;
        this->output = frame;

+       if( !engine )
+       {
+               int cpus = input->get_w() * input->get_h() / 0x80000 + 2;
+               int smps = get_project_smp();
+               if( cpus > smps ) cpus = smps;
+               engine = new HistogramEngine(this, cpus, cpus);
+       }

 // Always plot to set the curves if automatic
        if(config.plot || config.automatic) send_render_gui(frame);
 
 // Always plot to set the curves if automatic
        if(config.plot || config.automatic) send_render_gui(frame);