rework scopewindow, spanish xlat updates

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 7cb5a1007d5bde2bdd77632f505f22e1f43eab0d..3a6c2db8e9f96de906a5216f45ee8704821b4313 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -1100,7 +1100,7 @@ int CWindowCanvas::scope_on()
 
 void CWindowCanvas::draw_scope(VFrame *output)
 {
 
 void CWindowCanvas::draw_scope(VFrame *output)
 {

-       if( gui->edit_panel->scope_dialog )
+       if( gui->edit_panel->scope_dialog && output )

                gui->edit_panel->scope_dialog->process(output);
 }
 
                gui->edit_panel->scope_dialog->process(output);
 }
 

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 74aa53c984b06f58b10d760faa4f69dd8a6e570c..7eca7192a496b21df673ba28cd776f4908a22982 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -48,6 +48,7 @@
 #include "timebar.h"
 #include "trackcanvas.h"
 #include "transportque.h"
 #include "timebar.h"
 #include "trackcanvas.h"
 #include "transportque.h"

+#include "vwindowgui.h"

 #include "zoombar.h"
 
 
 #include "zoombar.h"
 
 


@@ -1263,6 +1264,21 @@ EditPanelScope::~EditPanelScope()
 {
 }
 
 {
 }
 

+void EditPanelScopeGUI::update_scope()
+{
+       Canvas *canvas = 0;
+       if( dialog->panel->is_cwindow() ) {
+               CWindowGUI *cgui = (CWindowGUI *)dialog->panel->subwindow;
+               canvas = cgui->canvas;
+       }
+       else if( dialog->panel->is_vwindow() ) {
+               VWindowGUI *vgui = (VWindowGUI *)dialog->panel->subwindow;
+               canvas = vgui->canvas;
+       }
+       if( canvas && canvas->refresh_frame )
+               process(canvas->refresh_frame);
+}
+

 int EditPanelScope::handle_event()
 {
        unlock_window();
 int EditPanelScope::handle_event()
 {
        unlock_window();

diff --git a/cinelerra-5.1/cinelerra/editpanel.h b/cinelerra-5.1/cinelerra/editpanel.h
index 9e0d3bcb3725c5d48a624e6d7c887a6c8b16453c..c5064dd0e9a9ded4abca01e6a5534917bccefd5b 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpanel.h
+++ b/cinelerra-5.1/cinelerra/editpanel.h
@@ -355,6 +355,7 @@ public:
        void toggle_event();
        int translation_event();
        int resize_event(int w, int h);
        void toggle_event();
        int translation_event();
        int resize_event(int w, int h);

+       void update_scope();

 
        MWindow *mwindow;
        EditPanelScopeDialog *dialog;
 
        MWindow *mwindow;
        EditPanelScopeDialog *dialog;

diff --git a/cinelerra-5.1/cinelerra/scopewindow.C b/cinelerra-5.1/cinelerra/scopewindow.C
index 25e386f414580e4d62b2573c9c0785f2bc62f3c8..36883b68d5da6355c0db01966913435a48838d5e 100644 (file)
--- a/cinelerra-5.1/cinelerra/scopewindow.C
+++ b/cinelerra-5.1/cinelerra/scopewindow.C
@@ -40,13 +40,25 @@ ScopeUnit::ScopeUnit(ScopeGUI *gui,
        this->gui = gui;
 }
 
        this->gui = gui;
 }
 

-void ScopeUnit::draw_point(unsigned char **rows,
-       int x, int y, int r, int g, int b)
-{
-       unsigned char *pixel = rows[y] + x * 4;
-       pixel[0] = b;
-       pixel[1] = g;
-       pixel[2] = r;
+#define BPP 3
+#define incr_point(rows,h, n, comp) \
+if(iy >= 0 && iy < h) { int v; \
+  uint8_t *vp = rows[iy] + ix*BPP + (comp); \
+  v = *vp+(n);  *vp = v>0xff ? 0xff : v; \
+}
+#define incr_points(rows,h, rv, gv, bv) \
+if(iy >= 0 && iy < h) { int v; \
+  uint8_t *vp = rows[iy] + ix*BPP; \
+  v = *vp+(rv);  *vp++ = v>0xff ? 0xff : v; \
+  v = *vp+(gv);  *vp++ = v>0xff ? 0xff : v; \
+  v = *vp+(bv);  *vp   = v>0xff ? 0xff : v; \
+}
+#define clip_points(rows,h, rv, gv, bv) \
+if(iy >= 0 && iy < h) { int v; \
+  uint8_t *vp = rows[iy] + ix*BPP; \
+  v = *vp+(rv);  *vp++ = v>0xff ? 0xff : v<0 ? 0 : v; \
+  v = *vp+(gv);  *vp++ = v>0xff ? 0xff : v<0 ? 0 : v; \
+  v = *vp+(bv);  *vp   = v>0xff ? 0xff : v<0 ? 0 : v; \

 }
 
 #define PROCESS_PIXEL(column) { \
 }
 
 #define PROCESS_PIXEL(column) { \


@@ -56,7 +68,7 @@ void ScopeUnit::draw_point(unsigned char **rows,
                CLAMP(v_i, 0, TOTAL_BINS - 1); \
                bins[3][v_i]++; \
        } \
                CLAMP(v_i, 0, TOTAL_BINS - 1); \
                bins[3][v_i]++; \
        } \

-       else if(use_hist_parade) { \
+       if(use_hist_parade) { \

                int r_i = (r - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \
                int g_i = (g - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \
                int b_i = (b - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \
                int r_i = (r - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \
                int g_i = (g - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \
                int b_i = (b - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \


@@ -69,45 +81,60 @@ void ScopeUnit::draw_point(unsigned char **rows,
        } \
 /* Calculate waveform */ \
        if(use_wave || use_wave_parade) { \
        } \
 /* Calculate waveform */ \
        if(use_wave || use_wave_parade) { \

-               int ix = (column) * wave_w / w; \
+               int ix = (column) * wave_w / out_w; \

                if(ix >= 0 && ix < wave_w) { \
                if(ix >= 0 && ix < wave_w) { \

-                       if(use_wave_parade) { \
+                       if(use_wave_parade > 0) { \
+                               ix /= 3; \
+                               int iy = wave_h - (int)((r - FLOAT_MIN) /  \
+                                               (FLOAT_MAX - FLOAT_MIN) * wave_h); \
+                               incr_point(waveform_rows,wave_h, winc, 0); \
+                               ix += wave_w/3; \
+                               iy = wave_h - (int)((g - FLOAT_MIN) /  \
+                                               (FLOAT_MAX - FLOAT_MIN) * wave_h); \
+                               incr_point(waveform_rows,wave_h, winc, 1); \
+                               ix += wave_w/3; \
+                               iy = wave_h - (int)((b - FLOAT_MIN) /  \
+                                               (FLOAT_MAX - FLOAT_MIN) * wave_h); \
+                               incr_point(waveform_rows,wave_h, winc, 2); \
+                       } \
+                       else if(use_wave_parade < 0) { \

                                int iy = wave_h - (int)((r - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \
                                int iy = wave_h - (int)((r - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \

-                               if(iy >= 0 && iy < wave_h) \
-                                       draw_point(waveform_rows, ix / 3, iy, 0xff, 0x0, 0x0);  \
+                               clip_points(waveform_rows,wave_h, winc, -winc, -winc); \

                                iy = wave_h - (int)((g - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \
                                iy = wave_h - (int)((g - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \

-                               if(iy >= 0 && iy < wave_h)  \
-                                       draw_point(waveform_rows, ix / 3 + wave_w / 3, iy, 0x0, 0xff, 0x0);  \
+                               clip_points(waveform_rows,wave_h, -winc, winc, -winc); \

                                iy = wave_h - (int)((b - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \
                                iy = wave_h - (int)((b - FLOAT_MIN) /  \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \

-                               if(iy >= 0 && iy < wave_h)  \
-                                       draw_point(waveform_rows, ix / 3 + wave_w / 3 * 2, iy, 0x0, 0x0, 0xff);  \
+                               clip_points(waveform_rows,wave_h, -winc, -winc, winc); \

                        } \
                        } \

-                       else { \
-                               int iy = wave_h - (int)((intensity - FLOAT_MIN) /  \
+                       else { int yinc = 3*winc; \
+                               int rinc = yinc*(r-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \
+                               int ginc = yinc*(g-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \
+                               int binc = yinc*(b-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \
+                               int iy = wave_h - ((intensity - FLOAT_MIN) /  \

                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \
                                                (FLOAT_MAX - FLOAT_MIN) * wave_h); \

-                               if(iy >= 0 && iy < wave_h)  \
-                                       draw_point(waveform_rows, ix, iy, 0xff, 0xff, 0xff);  \
+                               incr_points(waveform_rows,wave_h, rinc, ginc, binc); \

                        } \
                } \
        } \
 /* Calculate vectorscope */ \
        if(use_vector) { \
                        } \
                } \
        } \
 /* Calculate vectorscope */ \
        if(use_vector) { \

-               float adjacent = cos((h + 90) / 360 * 2 * M_PI); \
-               float opposite = sin((h + 90) / 360 * 2 * M_PI); \
+               float th = 90 - h; \
+               if( th < 0 ) th += 360; \
+               double t = TO_RAD(th); \
+               float adjacent = -cos(t), opposite = sin(t); \

                int ix = vector_w / 2 + adjacent * (s) / (FLOAT_MAX) * radius; \
                int ix = vector_w / 2 + adjacent * (s) / (FLOAT_MAX) * radius; \

-               int y = vector_h / 2 - opposite * (s) / (FLOAT_MAX) * radius; \
+               int iy = vector_h / 2 - opposite * (s) / (FLOAT_MAX) * radius; \

                CLAMP(ix, 0, vector_w - 1); \
                CLAMP(ix, 0, vector_w - 1); \

-               CLAMP(y, 0, vector_h - 1); \

        /* Get color with full saturation & value */ \
                float r_f, g_f, b_f; \
        /* Get color with full saturation & value */ \
                float r_f, g_f, b_f; \

+               if( (h=h-90) < 0 ) h += 360; \

                HSV::hsv_to_rgb(r_f, g_f, b_f, h, s, 1); \
                HSV::hsv_to_rgb(r_f, g_f, b_f, h, s, 1); \

-               draw_point(vector_rows, ix, y, \
-                       (int)(CLIP(r_f, 0, 1) * 255),  \
-                       (int)(CLIP(g_f, 0, 1) * 255),  \
-                       (int)(CLIP(b_f, 0, 1) * 255)); \
+               int rv = CLIP(r_f, 0, 1) * vinc + 3; \
+               int gv = CLIP(g_f, 0, 1) * vinc + 3; \
+               int bv = CLIP(b_f, 0, 1) * vinc + 3; \
+               incr_points(vector_rows,vector_h, rv, gv, bv); \

        } \
 }
 
        } \
 }
 


@@ -130,7 +157,7 @@ void ScopeUnit::draw_point(unsigned char **rows,
 }
 
 #define PROCESS_YUV_PIXEL(column, y_in, u_in, v_in) { \
 }
 
 #define PROCESS_YUV_PIXEL(column, y_in, u_in, v_in) { \

-       YUV::yuv.yuv_to_rgb_f(r, g, b, (float)y_in / 255, (float)(u_in - 0x80) / 255, (float)(v_in - 0x80) / 255); \
+       YUV::yuv.yuv_to_rgb_f(r, g, b, y_in, u_in, v_in); \

        HSV::rgb_to_hsv(r, g, b, h, s, v); \
        intensity = v; \
        PROCESS_PIXEL(column) \
        HSV::rgb_to_hsv(r, g, b, h, s, v); \
        intensity = v; \
        PROCESS_PIXEL(column) \


@@ -148,24 +175,29 @@ void ScopeUnit::process_package(LoadPackage *package)
        int use_vector = gui->use_vector;
        int use_wave = gui->use_wave;
        int use_wave_parade = gui->use_wave_parade;
        int use_vector = gui->use_vector;
        int use_wave = gui->use_wave;
        int use_wave_parade = gui->use_wave_parade;

-       BC_Bitmap *waveform_bitmap = gui->waveform_bitmap;
-       BC_Bitmap *vector_bitmap = gui->vector_bitmap;
-       int wave_h = waveform_bitmap->get_h();
-       int wave_w = waveform_bitmap->get_w();
-       int vector_h = vector_bitmap->get_h();
-       int vector_w = vector_bitmap->get_w();
-
-       int w = gui->output_frame->get_w();
+       VFrame *waveform_vframe = gui->waveform_vframe;
+       VFrame *vector_vframe = gui->vector_vframe;
+       int wave_h = waveform_vframe->get_h();
+       int wave_w = waveform_vframe->get_w();
+       int vector_h = vector_vframe->get_h();
+       int vector_w = vector_vframe->get_w();
+       int out_w = gui->output_frame->get_w();
+       int out_h = gui->output_frame->get_h();
+       int winc = (wave_w * wave_h) / (out_w * out_h);
+       if( use_wave_parade ) winc *= 3;
+       winc += 2;  winc *= gui->wdial;
+       int vinc = 3*(vector_w * vector_h) / (out_w * out_h) + 2;
+       vinc *= gui->vdial;

        float radius = MIN(gui->vector_w / 2, gui->vector_h / 2);
        float radius = MIN(gui->vector_w / 2, gui->vector_h / 2);

-       unsigned char **waveform_rows = waveform_bitmap->get_row_pointers();
-       unsigned char **vector_rows = vector_bitmap->get_row_pointers();
+       unsigned char **waveform_rows = waveform_vframe->get_rows();
+       unsigned char **vector_rows = vector_vframe->get_rows();

        unsigned char **rows = gui->output_frame->get_rows();
 
        switch( gui->output_frame->get_color_model() ) {
        case BC_RGB888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        unsigned char **rows = gui->output_frame->get_rows();
 
        switch( gui->output_frame->get_color_model() ) {
        case BC_RGB888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_RGB_PIXEL(x, 255)
                        }
                }
                                PROCESS_RGB_PIXEL(x, 255)
                        }
                }


@@ -173,7 +205,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_RGBA8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_RGBA8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_RGB_PIXEL(x, 255)
                                ++row;
                        }
                                PROCESS_RGB_PIXEL(x, 255)
                                ++row;
                        }


@@ -182,7 +214,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_BGR888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_BGR888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_BGR_PIXEL(x, 255)
                        }
                }
                                PROCESS_BGR_PIXEL(x, 255)
                        }
                }


@@ -190,7 +222,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_BGR8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_BGR8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_BGR_PIXEL(x, 255)
                                ++row;
                        }
                                PROCESS_BGR_PIXEL(x, 255)
                                ++row;
                        }


@@ -199,7 +231,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_RGB_FLOAT:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        float *row = (float*)rows[y];
        case BC_RGB_FLOAT:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        float *row = (float*)rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_RGB_PIXEL(x, 1.0)
                        }
                }
                                PROCESS_RGB_PIXEL(x, 1.0)
                        }
                }


@@ -207,7 +239,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_RGBA_FLOAT:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        float *row = (float*)rows[y];
        case BC_RGBA_FLOAT:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        float *row = (float*)rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_RGB_PIXEL(x, 1.0)
                                ++row;
                        }
                                PROCESS_RGB_PIXEL(x, 1.0)
                                ++row;
                        }


@@ -216,7 +248,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_YUV888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_YUV888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[2])
                                row += 3;
                        }
                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[2])
                                row += 3;
                        }


@@ -226,7 +258,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_YUVA8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_YUVA8888:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; ++x ) {
+                       for( int x=0; x<out_w; ++x ) {

                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[2])
                                row += 4;
                        }
                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[2])
                                row += 4;
                        }


@@ -237,12 +269,14 @@ void ScopeUnit::process_package(LoadPackage *package)
                unsigned char *up = gui->output_frame->get_u();
                unsigned char *vp = gui->output_frame->get_v();
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                unsigned char *up = gui->output_frame->get_u();
                unsigned char *vp = gui->output_frame->get_v();
                for( int y=pkg->row1; y<pkg->row2; ++y ) {

-                       unsigned char *y_row = yp + y * w;
-                       unsigned char *u_row = up + (y / 2) * (w / 2);
-                       unsigned char *v_row = vp + (y / 2) * (w / 2);
-                       for( int x=0; x<w; x+=2 ) {
-                               PROCESS_YUV_PIXEL(x, *y_row, *u_row, *v_row);      ++y_row;
-                               PROCESS_YUV_PIXEL(x + 1, *y_row, *u_row, *v_row);  ++y_row;
+                       unsigned char *y_row = yp + y * out_w;
+                       unsigned char *u_row = up + (y / 2) * (out_w / 2);
+                       unsigned char *v_row = vp + (y / 2) * (out_w / 2);
+                       for( int x=0; x<out_w; x+=2 ) {
+                               PROCESS_YUV_PIXEL(x, *y_row, *u_row, *v_row);
+                               ++y_row;
+                               PROCESS_YUV_PIXEL(x + 1, *y_row, *u_row, *v_row);
+                               ++y_row;

                                ++u_row;  ++v_row;
                        }
                }
                                ++u_row;  ++v_row;
                        }
                }


@@ -250,7 +284,7 @@ void ScopeUnit::process_package(LoadPackage *package)
        case BC_YUV422:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];
        case BC_YUV422:
                for( int y=pkg->row1; y<pkg->row2; ++y ) {
                        unsigned char *row = rows[y];

-                       for( int x=0; x<w; x+=2 ) {
+                       for( int x=0; x<out_w; x+=2 ) {

                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[3]);
                                PROCESS_YUV_PIXEL(x + 1, row[2], row[1], row[3]);
                                row += 4;
                                PROCESS_YUV_PIXEL(x, row[0], row[1], row[3]);
                                PROCESS_YUV_PIXEL(x + 1, row[2], row[1], row[3]);
                                row += 4;


@@ -314,9 +348,8 @@ void ScopeEngine::process()
        for(int i=0,n=get_total_clients(); i<n; ++i ) {
                ScopeUnit *unit = (ScopeUnit*)get_client(i);
                for( int j=0; j<HIST_SECTIONS; ++j ) {
        for(int i=0,n=get_total_clients(); i<n; ++i ) {
                ScopeUnit *unit = (ScopeUnit*)get_client(i);
                for( int j=0; j<HIST_SECTIONS; ++j ) {

-                       for( int k=0; k<TOTAL_BINS; ++k ) {
-                               gui->bins[j][k] += unit->bins[j][k];
-                       }
+                       int *bp = gui->bins[j], *up = unit->bins[j];
+                       for( int k=TOTAL_BINS; --k>=0; ++bp,++up ) *bp += *up;

                }
        }
 }
                }
        }
 }


@@ -350,16 +383,16 @@ ScopeGUI::ScopeGUI(PluginClient *plugin, int w, int h)
 
 ScopeGUI::~ScopeGUI()
 {
 
 ScopeGUI::~ScopeGUI()
 {

-       delete waveform_bitmap;
-       delete vector_bitmap;
+       delete waveform_vframe;
+       delete vector_vframe;

        delete engine;
 }
 
 void ScopeGUI::reset()
 {
        frame_w = 1;
        delete engine;
 }
 
 void ScopeGUI::reset()
 {
        frame_w = 1;

-       waveform_bitmap = 0;
-       vector_bitmap = 0;
+       waveform_vframe = 0;
+       vector_vframe = 0;

        engine = 0;
        use_hist = 0;
        use_wave = 1;
        engine = 0;
        use_hist = 0;
        use_wave = 1;


@@ -370,6 +403,7 @@ void ScopeGUI::reset()
        vectorscope = 0;
        histogram = 0;
        wave_w = wave_h = vector_w = vector_h = 0;
        vectorscope = 0;
        histogram = 0;
        wave_w = wave_h = vector_w = vector_h = 0;

+       wdial = vdial = 5.f;

 }
 
 
 }
 
 


@@ -383,30 +417,17 @@ void ScopeGUI::create_objects()
 
        lock_window("ScopeGUI::create_objects");
        int x = theme->widget_border;
 
        lock_window("ScopeGUI::create_objects");
        int x = theme->widget_border;

-       int y = theme->widget_border;
-       add_subwindow(hist_on = new ScopeToggle(this, x, y, &use_hist));
-       x += hist_on->get_w() + theme->widget_border;
-
-       add_subwindow(hist_parade_on = new ScopeToggle(this, x, y, &use_hist_parade));
-       x += hist_parade_on->get_w() + theme->widget_border;
-
-       add_subwindow(waveform_on = new ScopeToggle(this, x, y, &use_wave));
-       x += waveform_on->get_w() + theme->widget_border;
-       add_subwindow(waveform_parade_on = new ScopeToggle(this, x, y, &use_wave_parade));
-       x += waveform_parade_on->get_w() + theme->widget_border;
-
-       add_subwindow(vector_on = new ScopeToggle(this, x, y, &use_vector));
-       x += vector_on->get_w() + theme->widget_border;
-
+       int y = theme->widget_border +
+               ScopeWaveDial::calculate_h() - ScopeMenu::calculate_h();
+       add_subwindow(scope_menu = new ScopeMenu(this, x, y));
+       scope_menu->create_objects();
+       x += scope_menu->get_w() + theme->widget_border;

        add_subwindow(value_text = new BC_Title(x, y, ""));
        add_subwindow(value_text = new BC_Title(x, y, ""));

-       x += value_text->get_w() + theme->widget_border;
-
-       y += vector_on->get_h() + theme->widget_border;

 
        create_panels();
 
        create_panels();

-

        update_toggles();
        show_window();
        update_toggles();
        show_window();

+       update_scope();

        unlock_window();
 }
 
        unlock_window();
 }
 


@@ -414,35 +435,45 @@ void ScopeGUI::create_panels()
 {
        calculate_sizes(get_w(), get_h());
        if( (use_wave || use_wave_parade) ) {
 {
        calculate_sizes(get_w(), get_h());
        if( (use_wave || use_wave_parade) ) {

+               int px = wave_x + wave_w - ScopeWaveDial::calculate_w() - xS(5);
+               int py = wave_y - ScopeWaveDial::calculate_h() - yS(5);

                if( !waveform ) {
                        add_subwindow(waveform = new ScopeWaveform(this,
                                wave_x, wave_y, wave_w, wave_h));
                        waveform->create_objects();
                if( !waveform ) {
                        add_subwindow(waveform = new ScopeWaveform(this,
                                wave_x, wave_y, wave_w, wave_h));
                        waveform->create_objects();

+                       add_subwindow(wave_dial = new ScopeWaveDial(this, px, py));

                }
                else {
                        waveform->reposition_window(
                                wave_x, wave_y, wave_w, wave_h);
                        waveform->clear_box(0, 0, wave_w, wave_h);
                }
                else {
                        waveform->reposition_window(
                                wave_x, wave_y, wave_w, wave_h);
                        waveform->clear_box(0, 0, wave_w, wave_h);

+                       wave_dial->reposition_window(px, py);

                }
        }
        else if( !(use_wave || use_wave_parade) && waveform ) {
                }
        }
        else if( !(use_wave || use_wave_parade) && waveform ) {

-               delete waveform;  waveform = 0;
+               delete waveform;   waveform = 0;
+               delete wave_dial;  wave_dial = 0;

        }
 
        if( use_vector ) {
        }
 
        if( use_vector ) {

+               int vx = vector_x + vector_w - ScopeVectDial::calculate_w() - xS(5);
+               int vy = vector_y - ScopeVectDial::calculate_h() - yS(5);

                if( !vectorscope ) {
                        add_subwindow(vectorscope = new ScopeVectorscope(this,
                                vector_x, vector_y, vector_w, vector_h));
                        vectorscope->create_objects();
                if( !vectorscope ) {
                        add_subwindow(vectorscope = new ScopeVectorscope(this,
                                vector_x, vector_y, vector_w, vector_h));
                        vectorscope->create_objects();

+                       add_subwindow(vect_dial = new ScopeVectDial(this, vx, vy));

                }
                else {
                        vectorscope->reposition_window(
                                vector_x, vector_y, vector_w, vector_h);
                        vectorscope->clear_box(0, 0, vector_w, vector_h);
                }
                else {
                        vectorscope->reposition_window(
                                vector_x, vector_y, vector_w, vector_h);
                        vectorscope->clear_box(0, 0, vector_w, vector_h);

+                       vect_dial->reposition_window(vx, vy);

                }
        }
        else if( !use_vector && vectorscope ) {
                delete vectorscope;  vectorscope = 0;
                }
        }
        else if( !use_vector && vectorscope ) {
                delete vectorscope;  vectorscope = 0;

+               delete vect_dial;    vect_dial = 0;

        }
 
        if( (use_hist || use_hist_parade) ) {
        }
 
        if( (use_hist || use_hist_parade) ) {


@@ -463,7 +494,7 @@ void ScopeGUI::create_panels()
                delete histogram;  histogram = 0;
        }
 
                delete histogram;  histogram = 0;
        }
 

-       allocate_bitmaps();
+       allocate_vframes();

        clear_points(0);
        draw_overlays(1, 1, 0);
 }
        clear_points(0);
        draw_overlays(1, 1, 0);
 }


@@ -491,6 +522,7 @@ void ScopeGUI::toggle_event()
 void ScopeGUI::calculate_sizes(int w, int h)
 {
        int margin = theme->widget_border;
 void ScopeGUI::calculate_sizes(int w, int h)
 {
        int margin = theme->widget_border;

+       int menu_h = ScopeWaveDial::calculate_h() + margin * 2;

        int text_w = get_text_width(SMALLFONT, "000") + margin * 2;
        int total_panels = ((use_hist || use_hist_parade) ? 1 : 0) +
                ((use_wave || use_wave_parade) ? 1 : 0) +
        int text_w = get_text_width(SMALLFONT, "000") + margin * 2;
        int total_panels = ((use_hist || use_hist_parade) ? 1 : 0) +
                ((use_wave || use_wave_parade) ? 1 : 0) +


@@ -504,7 +536,7 @@ void ScopeGUI::calculate_sizes(int w, int h)
        if( use_vector ) {
                vector_x = w - panel_w + text_w;
                vector_w = w - margin - vector_x;
        if( use_vector ) {
                vector_x = w - panel_w + text_w;
                vector_w = w - margin - vector_x;

-               vector_y = vector_on->get_h() + margin * 2;
+               vector_y = menu_h;

                vector_h = h - vector_y - margin;
 
                if( vector_w > vector_h ) {
                vector_h = h - vector_y - margin;
 
                if( vector_w > vector_h ) {


@@ -519,7 +551,7 @@ void ScopeGUI::calculate_sizes(int w, int h)
 // Histogram is always 1st panel
        if( use_hist || use_hist_parade ) {
                hist_x = x;
 // Histogram is always 1st panel
        if( use_hist || use_hist_parade ) {
                hist_x = x;

-               hist_y = vector_on->get_h() + margin * 2;
+               hist_y = menu_h;

                hist_w = panel_w - margin;
                hist_h = h - hist_y - margin;
 
                hist_w = panel_w - margin;
                hist_h = h - hist_y - margin;
 


@@ -529,7 +561,7 @@ void ScopeGUI::calculate_sizes(int w, int h)
 
        if( use_wave || use_wave_parade ) {
                wave_x = x + text_w;
 
        if( use_wave || use_wave_parade ) {
                wave_x = x + text_w;

-               wave_y = vector_on->get_h() + margin * 2;
+               wave_y = menu_h;

                wave_w = panel_w - margin - text_w;
                wave_h = h - wave_y - margin;
        }
                wave_w = panel_w - margin - text_w;
                wave_h = h - wave_y - margin;
        }


@@ -537,21 +569,21 @@ void ScopeGUI::calculate_sizes(int w, int h)
 }
 
 
 }
 
 

-void ScopeGUI::allocate_bitmaps()
+void ScopeGUI::allocate_vframes()

 {
 {

-       if(waveform_bitmap) delete waveform_bitmap;
-       if(vector_bitmap) delete vector_bitmap;
+       if(waveform_vframe) delete waveform_vframe;
+       if(vector_vframe) delete vector_vframe;

 
        int w, h;
 
        int w, h;

-//printf("ScopeGUI::allocate_bitmaps %d %d %d %d %d\n", __LINE__,
+//printf("ScopeGUI::allocate_vframes %d %d %d %d %d\n", __LINE__,

 // wave_w, wave_h, vector_w, vector_h);
        int xs16 = xS(16), ys16 = yS(16);
        w = MAX(wave_w, xs16);
        h = MAX(wave_h, ys16);
 // wave_w, wave_h, vector_w, vector_h);
        int xs16 = xS(16), ys16 = yS(16);
        w = MAX(wave_w, xs16);
        h = MAX(wave_h, ys16);

-       waveform_bitmap = new_bitmap(w, h);
+       waveform_vframe = new VFrame(w, h, BC_RGB888);

        w = MAX(vector_w, xs16);
        h = MAX(vector_h, ys16);
        w = MAX(vector_w, xs16);
        h = MAX(vector_h, ys16);

-       vector_bitmap = new_bitmap(w, h);
+       vector_vframe = new VFrame(w, h, BC_RGB888);

 }
 
 
 }
 
 


@@ -565,6 +597,9 @@ int ScopeGUI::resize_event(int w, int h)
        if( waveform ) {
                waveform->reposition_window(wave_x, wave_y, wave_w, wave_h);
                waveform->clear_box(0, 0, wave_w, wave_h);
        if( waveform ) {
                waveform->reposition_window(wave_x, wave_y, wave_w, wave_h);
                waveform->clear_box(0, 0, wave_w, wave_h);

+               int px = wave_x + wave_w - ScopeWaveDial::calculate_w() - xS(5);
+               int py = wave_y - ScopeWaveDial::calculate_h() - yS(5);
+               wave_dial->reposition_window(px, py);

        }
 
        if( histogram ) {
        }
 
        if( histogram ) {


@@ -575,10 +610,14 @@ int ScopeGUI::resize_event(int w, int h)
        if( vectorscope ) {
                vectorscope->reposition_window(vector_x, vector_y, vector_w, vector_h);
                vectorscope->clear_box(0, 0, vector_w, vector_h);
        if( vectorscope ) {
                vectorscope->reposition_window(vector_x, vector_y, vector_w, vector_h);
                vectorscope->clear_box(0, 0, vector_w, vector_h);

+               int vx = vector_x + vector_w - ScopeVectDial::calculate_w() - xS(5);
+               int vy = vector_y - ScopeVectDial::calculate_h() - yS(5);
+               vect_dial->reposition_window(vx, vy);

        }
 
        }
 

-       allocate_bitmaps();
+       allocate_vframes();

        clear_points(0);
        clear_points(0);

+       update_scope();

        draw_overlays(1, 1, 1);
        return 1;
 }
        draw_overlays(1, 1, 1);
        return 1;
 }


@@ -596,8 +635,9 @@ void ScopeGUI::draw_overlays(int overlays, int borders, int flush)
 {
        BC_Resources *resources = BC_WindowBase::get_resources();
        int text_color = GREEN;
 {
        BC_Resources *resources = BC_WindowBase::get_resources();
        int text_color = GREEN;

+       int dark_color = (text_color>>2) & 0x3f3f3f;

        if( resources->bg_color == 0xffffff ) {
        if( resources->bg_color == 0xffffff ) {

-               text_color = BLACK;
+               text_color = dark_color;

        }
 
        if( overlays && borders ) {
        }
 
        if( overlays && borders ) {


@@ -622,55 +662,48 @@ void ScopeGUI::draw_overlays(int overlays, int borders, int flush)
 
 // Waveform overlay
                if( waveform && (use_wave || use_wave_parade) ) {
 
 // Waveform overlay
                if( waveform && (use_wave || use_wave_parade) ) {

-                       set_color(text_color);

                        for( int i=0; i<=WAVEFORM_DIVISIONS; ++i ) {
                                int y = wave_h * i / WAVEFORM_DIVISIONS;
                                int text_y = y + wave_y + get_text_ascent(SMALLFONT) / 2;
                                CLAMP(text_y, waveform->get_y() + get_text_ascent(SMALLFONT), waveform->get_y() + waveform->get_h() - 1);
                                char string[BCTEXTLEN];
                        for( int i=0; i<=WAVEFORM_DIVISIONS; ++i ) {
                                int y = wave_h * i / WAVEFORM_DIVISIONS;
                                int text_y = y + wave_y + get_text_ascent(SMALLFONT) / 2;
                                CLAMP(text_y, waveform->get_y() + get_text_ascent(SMALLFONT), waveform->get_y() + waveform->get_h() - 1);
                                char string[BCTEXTLEN];

-                               sprintf(string, "%d", (int)((FLOAT_MAX -
+                               sprintf(string, "%d", (int)lround((FLOAT_MAX -

                                        i * (FLOAT_MAX - FLOAT_MIN) / WAVEFORM_DIVISIONS) * 100));
                                int text_x = wave_x - get_text_width(SMALLFONT, string) - theme->widget_border;
                                        i * (FLOAT_MAX - FLOAT_MIN) / WAVEFORM_DIVISIONS) * 100));
                                int text_x = wave_x - get_text_width(SMALLFONT, string) - theme->widget_border;

+                               set_color(text_color);

                                draw_text(text_x, text_y, string);
                                draw_text(text_x, text_y, string);

-

                                CLAMP(y, 0, waveform->get_h() - 1);
                                CLAMP(y, 0, waveform->get_h() - 1);

+                               set_color(dark_color);

                                waveform->draw_line(0, y, wave_w, y);
                                waveform->draw_line(0, y, wave_w, y);

-                               //waveform->draw_rectangle(0, 0, wave_w, wave_h);
+                               waveform->draw_rectangle(0, 0, wave_w, wave_h);

                        }
                        set_line_dashes(0);
                        waveform->draw_point();
                        set_line_dashes(1);
                        waveform->flash(0);
                }
                        }
                        set_line_dashes(0);
                        waveform->draw_point();
                        set_line_dashes(1);
                        waveform->flash(0);
                }

-
-

 // Vectorscope overlay
                if( vectorscope && use_vector ) {
 // Vectorscope overlay
                if( vectorscope && use_vector ) {

-                       set_color(text_color);
+                       set_line_dashes(1);

                        int radius = MIN(vector_w / 2, vector_h / 2);
                        for( int i=1; i<=VECTORSCOPE_DIVISIONS; i+=2 ) {
                        int radius = MIN(vector_w / 2, vector_h / 2);
                        for( int i=1; i<=VECTORSCOPE_DIVISIONS; i+=2 ) {

-                               int x = vector_w / 2 - radius * i / VECTORSCOPE_DIVISIONS;

                                int y = vector_h / 2 - radius * i / VECTORSCOPE_DIVISIONS;
                                int text_y = y + vector_y + get_text_ascent(SMALLFONT) / 2;
                                int y = vector_h / 2 - radius * i / VECTORSCOPE_DIVISIONS;
                                int text_y = y + vector_y + get_text_ascent(SMALLFONT) / 2;

-                               int w = radius * i / VECTORSCOPE_DIVISIONS * 2;
-                               int h = radius * i / VECTORSCOPE_DIVISIONS * 2;
+                               set_color(text_color);

                                char string[BCTEXTLEN];
                                char string[BCTEXTLEN];

-

                                sprintf(string, "%d",
                                        (int)((FLOAT_MAX / VECTORSCOPE_DIVISIONS * i) * 100));
                                int text_x = vector_x - get_text_width(SMALLFONT, string) - theme->widget_border;
                                draw_text(text_x, text_y, string);
                                sprintf(string, "%d",
                                        (int)((FLOAT_MAX / VECTORSCOPE_DIVISIONS * i) * 100));
                                int text_x = vector_x - get_text_width(SMALLFONT, string) - theme->widget_border;
                                draw_text(text_x, text_y, string);

-//printf("ScopeGUI::draw_overlays %d %d %d %s\n", __LINE__, text_x, text_y, string);
-
+                               int x = vector_w / 2 - radius * i / VECTORSCOPE_DIVISIONS;
+                               int w = radius * i / VECTORSCOPE_DIVISIONS * 2;
+                               int h = radius * i / VECTORSCOPE_DIVISIONS * 2;
+                               if( i+2 > VECTORSCOPE_DIVISIONS )
+                                       set_line_dashes(0);
+                               set_color(dark_color);

                                vectorscope->draw_circle(x, y, w, h);
                                vectorscope->draw_circle(x, y, w, h);

-               //vectorscope->draw_rectangle(0, 0, vector_w, vector_h);

                        }
                        }

-               //      vectorscope->draw_circle(vector_w / 2 - radius,
-               //              vector_h / 2 - radius,
-               //              radius * 2,
-               //              radius * 2);
-
-                       set_line_dashes(0);
+                       set_color(text_color);

                        vectorscope->draw_point();
                        set_line_dashes(1);
                        vectorscope->flash(0);
                        vectorscope->draw_point();
                        set_line_dashes(1);
                        vectorscope->flash(0);


@@ -707,32 +740,26 @@ void ScopeGUI::process(VFrame *output_frame)
        this->output_frame = output_frame;
        frame_w = output_frame->get_w();
        //float radius = MIN(vector_w / 2, vector_h / 2);
        this->output_frame = output_frame;
        frame_w = output_frame->get_w();
        //float radius = MIN(vector_w / 2, vector_h / 2);

-       bzero(waveform_bitmap->get_data(), waveform_bitmap->get_data_size());
-       bzero(vector_bitmap->get_data(), vector_bitmap->get_data_size());
+       bzero(waveform_vframe->get_data(), waveform_vframe->get_data_size());
+       bzero(vector_vframe->get_data(), vector_vframe->get_data_size());

        engine->process();
 
        if( histogram )
                histogram->draw(0, 0);
        if( waveform )
        engine->process();
 
        if( histogram )
                histogram->draw(0, 0);
        if( waveform )

-               waveform->draw_bitmap(waveform_bitmap, 1, 0, 0);
+               waveform->draw_vframe(waveform_vframe, 1, 0, 0);

        if( vectorscope )
        if( vectorscope )

-               vectorscope->draw_bitmap(vector_bitmap, 1, 0, 0);
+               vectorscope->draw_vframe(vector_vframe, 1, 0, 0);

 
        draw_overlays(1, 0, 1);
        unlock_window();
 }
 
 
        draw_overlays(1, 0, 1);
        unlock_window();
 }
 

-

 void ScopeGUI::update_toggles()
 {
 void ScopeGUI::update_toggles()
 {

-       hist_parade_on->update(use_hist_parade);
-       hist_on->update(use_hist);
-       waveform_parade_on->update(use_wave_parade);
-       waveform_on->update(use_wave);
-       vector_on->update(use_vector);
+       scope_menu->update_toggles();

 }
 
 }
 

-

 ScopePanel::ScopePanel(ScopeGUI *gui, int x, int y, int w, int h)
  : BC_SubWindow(x, y, w, h, BLACK)
 {
 ScopePanel::ScopePanel(ScopeGUI *gui, int x, int y, int w, int h)
  : BC_SubWindow(x, y, w, h, BLACK)
 {


@@ -823,7 +850,6 @@ void ScopeWaveform::update_point(int x, int y)
        }
 
        float value = ((float)get_h() - y) / get_h() * (FLOAT_MAX - FLOAT_MIN) + FLOAT_MIN;
        }
 
        float value = ((float)get_h() - y) / get_h() * (FLOAT_MAX - FLOAT_MIN) + FLOAT_MIN;

-

        char string[BCTEXTLEN];
        sprintf(string, "X: %d Value: %.3f", frame_x, value);
        gui->value_text->update(string, 0);
        char string[BCTEXTLEN];
        sprintf(string, "X: %d Value: %.3f", frame_x, value);
        gui->value_text->update(string, 0);


@@ -956,30 +982,29 @@ void ScopeHistogram::update_point(int x, int y)
 void ScopeHistogram::draw_mode(int mode, int color, int y, int h)
 {
 // Highest of all bins
 void ScopeHistogram::draw_mode(int mode, int color, int y, int h)
 {
 // Highest of all bins

-       int normalize = 0;
-       for( int i=0; i<TOTAL_BINS; ++i ) {
-               if(gui->bins[mode][i] > normalize) normalize = gui->bins[mode][i];
-       }
+       int normalize = 1, w = get_w();
+       int *bin = gui->bins[mode], v;
+       for( int i=0; i<TOTAL_BINS; ++i )
+               if( (v=bin[i]) > normalize ) normalize = v;
+       double norm = normalize>1 ? log(normalize) : 1e-4;
+       double vnorm = h / norm;

        set_color(color);
        set_color(color);

-       for( int i=0; i<get_w(); ++i ) {
-               int accum_start = (int)(i * TOTAL_BINS / get_w());
-               int accum_end = (int)((i + 1) * TOTAL_BINS / get_w());
+       for( int x=0; x<w; ++x ) {
+               int accum_start = (int)(x * TOTAL_BINS / w);
+               int accum_end = (int)((x + 1) * TOTAL_BINS / w);

                CLAMP(accum_start, 0, TOTAL_BINS);
                CLAMP(accum_end, 0, TOTAL_BINS);
                int max = 0;
                CLAMP(accum_start, 0, TOTAL_BINS);
                CLAMP(accum_end, 0, TOTAL_BINS);
                int max = 0;

-               for(int k=accum_start; k<accum_end; ++k ) {
-                       max = MAX(gui->bins[mode][k], max);
-               }
+               for(int i=accum_start; i<accum_end; ++i )
+                       if( (v=bin[i]) > max ) max = v;

 //             max = max * h / normalize;
 //             max = max * h / normalize;

-               max = (int)(log(max) / log(normalize) * h);
-               draw_line(i, y + h - max, i, y + h);
+               max = log(max) * vnorm;
+               draw_line(x,y+h - max, x,y+h);

        }
 }
        }
 }

-

 void ScopeHistogram::draw(int flash, int flush)
 {
        clear_box(0, 0, get_w(), get_h());
 void ScopeHistogram::draw(int flash, int flush)
 {
        clear_box(0, 0, get_w(), get_h());

-

        if( gui->use_hist_parade ) {
                draw_mode(0, 0xff0000, 0, get_h() / 3);
                draw_mode(1, 0x00ff00, get_h() / 3, get_h() / 3);
        if( gui->use_hist_parade ) {
                draw_mode(0, 0xff0000, 0, get_h() / 3);
                draw_mode(1, 0x00ff00, get_h() / 3, get_h() / 3);


@@ -993,68 +1018,105 @@ void ScopeHistogram::draw(int flash, int flush)
        if(flush) this->flush();
 }
 
        if(flush) this->flush();
 }
 

-ScopeToggle::ScopeToggle(ScopeGUI *gui, int x, int y, int *value)
- : BC_Toggle(x, y, get_image_set(gui, value), *value)
-{
-       this->gui = gui;
-       this->value = value;
-       if( value == &gui->use_hist_parade ) {
-               set_tooltip(_("Histogram Parade"));
-       }
-       else if( value == &gui->use_hist )
-       {
-               set_tooltip(_("Histogram"));
-       }
-       else if( value == &gui->use_wave_parade ) {
-               set_tooltip(_("Waveform Parade"));
-       }
-       else if( value == &gui->use_wave ) {
-               set_tooltip(_("Waveform"));
-       }
-       else {
-               set_tooltip(_("Vectorscope"));
-       }
-}

 
 

-VFrame** ScopeToggle::get_image_set(ScopeGUI *gui, int *value)
+ScopeScopesOn::ScopeScopesOn(ScopeMenu *scope_menu, const char *text, int id)
+ : BC_MenuItem(text)

 {
 {

-       if( value == &gui->use_hist_parade ) {
-               return gui->theme->get_image_set("histogram_rgb_toggle");
-       }
-       else if( value == &gui->use_hist ) {
-               return gui->theme->get_image_set("histogram_toggle");
-       }
-       else if( value == &gui->use_wave_parade ) {
-               return gui->theme->get_image_set("waveform_rgb_toggle");
-       }
-       else if( value == &gui->use_wave ) {
-               return gui->theme->get_image_set("waveform_toggle");
-       }
-       else {
-               return gui->theme->get_image_set("scope_toggle");
-       }
+       this->scope_menu = scope_menu;
+       this->id = id;

 }
 
 }
 

-int ScopeToggle::handle_event()
+int ScopeScopesOn::handle_event()

 {
 {

-       *value = get_value();
-       if( value == &gui->use_hist_parade ) {
-               if( get_value() ) gui->use_hist = 0;
-       }
-       else if( value == &gui->use_hist )
-       {
-               if( get_value() ) gui->use_hist_parade = 0;
-       }
-       else if( value == &gui->use_wave_parade ) {
-               if( get_value() ) gui->use_wave = 0;
-       }
-       else if( value == &gui->use_wave ) {
-               if( get_value() ) gui->use_wave_parade = 0;
+       int v = get_checked() ? 0 : 1;
+       set_checked(v);
+       ScopeGUI *gui = scope_menu->gui;
+       switch( id ) {
+       case SCOPE_HISTOGRAM:
+               gui->use_hist = v;
+               if( v ) gui->use_hist_parade = 0;
+               break;
+       case SCOPE_HISTOGRAM_RGB:
+               gui->use_hist_parade = v;
+               if( v ) gui->use_hist = 0;
+               break;
+       case SCOPE_WAVEFORM:
+               gui->use_wave = v;
+               if( v ) gui->use_wave_parade = 0;
+               break;
+       case SCOPE_WAVEFORM_RGB:
+               gui->use_wave_parade = v;
+               if( v ) gui->use_wave = 0;
+               break;
+       case SCOPE_WAVEFORM_PLY:
+               gui->use_wave_parade = -v;
+               if( v ) gui->use_wave = 0;
+               break;
+       case SCOPE_VECTORSCOPE:
+               gui->use_vector = v;
+               break;

        }
        gui->toggle_event();
        gui->update_toggles();
        gui->create_panels();
        }
        gui->toggle_event();
        gui->update_toggles();
        gui->create_panels();

+       gui->update_scope();

        gui->show_window();
        return 1;
 }
 
        gui->show_window();
        return 1;
 }
 

+ScopeMenu::ScopeMenu(ScopeGUI *gui, int x, int y)
+ : BC_PopupMenu(x, y, xS(100), _("Scopes"))
+{
+       this->gui = gui;
+}
+
+void ScopeMenu::create_objects()
+{
+       add_item(hist_on =
+               new ScopeScopesOn(this, _("Histogram"), SCOPE_HISTOGRAM));
+       add_item(hist_rgb_on =
+               new ScopeScopesOn(this, _("Histogram RGB"), SCOPE_HISTOGRAM_RGB));
+       add_item(wave_on =
+               new ScopeScopesOn(this, _("Waveform"), SCOPE_WAVEFORM));
+       add_item(wave_rgb_on =
+               new ScopeScopesOn(this, _("Waveform RGB"), SCOPE_WAVEFORM_RGB));
+       add_item(wave_ply_on =
+               new ScopeScopesOn(this, _("Waveform ply"), SCOPE_WAVEFORM_PLY));
+       add_item(vect_on =
+               new ScopeScopesOn(this, _("Vectorscope"), SCOPE_VECTORSCOPE));
+}
+
+void ScopeMenu::update_toggles()
+{
+       hist_on->set_checked(gui->use_hist);
+       hist_rgb_on->set_checked(gui->use_hist_parade);
+       wave_on->set_checked(gui->use_wave);
+       wave_rgb_on->set_checked(gui->use_wave_parade>0);
+       wave_ply_on->set_checked(gui->use_wave_parade<0);
+       vect_on->set_checked(gui->use_vector);
+}
+
+ScopeWaveDial::ScopeWaveDial(ScopeGUI *gui, int x, int y)
+ : BC_FPot(x, y, gui->wdial, 1.f, 9.f)
+{
+       this->gui = gui;
+}
+int ScopeWaveDial::handle_event()
+{
+       gui->wdial = get_value();
+       gui->update_scope();
+       return 1;
+}
+
+ScopeVectDial::ScopeVectDial(ScopeGUI *gui, int x, int y)
+ : BC_FPot(x, y, gui->vdial, 1.f, 9.f)
+{
+       this->gui = gui;
+}
+int ScopeVectDial::handle_event()
+{
+       gui->vdial = get_value();
+       gui->update_scope();
+       return 1;
+}
+

diff --git a/cinelerra-5.1/cinelerra/scopewindow.h b/cinelerra-5.1/cinelerra/scopewindow.h
index 3c645521450888cafcb94a64dfb2983ec666b352..93ef7a8931b3143365f009f8032ae4d3379b16ff 100644 (file)
--- a/cinelerra-5.1/cinelerra/scopewindow.h
+++ b/cinelerra-5.1/cinelerra/scopewindow.h
@@ -30,6 +30,11 @@
 #include "scopewindow.inc"
 #include "theme.inc"
 
 #include "scopewindow.inc"
 #include "theme.inc"
 

+enum {
+       SCOPE_HISTOGRAM, SCOPE_HISTOGRAM_RGB,
+       SCOPE_WAVEFORM, SCOPE_WAVEFORM_RGB, SCOPE_WAVEFORM_PLY,
+       SCOPE_VECTORSCOPE,
+};

 
 // Number of divisions in histogram.
 // 65536 + min and max range to speed up the tabulation
 
 // Number of divisions in histogram.
 // 65536 + min and max range to speed up the tabulation


@@ -47,7 +52,6 @@
 #define MIN_SCOPE_H yS(320)
 
 
 #define MIN_SCOPE_H yS(320)
 
 

-

 #define WAVEFORM_DIVISIONS 12
 #define VECTORSCOPE_DIVISIONS 11
 
 #define WAVEFORM_DIVISIONS 12
 #define VECTORSCOPE_DIVISIONS 11
 


@@ -63,12 +67,6 @@ class ScopeUnit : public LoadClient
 {
 public:
        ScopeUnit(ScopeGUI *gui, ScopeEngine *server);
 {
 public:
        ScopeUnit(ScopeGUI *gui, ScopeEngine *server);

-       void draw_point(unsigned char **rows,
-               int x,
-               int y,
-               int r,
-               int g,
-               int b);

        void process_package(LoadPackage *package);
        int bins[HIST_SECTIONS][TOTAL_BINS];
        ScopeGUI *gui;
        void process_package(LoadPackage *package);
        int bins[HIST_SECTIONS][TOTAL_BINS];
        ScopeGUI *gui;


@@ -89,11 +87,7 @@ public:
 class ScopePanel : public BC_SubWindow
 {
 public:
 class ScopePanel : public BC_SubWindow
 {
 public:

-       ScopePanel(ScopeGUI *gui,
-               int x,
-               int y,
-               int w,
-               int h);
+       ScopePanel(ScopeGUI *gui, int x, int y, int w, int h);

        void create_objects();
        virtual void update_point(int x, int y);
        virtual void draw_point();
        void create_objects();
        virtual void update_point(int x, int y);
        virtual void draw_point();


@@ -108,11 +102,7 @@ public:
 class ScopeWaveform : public ScopePanel
 {
 public:
 class ScopeWaveform : public ScopePanel
 {
 public:

-       ScopeWaveform(ScopeGUI *gui,
-               int x,
-               int y,
-               int w,
-               int h);
+       ScopeWaveform(ScopeGUI *gui, int x, int y, int w, int h);

        virtual void update_point(int x, int y);
        virtual void draw_point();
        virtual void clear_point();
        virtual void update_point(int x, int y);
        virtual void draw_point();
        virtual void clear_point();


@@ -124,11 +114,7 @@ public:
 class ScopeVectorscope : public ScopePanel
 {
 public:
 class ScopeVectorscope : public ScopePanel
 {
 public:

-       ScopeVectorscope(ScopeGUI *gui,
-               int x,
-               int y,
-               int w,
-               int h);
+       ScopeVectorscope(ScopeGUI *gui, int x, int y, int w, int h);

        virtual void update_point(int x, int y);
        virtual void draw_point();
        virtual void clear_point();
        virtual void update_point(int x, int y);
        virtual void draw_point();
        virtual void clear_point();


@@ -139,11 +125,7 @@ public:
 class ScopeHistogram : public ScopePanel
 {
 public:
 class ScopeHistogram : public ScopePanel
 {
 public:

-       ScopeHistogram(ScopeGUI *gui,
-               int x,
-               int y,
-               int w,
-               int h);
+       ScopeHistogram(ScopeGUI *gui, int x, int y, int w, int h);

        void clear_point();
        void update_point(int x, int y);
        void draw_point();
        void clear_point();
        void update_point(int x, int y);
        void draw_point();


@@ -152,32 +134,54 @@ public:
        int drag_x;
 };
 
        int drag_x;
 };
 

-class ScopeToggle : public BC_Toggle
+
+class ScopeScopesOn : public BC_MenuItem

 {
 public:
 {
 public:

-       ScopeToggle(ScopeGUI *gui,
-               int x,
-               int y,
-               int *value);
-       static VFrame** get_image_set(ScopeGUI *gui, int *value);
+       ScopeScopesOn(ScopeMenu *scope_menu, const char *text, int id);

        int handle_event();
        int handle_event();

+
+       ScopeMenu *scope_menu;
+       int id;
+};
+
+class ScopeMenu : public BC_PopupMenu
+{
+public:
+       ScopeMenu(ScopeGUI *gui, int x, int y);
+       void create_objects();
+       void update_toggles();
+

        ScopeGUI *gui;
        ScopeGUI *gui;

-       int *value;
+       ScopeScopesOn *hist_on;
+       ScopeScopesOn *hist_rgb_on;
+       ScopeScopesOn *wave_on;
+       ScopeScopesOn *wave_rgb_on;
+       ScopeScopesOn *wave_ply_on;
+       ScopeScopesOn *vect_on;

 };
 
 };
 

+class ScopeWaveDial : public BC_FPot
+{
+public:
+       ScopeWaveDial(ScopeGUI *gui, int x, int y);
+       int handle_event();
+       ScopeGUI *gui;
+};
+
+class ScopeVectDial : public BC_FPot
+{
+public:
+       ScopeVectDial(ScopeGUI *gui, int x, int y);
+       int handle_event();
+       ScopeGUI *gui;
+};

 
 class ScopeGUI : public PluginClientWindow
 {
 public:
 
 class ScopeGUI : public PluginClientWindow
 {
 public:

-       ScopeGUI(Theme *theme,
-               int x,
-               int y,
-               int w,
-               int h,
-               int cpus);
-       ScopeGUI(PluginClient *plugin,
-               int w,
-               int h);
+       ScopeGUI(Theme *theme, int x, int y, int w, int h, int cpus);
+       ScopeGUI(PluginClient *plugin, int w, int h);

        virtual ~ScopeGUI();
 
        void reset();
        virtual ~ScopeGUI();
 
        void reset();


@@ -185,6 +189,7 @@ public:
        void create_panels();
        virtual int resize_event(int w, int h);
        virtual int translation_event();
        void create_panels();
        virtual int resize_event(int w, int h);
        virtual int translation_event();

+       virtual void update_scope() {}

 
 // Called for user storage when toggles change
        virtual void toggle_event();
 
 // Called for user storage when toggles change
        virtual void toggle_event();


@@ -192,32 +197,30 @@ public:
 // update toggles
        void update_toggles();
        void calculate_sizes(int w, int h);
 // update toggles
        void update_toggles();
        void calculate_sizes(int w, int h);

-       void allocate_bitmaps();
+       void allocate_vframes();

        void draw_overlays(int overlays, int borders, int flush);
        void process(VFrame *output_frame);
        void draw(int flash, int flush);
        void clear_points(int flash);
 
        void draw_overlays(int overlays, int borders, int flush);
        void process(VFrame *output_frame);
        void draw(int flash, int flush);
        void clear_points(int flash);
 

-

        Theme *theme;
        VFrame *output_frame;
        ScopeEngine *engine;
        Theme *theme;
        VFrame *output_frame;
        ScopeEngine *engine;

-       BC_Bitmap *waveform_bitmap;
-       BC_Bitmap *vector_bitmap;
+       VFrame *waveform_vframe;
+       VFrame *vector_vframe;

        ScopeHistogram *histogram;
        ScopeWaveform *waveform;
        ScopeVectorscope *vectorscope;
        ScopeHistogram *histogram;
        ScopeWaveform *waveform;
        ScopeVectorscope *vectorscope;

-       ScopeToggle *hist_parade_on;
-       ScopeToggle *hist_on;
-       ScopeToggle *waveform_parade_on;
-       ScopeToggle *waveform_on;
-       ScopeToggle *vector_on;
+       ScopeMenu *scope_menu;
+       ScopeWaveDial *wave_dial;
+       ScopeVectDial *vect_dial;

        BC_Title *value_text;
 
        int x, y, w, h;
        int vector_x, vector_y, vector_w, vector_h;
        int wave_x, wave_y, wave_w, wave_h;
        int hist_x, hist_y, hist_w, hist_h;
        BC_Title *value_text;
 
        int x, y, w, h;
        int vector_x, vector_y, vector_w, vector_h;
        int wave_x, wave_y, wave_w, wave_h;
        int hist_x, hist_y, hist_w, hist_h;

+       float wdial, vdial;

 
        int cpus;
        int use_hist, use_wave, use_vector;
 
        int cpus;
        int use_hist, use_wave, use_vector;


@@ -227,10 +230,4 @@ public:
        int frame_w;
 };
 
        int frame_w;
 };
 

-
-
-

 #endif
 #endif

-
-
-

diff --git a/cinelerra-5.1/cinelerra/scopewindow.inc b/cinelerra-5.1/cinelerra/scopewindow.inc
index a23cb5cf9da2b0d0ff638ea018fde175026550df..3dff0beff86e77e1a5bcbabf4fbb88c3defd5047 100644 (file)
--- a/cinelerra-5.1/cinelerra/scopewindow.inc
+++ b/cinelerra-5.1/cinelerra/scopewindow.inc
@@ -21,11 +21,18 @@
 #ifndef SCOPEWINDOW_INC
 #define SCOPEWINDOW_INC
 
 #ifndef SCOPEWINDOW_INC
 #define SCOPEWINDOW_INC
 

-
-class ScopeGUI;
+class ScopePackage;
+class ScopeUnit;

 class ScopeEngine;
 class ScopeEngine;

-
-
+class ScopePanel;
+class ScopeWaveform;
+class ScopeVectorscope;
+class ScopeHistogram;
+class ScopeScopesOn;
+class ScopeMenu;
+class ScopeWaveDial;
+class ScopeVectDial;
+class ScopeGUI;

 
 #endif
 
 
 #endif
 

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 7fcd19ad43aaef52ae292114a7b0cd2fa5e78c0a..8370b4aaf555af96ded1b6967d7264ef29af83e3 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -835,7 +835,7 @@ int VWindowCanvas::scope_on()
 
 void VWindowCanvas::draw_scope(VFrame *output)
 {
 
 void VWindowCanvas::draw_scope(VFrame *output)
 {

-       if( gui->edit_panel->scope_dialog )
+       if( gui->edit_panel->scope_dialog && output )

                gui->edit_panel->scope_dialog->process(output);
 }
 
                gui->edit_panel->scope_dialog->process(output);
 }
 

diff --git a/cinelerra-5.1/plugins/videoscope/videoscope.C b/cinelerra-5.1/plugins/videoscope/videoscope.C
index 76b7cf720740f5d9a1116a79b71d0c608c6ae664..1b7322df0091dcafe23302b62b2dde53b1e03f28 100644 (file)
--- a/cinelerra-5.1/plugins/videoscope/videoscope.C
+++ b/cinelerra-5.1/plugins/videoscope/videoscope.C
@@ -356,193 +356,111 @@ VideoScopeUnit::VideoScopeUnit(VideoScopeEffect *plugin,
 }
 
 
 }
 
 

-#define INTENSITY(p) ((unsigned int)(((p)[0]) * 77+ \
-                                                                       ((p)[1] * 150) + \
-                                                                       ((p)[2] * 29)) >> 8)
-
-
-static void draw_point(unsigned char **rows,
-       int color_model,
-       int x,
-       int y,
-       int r,
-       int g,
-       int b)
+#define INTENSITY(p) ((unsigned int)(((p)[0]) * 77+ ((p)[1] * 150) + ((p)[2] * 29)) >> 8)
+
+
+static void draw_point(unsigned char **rows, int color_model,
+               int x, int y, int r, int g, int b)

 {
 {

-       switch(color_model)
-       {
-               case BC_BGR8888:
-               {
-                       unsigned char *pixel = rows[y] + x * 4;
-                       pixel[0] = b;
-                       pixel[1] = g;
-                       pixel[2] = r;
-                       break;
-               }
-               case BC_BGR888:
-                       break;
-               case BC_RGB565:
-               {
-                       unsigned char *pixel = rows[y] + x * 2;
-                       pixel[0] = (r & 0xf8) | (g >> 5);
-                       pixel[1] = ((g & 0xfc) << 5) | (b >> 3);
-                       break;
-               }
-               case BC_BGR565:
-                       break;
-               case BC_RGB8:
-                       break;
+       switch( color_model ) {
+       case BC_BGR8888: {
+               unsigned char *pixel = rows[y] + x * 4;
+               pixel[0] = b; pixel[1] = g; pixel[2] = r;
+               break;
+       }
+       case BC_BGR888: break;
+       case BC_RGB565: {
+               unsigned char *pixel = rows[y] + x * 2;
+               pixel[0] = (r & 0xf8) | (g >> 5);
+               pixel[1] = ((g & 0xfc) << 5) | (b >> 3);
+               break;
+       }
+       case BC_BGR565: break;
+       case BC_RGB8: break;

        }
 }
 
        }
 }
 

-
-
-#define VIDEOSCOPE(type, temp_type, max, components, use_yuv) \
-{ \
-       for(int i = pkg->row1; i < pkg->row2; i++) \
-       { \
+#define VIDEOSCOPE(type, temp_type, max, components, use_yuv) { \
+       for( int i=pkg->row1; i<pkg->row2; ++i ) { \

                type *in_row = (type*)plugin->input->get_rows()[i]; \
                type *in_row = (type*)plugin->input->get_rows()[i]; \

-               for(int j = 0; j < w; j++) \
-               { \
+               for( int j=0; j<w; ++j ) { \

                        type *in_pixel = in_row + j * components; \
                        type *in_pixel = in_row + j * components; \

-                       float intensity; \
- \
-/* Analyze pixel */ \
+                       float intensity; /* Analyze pixel */ \

                        if(use_yuv) intensity = (float)*in_pixel / max; \
                        if(use_yuv) intensity = (float)*in_pixel / max; \

- \

                        float h, s, v; \
                        temp_type r, g, b; \
                        float h, s, v; \
                        temp_type r, g, b; \

-                       if(use_yuv) \
-                       { \
-                               if(sizeof(type) == 2) \
-                               { \
+                       if( use_yuv ) { \
+                               if( sizeof(type) == 2 ) { \

                                        YUV::yuv.yuv_to_rgb_16(r, g, b, \
                                                in_pixel[0], in_pixel[1], in_pixel[2]); \
                                } \
                                        YUV::yuv.yuv_to_rgb_16(r, g, b, \
                                                in_pixel[0], in_pixel[1], in_pixel[2]); \
                                } \

-                               else \
-                               { \
+                               else { \

                                        YUV::yuv.yuv_to_rgb_8(r, g, b, \
                                                in_pixel[0], in_pixel[1], in_pixel[2]); \
                                } \
                        } \
                                        YUV::yuv.yuv_to_rgb_8(r, g, b, \
                                                in_pixel[0], in_pixel[1], in_pixel[2]); \
                                } \
                        } \

-                       else \
-                       { \
+                       else { \

                                r = in_pixel[0]; \
                                g = in_pixel[1]; \
                                b = in_pixel[2]; \
                        } \
                                r = in_pixel[0]; \
                                g = in_pixel[1]; \
                                b = in_pixel[2]; \
                        } \

- \
-                       HSV::rgb_to_hsv((float)r / max, \
-                                       (float)g / max, \
-                                       (float)b / max, \
-                                       h, \
-                                       s, \
-                                       v); \
- \
+                       HSV::rgb_to_hsv((float)r / max, (float)g / max, (float)b / max, \
+                                       h, s, v); \

 /* Calculate waveform */ \
 /* Calculate waveform */ \

-                       if(parade) \
-                       { \
-/* red */ \
-                               int x = j * waveform_w / w / 3; \
+                       if(parade) { \
+                               int x = j * waveform_w / w / 3; /* red */ \

                                int y = waveform_h - (int)(((float)r / max - FLOAT_MIN) / \
                                int y = waveform_h - (int)(((float)r / max - FLOAT_MIN) / \

-                                       (FLOAT_MAX - FLOAT_MIN) * \
-                                       waveform_h); \
+                                       (FLOAT_MAX - FLOAT_MIN) * waveform_h); \

                                if(x >= 0 && x < waveform_w / 3 && y >= 0 && y < waveform_h) \
                                if(x >= 0 && x < waveform_w / 3 && y >= 0 && y < waveform_h) \

-                                       draw_point(waveform_rows, \
-                                               waveform_cmodel, \
-                                               x, \
-                                               y, \
-                                               0xff, \
-                                               0x0, \
-                                               0x0); \
- \
-/* green */ \
-                               x = waveform_w / 3 + j * waveform_w / w / 3; \
+                                       draw_point(waveform_rows, waveform_cmodel, x, y, \
+                                               0xff, 0x00, 0x00); \
+                               x = waveform_w / 3 + j * waveform_w / w / 3; /* green */ \

                                y = waveform_h - (int)(((float)g / max - FLOAT_MIN) / \
                                y = waveform_h - (int)(((float)g / max - FLOAT_MIN) / \

-                                       (FLOAT_MAX - FLOAT_MIN) * \
-                                       waveform_h); \
+                                       (FLOAT_MAX - FLOAT_MIN) * waveform_h); \

                                if(x >= waveform_w / 3 && x < waveform_w * 2 / 3 && \
                                        y >= 0 && y < waveform_h) \
                                if(x >= waveform_w / 3 && x < waveform_w * 2 / 3 && \
                                        y >= 0 && y < waveform_h) \

-                                       draw_point(waveform_rows, \
-                                               waveform_cmodel, \
-                                               x, \
-                                               y, \
-                                               0x0, \
-                                               0xff, \
-                                               0x0); \
- \
-/* blue */ \
-                               x = waveform_w * 2 / 3 + j * waveform_w / w / 3; \
+                                       draw_point(waveform_rows, waveform_cmodel, x, y, \
+                                               0x00, 0xff, 0x00); \
+                               x = waveform_w * 2 / 3 + j * waveform_w / w / 3; /* blue */ \

                                y = waveform_h - (int)(((float)b / max - FLOAT_MIN) / \
                                y = waveform_h - (int)(((float)b / max - FLOAT_MIN) / \

-                                       (FLOAT_MAX - FLOAT_MIN) * \
-                                       waveform_h); \
+                                       (FLOAT_MAX - FLOAT_MIN) * waveform_h); \

                                if(x >= waveform_w * 2 / 3 && x < waveform_w && \
                                        y >= 0 && y < waveform_h) \
                                if(x >= waveform_w * 2 / 3 && x < waveform_w && \
                                        y >= 0 && y < waveform_h) \

-                                       draw_point(waveform_rows, \
-                                               waveform_cmodel, \
-                                               x, \
-                                               y, \
-                                               0x0, \
-                                               0x0, \
-                                               0xff); \
+                                       draw_point(waveform_rows, waveform_cmodel, x, y, \
+                                               0x00, 0x00, 0xff); \

                        } \
                        } \

-                       else \
-                       { \
+                       else { \

                                if(!use_yuv) intensity = v; \
                                intensity = (intensity - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * \
                                        waveform_h; \
                                int y = waveform_h - (int)intensity; \
                                int x = j * waveform_w / w; \
                                if(x >= 0 && x < waveform_w && y >= 0 && y < waveform_h) \
                                if(!use_yuv) intensity = v; \
                                intensity = (intensity - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * \
                                        waveform_h; \
                                int y = waveform_h - (int)intensity; \
                                int x = j * waveform_w / w; \
                                if(x >= 0 && x < waveform_w && y >= 0 && y < waveform_h) \

-                                       draw_point(waveform_rows, \
-                                               waveform_cmodel, \
-                                               x, \
-                                               y, \
-                                               0xff, \
-                                               0xff, \
-                                               0xff); \
+                                       draw_point(waveform_rows, waveform_cmodel, x, y, \
+                                               0xff, 0xff, 0xff); \

                        } \
                        } \

- \

 /* Calculate vectorscope */ \
                        float adjacent = cos((h + 90) / 360 * 2 * M_PI); \
                        float opposite = sin((h + 90) / 360 * 2 * M_PI); \
                        int x = (int)(vector_w / 2 +  \
                                adjacent * (s - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * radius); \
 /* Calculate vectorscope */ \
                        float adjacent = cos((h + 90) / 360 * 2 * M_PI); \
                        float opposite = sin((h + 90) / 360 * 2 * M_PI); \
                        int x = (int)(vector_w / 2 +  \
                                adjacent * (s - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * radius); \

- \

                        int y = (int)(vector_h / 2 -  \
                                opposite * (s - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * radius); \
                        int y = (int)(vector_h / 2 -  \
                                opposite * (s - FLOAT_MIN) / (FLOAT_MAX - FLOAT_MIN) * radius); \

- \
- \

                        CLAMP(x, 0, vector_w - 1); \
                        CLAMP(y, 0, vector_h - 1); \
 /* Get color with full saturation & value */ \
                        float r_f, g_f, b_f; \
                        CLAMP(x, 0, vector_w - 1); \
                        CLAMP(y, 0, vector_h - 1); \
 /* Get color with full saturation & value */ \
                        float r_f, g_f, b_f; \

-                       HSV::hsv_to_rgb(r_f, \
-                                       g_f, \
-                                       b_f, \
-                                       h, \
-                                       s, \
-                                       1); \
+                       HSV::hsv_to_rgb(r_f, g_f, b_f, h, s, 1); \

                        r = (int)(r_f * 255); \
                        g = (int)(g_f * 255); \
                        b = (int)(b_f * 255); \
                        r = (int)(r_f * 255); \
                        g = (int)(g_f * 255); \
                        b = (int)(b_f * 255); \

- \
- /* float */ \
-                       if(sizeof(type) == 4) \
-                       { \
+                       if(sizeof(type) == 4) { /* float */ \

                                r = CLIP(r, 0, 0xff); \
                                g = CLIP(g, 0, 0xff); \
                                b = CLIP(b, 0, 0xff); \
                        } \
                                r = CLIP(r, 0, 0xff); \
                                g = CLIP(g, 0, 0xff); \
                                b = CLIP(b, 0, 0xff); \
                        } \

- \
-                       draw_point(vector_rows, \
-                               vector_cmodel, \
-                               x, \
-                               y, \
-                               (int)r, \
-                               (int)g, \
-                               (int)b); \
- \
+                       draw_point(vector_rows, vector_cmodel, x, y, \
+                               (int)r, (int)g, (int)b); \

                } \
        } \
 }
                } \
        } \
 }


@@ -555,64 +473,58 @@ void VideoScopeUnit::process_package(LoadPackage *package)
 //     int h = plugin->input->get_h();
        int waveform_h = window->wave_h;
        int waveform_w = window->wave_w;
 //     int h = plugin->input->get_h();
        int waveform_h = window->wave_h;
        int waveform_w = window->wave_w;

-       int waveform_cmodel = window->waveform_bitmap->get_color_model();
-       unsigned char **waveform_rows = window->waveform_bitmap->get_row_pointers();
-       int vector_h = window->vector_bitmap->get_h();
-       int vector_w = window->vector_bitmap->get_w();
-       int vector_cmodel = window->vector_bitmap->get_color_model();
-       unsigned char **vector_rows = window->vector_bitmap->get_row_pointers();
+       int waveform_cmodel = window->waveform_vframe->get_color_model();
+       unsigned char **waveform_rows = window->waveform_vframe->get_rows();
+       int vector_h = window->vector_vframe->get_h();
+       int vector_w = window->vector_vframe->get_w();
+       int vector_cmodel = window->vector_vframe->get_color_model();
+       unsigned char **vector_rows = window->vector_vframe->get_rows();

        float radius = MIN(vector_w / 2, vector_h / 2);
        int parade = 1;
 
        float radius = MIN(vector_w / 2, vector_h / 2);
        int parade = 1;
 

-       switch(plugin->input->get_color_model())
-       {
-               case BC_RGB888:
-                       VIDEOSCOPE(unsigned char, int, 0xff, 3, 0)
-                       break;
+       switch( plugin->input->get_color_model() ) {
+       case BC_RGB888:
+               VIDEOSCOPE(unsigned char, int, 0xff, 3, 0)
+               break;

 
 

-               case BC_RGB_FLOAT:
-                       VIDEOSCOPE(float, float, 1, 3, 0)
-                       break;
+       case BC_RGB_FLOAT:
+               VIDEOSCOPE(float, float, 1, 3, 0)
+               break;

 
 

-               case BC_YUV888:
-                       VIDEOSCOPE(unsigned char, int, 0xff, 3, 1)
-                       break;
+       case BC_YUV888:
+               VIDEOSCOPE(unsigned char, int, 0xff, 3, 1)
+               break;

 
 

-               case BC_RGB161616:
-                       VIDEOSCOPE(uint16_t, int, 0xffff, 3, 0)
-                       break;
+       case BC_RGB161616:
+               VIDEOSCOPE(uint16_t, int, 0xffff, 3, 0)
+               break;

 
 

-               case BC_YUV161616:
-                       VIDEOSCOPE(uint16_t, int, 0xffff, 3, 1)
-                       break;
+       case BC_YUV161616:
+               VIDEOSCOPE(uint16_t, int, 0xffff, 3, 1)
+               break;

 
 

-               case BC_RGBA8888:
-                       VIDEOSCOPE(unsigned char, int, 0xff, 4, 0)
-                       break;
+       case BC_RGBA8888:
+               VIDEOSCOPE(unsigned char, int, 0xff, 4, 0)
+               break;

 
 

-               case BC_RGBA_FLOAT:
-                       VIDEOSCOPE(float, float, 1, 4, 0)
-                       break;
+       case BC_RGBA_FLOAT:
+               VIDEOSCOPE(float, float, 1, 4, 0)
+               break;

 
 

-               case BC_YUVA8888:
-                       VIDEOSCOPE(unsigned char, int, 0xff, 4, 1)
-                       break;
+       case BC_YUVA8888:
+               VIDEOSCOPE(unsigned char, int, 0xff, 4, 1)
+               break;

 
 

-               case BC_RGBA16161616:
-                       VIDEOSCOPE(uint16_t, int, 0xffff, 4, 0)
-                       break;
+       case BC_RGBA16161616:
+               VIDEOSCOPE(uint16_t, int, 0xffff, 4, 0)
+               break;

 
 

-               case BC_YUVA16161616:
-                       VIDEOSCOPE(uint16_t, int, 0xffff, 4, 1)
-                       break;
+       case BC_YUVA16161616:
+               VIDEOSCOPE(uint16_t, int, 0xffff, 4, 1)
+               break;

        }
 }
 
        }
 }
 

-
-
-
-
-

 VideoScopeEngine::VideoScopeEngine(VideoScopeEffect *plugin, int cpus)
  : LoadServer(cpus, cpus)
 {
 VideoScopeEngine::VideoScopeEngine(VideoScopeEffect *plugin, int cpus)
  : LoadServer(cpus, cpus)
 {

diff --git a/cinelerra-5.1/po/es.po b/cinelerra-5.1/po/es.po
index 3e3f27e8c8b55b61862e48fbe12a38659102e8df..b8c47879179e40cbd6f98c3b58986f4db7e3a018 100644 (file)
--- a/cinelerra-5.1/po/es.po
+++ b/cinelerra-5.1/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Cinelerra 5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-10-15 14:02-0600\n"
 "Project-Id-Version: Cinelerra 5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-10-15 14:02-0600\n"

-"PO-Revision-Date: 2020-02-25 22:26+0100\n"
+"PO-Revision-Date: 2020-03-24 11:04+0100\n"

 "Last-Translator: Sergio Daniel Gomez <sergio.sgsistemas@gmail.com>\n"
 "Language-Team: SPANISH <LL@li.org>\n"
 "Language: es\n"
 "Last-Translator: Sergio Daniel Gomez <sergio.sgsistemas@gmail.com>\n"
 "Language-Team: SPANISH <LL@li.org>\n"
 "Language: es\n"


@@ -36,6 +36,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-03-03 07:38-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"

 
 #: guicast/bcbutton.C:266 guicast/bcbutton.C:274 guicast/bcbutton.C:494
 #: cinelerra/preferencesthread.C:672
 
 #: guicast/bcbutton.C:266 guicast/bcbutton.C:274 guicast/bcbutton.C:494
 #: cinelerra/preferencesthread.C:672


@@ -624,7 +634,7 @@ msgid "Audio:"
 msgstr "Audio:"
 
 #: cinelerra/assetedit.C:323 cinelerra/assetedit.C:447 cinelerra/fileexr.C:593
 msgstr "Audio:"
 
 #: cinelerra/assetedit.C:323 cinelerra/assetedit.C:447 cinelerra/fileexr.C:593

-#: cinelerra/fileffmpeg.C:694 cinelerra/filesndfile.C:403
+#: cinelerra/fileffmpeg.C:713 cinelerra/filesndfile.C:403

 #: cinelerra/filetga.C:843 cinelerra/filetiff.C:589
 msgid "Compression:"
 msgstr "Compresión:"
 #: cinelerra/filetga.C:843 cinelerra/filetiff.C:589
 msgid "Compression:"
 msgstr "Compresión:"


@@ -837,7 +847,7 @@ msgstr "No usado"
 
 #: cinelerra/assetpopup.C:542 cinelerra/channeledit.C:153
 #: cinelerra/ffmpeg.C:1942 cinelerra/ffmpeg.C:1989 cinelerra/fileexr.C:200
 
 #: cinelerra/assetpopup.C:542 cinelerra/channeledit.C:153
 #: cinelerra/ffmpeg.C:1942 cinelerra/ffmpeg.C:1989 cinelerra/fileexr.C:200

-#: cinelerra/fileffmpeg.C:583 cinelerra/fileffmpeg.C:748
+#: cinelerra/fileffmpeg.C:596 cinelerra/fileffmpeg.C:767

 #: cinelerra/proxypopup.C:317 cinelerra/recordbatches.C:309
 #: cinelerra/recordgui.C:323 cinelerra/recordgui.C:772 cinelerra/rescale.C:7
 #: cinelerra/sharedlocation.C:144 cinelerra/sharedlocation.C:149
 #: cinelerra/proxypopup.C:317 cinelerra/recordbatches.C:309
 #: cinelerra/recordgui.C:323 cinelerra/recordgui.C:772 cinelerra/rescale.C:7
 #: cinelerra/sharedlocation.C:144 cinelerra/sharedlocation.C:149


@@ -1127,7 +1137,7 @@ msgstr "Agregar clip en una nueva pista"
 msgid "View asset"
 msgstr "Ver recurso"
 
 msgid "View asset"
 msgstr "Ver recurso"
 

-#: cinelerra/awindowgui.C:3370 cinelerra/fileffmpeg.C:1112
+#: cinelerra/awindowgui.C:3370 cinelerra/fileffmpeg.C:1145

 msgid "ffmpeg"
 msgstr "ffmpeg"
 
 msgid "ffmpeg"
 msgstr "ffmpeg"
 


@@ -1315,8 +1325,8 @@ msgstr "%d no hay trabajos EDLs de audio o video en el formato del renderizado d
 
 #: cinelerra/batchrender.C:516
 #, c-format
 
 #: cinelerra/batchrender.C:516
 #, c-format

-msgid "%d job EDLs render file per label and no labels\n"
-msgstr "%d trabajo EDLs de archivo de renderizado con y sin etiquetas\n"
+msgid "%d job EDLs Create new file at labels checked, but no labels\n"
+msgstr "%d EDL de trabajo. Crear nuevo archivo en las etiquetas marcadas, pero sin etiquetas\n"

 
 #: cinelerra/batchrender.C:726
 msgid ": Batch Render"
 
 #: cinelerra/batchrender.C:726
 msgid ": Batch Render"


@@ -1531,7 +1541,7 @@ msgid "Media:"
 msgstr "Medios Multimedia:"
 
 #: cinelerra/bdcreate.C:778 cinelerra/dvdcreate.C:920
 msgstr "Medios Multimedia:"
 
 #: cinelerra/bdcreate.C:778 cinelerra/dvdcreate.C:920

-#: cinelerra/fileffmpeg.C:854 cinelerra/recordgui.C:224
+#: cinelerra/fileffmpeg.C:886 cinelerra/recordgui.C:224

 msgid "Format:"
 msgstr "Formato:"
 
 msgid "Format:"
 msgstr "Formato:"
 


@@ -1727,7 +1737,7 @@ msgid "Del"
 msgstr "Supr"
 
 #: cinelerra/binfolder.C:1655 cinelerra/cwindowtool.C:367
 msgstr "Supr"
 
 #: cinelerra/binfolder.C:1655 cinelerra/cwindowtool.C:367

-#: cinelerra/fileffmpeg.C:1189 cinelerra/fileffmpeg.C:1586
+#: cinelerra/fileffmpeg.C:1222 cinelerra/fileffmpeg.C:1627

 #: cinelerra/keyframegui.C:780 cinelerra/loadfile.C:199
 #: cinelerra/mixersalign.C:428 cinelerra/mixersalign.C:436
 #: cinelerra/plugindialog.C:287 cinelerra/plugindialog.C:360
 #: cinelerra/keyframegui.C:780 cinelerra/loadfile.C:199
 #: cinelerra/mixersalign.C:428 cinelerra/mixersalign.C:436
 #: cinelerra/plugindialog.C:287 cinelerra/plugindialog.C:360


@@ -2619,11 +2629,11 @@ msgstr "Mostrar zonas seguras (F10)"
 #: cinelerra/cpanel.C:377 plugins/perspective/perspective.C:203
 #: plugins/zoom/zoom.C:147
 msgid "Zoom"
 #: cinelerra/cpanel.C:377 plugins/perspective/perspective.C:203
 #: plugins/zoom/zoom.C:147
 msgid "Zoom"

-msgstr "Enfocar"
+msgstr "Zoom"

 
 #: cinelerra/cropvideo.C:35
 msgid "Crop Video..."
 
 #: cinelerra/cropvideo.C:35
 msgid "Crop Video..."

-msgstr "Recortar Vídeo ..."
+msgstr "Recortar Vídeo..."

 
 #: cinelerra/cropvideo.C:97 cinelerra/cwindowtool.C:439
 msgid ": Crop"
 
 #: cinelerra/cropvideo.C:97 cinelerra/cwindowtool.C:439
 msgid ": Crop"


@@ -2824,7 +2834,7 @@ msgstr "activar máscara"
 
 #: cinelerra/cwindowtool.C:1858
 msgid "Show/Hide mask"
 
 #: cinelerra/cwindowtool.C:1858
 msgid "Show/Hide mask"

-msgstr "Mostrar/Ocultar máscara"
+msgstr "Mostrar/Ocultar máscaras"

 
 #: cinelerra/cwindowtool.C:1865 cinelerra/cwindowtool.C:1874
 msgid "mask enables"
 
 #: cinelerra/cwindowtool.C:1865 cinelerra/cwindowtool.C:1874
 msgid "mask enables"


@@ -2840,7 +2850,7 @@ msgstr "Única pista de video"
 
 #: cinelerra/cwindowtool.C:1909
 msgid "Delete mask"
 
 #: cinelerra/cwindowtool.C:1909
 msgid "Delete mask"

-msgstr "Eliminar máscara"
+msgstr "Eliminar la máscara de la pista seleccionada"

 
 #: cinelerra/cwindowtool.C:1925 cinelerra/cwindowtool.C:1951
 msgid "mask delete"
 
 #: cinelerra/cwindowtool.C:1925 cinelerra/cwindowtool.C:1951
 msgid "mask delete"


@@ -2856,11 +2866,11 @@ msgstr "eliminar punto"
 
 #: cinelerra/cwindowtool.C:2069 cinelerra/cwindowtool.C:2091
 msgid "Focus"
 
 #: cinelerra/cwindowtool.C:2069 cinelerra/cwindowtool.C:2091
 msgid "Focus"

-msgstr "Foco"
+msgstr "Pivote"

 
 #: cinelerra/cwindowtool.C:2073
 msgid "Center for rotate/scale"
 
 #: cinelerra/cwindowtool.C:2073
 msgid "Center for rotate/scale"

-msgstr "Centrar para rotar/escalar"
+msgstr "Punto de pivote para escalar o rotar"

 
 #: cinelerra/cwindowtool.C:2119 plugins/sketcher/sketcherwindow.C:1400
 msgid "Help"
 
 #: cinelerra/cwindowtool.C:2119 plugins/sketcher/sketcherwindow.C:1400
 msgid "Help"


@@ -2872,11 +2882,11 @@ msgstr "Mostrar texto de ayuda"
 
 #: cinelerra/cwindowtool.C:2140
 msgid "Markers"
 
 #: cinelerra/cwindowtool.C:2140
 msgid "Markers"

-msgstr "Marcadores"
+msgstr "Ver puntos"

 
 #: cinelerra/cwindowtool.C:2160
 msgid "Boundary"
 
 #: cinelerra/cwindowtool.C:2160
 msgid "Boundary"

-msgstr "Borde"
+msgstr "Ver contorno"

 
 #: cinelerra/cwindowtool.C:2209 cinelerra/cwindowtool.C:2236
 msgid "mask feather"
 
 #: cinelerra/cwindowtool.C:2209 cinelerra/cwindowtool.C:2236
 msgid "mask feather"


@@ -2888,27 +2898,29 @@ msgstr "desvanecer máscara"
 
 #: cinelerra/cwindowtool.C:2431
 msgid "Gang fader"
 
 #: cinelerra/cwindowtool.C:2431
 msgid "Gang fader"

-msgstr "Nivelador grupal"
+msgstr "Activar para desvanecer todas las formas"

 
 #: cinelerra/cwindowtool.C:2449
 msgid "Gang rotate/scale/translate"
 
 #: cinelerra/cwindowtool.C:2449
 msgid "Gang rotate/scale/translate"

-msgstr "Rotación/escala/traducción de bandas"
+msgstr "Activar para que mover/rotar/escalar afecte a toda las formas"

 
 #: cinelerra/cwindowtool.C:2467
 msgid "Gang points"
 
 #: cinelerra/cwindowtool.C:2467
 msgid "Gang points"

-msgstr "Puntos de banda"
+msgstr ""
+"El desplazamiento desde los valores\n"
+"x e y afecta a todos los puntos de la forma."

 
 #: cinelerra/cwindowtool.C:2497
 msgid "Apply mask before plugins"
 
 #: cinelerra/cwindowtool.C:2497
 msgid "Apply mask before plugins"

-msgstr "Aplicar máscara antes de plug-in"
+msgstr "Aplicar antes de los efectos"

 
 #: cinelerra/cwindowtool.C:2528
 msgid "Disable OpenGL masking"
 
 #: cinelerra/cwindowtool.C:2528
 msgid "Disable OpenGL masking"

-msgstr "Deshabilitar enmascarado OpenGL"
+msgstr "Deshabilitar enmascarar OpenGL"

 
 #: cinelerra/cwindowtool.C:2564
 msgid "Delete all masks"
 
 #: cinelerra/cwindowtool.C:2564
 msgid "Delete all masks"

-msgstr "Borrar todas las máscaras"
+msgstr "Eliminar todas las máscaras"

 
 #: cinelerra/cwindowtool.C:2589 cinelerra/cwindowtool.C:2591
 msgid "del masks"
 
 #: cinelerra/cwindowtool.C:2589 cinelerra/cwindowtool.C:2591
 msgid "del masks"


@@ -2916,7 +2928,7 @@ msgstr "borra máscaras"
 
 #: cinelerra/cwindowtool.C:2605
 msgid "Gang feather"
 
 #: cinelerra/cwindowtool.C:2605
 msgid "Gang feather"

-msgstr "Pluma de la banda"
+msgstr "Aplicar pluma a todas las formas"

 
 #: cinelerra/cwindowtool.C:2619
 msgid ": Mask"
 
 #: cinelerra/cwindowtool.C:2619
 msgid ": Mask"


@@ -2985,19 +2997,19 @@ msgstr "Óvalo"
 
 #: cinelerra/cwindowtool.C:2729
 msgid "Position & Scale"
 
 #: cinelerra/cwindowtool.C:2729
 msgid "Position & Scale"

-msgstr "Posición y escala"
+msgstr "Reset posición y escala        -        Mover / Escalar"

 
 #: cinelerra/cwindowtool.C:2735
 msgid "xlate/scale x"
 
 #: cinelerra/cwindowtool.C:2735
 msgid "xlate/scale x"

-msgstr "xtardío/scalar x"
+msgstr "mover/escalar eje x"

 
 #: cinelerra/cwindowtool.C:2737
 msgid "xlate/scale y"
 
 #: cinelerra/cwindowtool.C:2737
 msgid "xlate/scale y"

-msgstr "x tardío/escala y"
+msgstr "mover/escalar eje y"

 
 #: cinelerra/cwindowtool.C:2739
 msgid "xlate/scale xy"
 
 #: cinelerra/cwindowtool.C:2739
 msgid "xlate/scale xy"

-msgstr "x tardío/escala xy"
+msgstr "mover/escalar libre (ejes x-y)"

 
 #: cinelerra/cwindowtool.C:2742
 msgid "Fade & Feather"
 
 #: cinelerra/cwindowtool.C:2742
 msgid "Fade & Feather"


@@ -3022,27 +3034,27 @@ msgstr "Punto:"
 
 #: cinelerra/cwindowtool.C:2770
 msgid "linear point"
 
 #: cinelerra/cwindowtool.C:2770
 msgid "linear point"

-msgstr "punto lineal"
+msgstr "punto seleccionado lineal"

 
 #: cinelerra/cwindowtool.C:2772
 msgid "smooth point"
 
 #: cinelerra/cwindowtool.C:2772
 msgid "smooth point"

-msgstr "punto suave"
+msgstr "punto seleccionado suave"

 
 #: cinelerra/cwindowtool.C:2781
 msgid "linear curve"
 
 #: cinelerra/cwindowtool.C:2781
 msgid "linear curve"

-msgstr "curva lineal"
+msgstr "Forma de la capa activa lineal"

 
 #: cinelerra/cwindowtool.C:2783 cinelerra/keyframepopup.C:458
 msgid "smooth curve"
 
 #: cinelerra/cwindowtool.C:2783 cinelerra/keyframepopup.C:458
 msgid "smooth curve"

-msgstr "Curva suave"
+msgstr "Forma de la capa activa suave"

 
 #: cinelerra/cwindowtool.C:2791
 msgid "linear all"
 
 #: cinelerra/cwindowtool.C:2791
 msgid "linear all"

-msgstr "lineal todo"
+msgstr "Todas las formas lineales"

 
 #: cinelerra/cwindowtool.C:2793
 msgid "smooth all"
 
 #: cinelerra/cwindowtool.C:2793
 msgid "smooth all"

-msgstr "suavizar todo"
+msgstr "Todas las formas suaves"

 
 #: cinelerra/cwindowtool.C:2797
 msgid "Pivot Point"
 
 #: cinelerra/cwindowtool.C:2797
 msgid "Pivot Point"


@@ -3058,13 +3070,15 @@ msgid ""
 "Shift+Wheel: scale around Pivot Point\n"
 "Ctrl+Wheel: rotate/scale around pointer"
 msgstr ""
 "Shift+Wheel: scale around Pivot Point\n"
 "Ctrl+Wheel: rotate/scale around pointer"
 msgstr ""

-"Mayús+BIR: mover un punto final\n"
-"Ctrl+BIR: mover un punto de control\n"
-"Alt+BIR: para arrastrar y soltar la máscara\n"
-"Mayús+BCR: Establecer el punto de pivote en el puntero\n"
-"Rueda: girar alrededor del punto pivote\n"
-"Mayús+Rueda: escala alrededor del punto de giro\n"
-"Ctrl+Rueda: girar/escala alrededor del puntero"
+"BIR: Insertar punto / mover punto\n"
+"Mayús+BIR: Mover punto de la forma\n"
+"Ctrl+BIR: Mover/Crear la tangente Bézier\n"
+"Alt+BIR: Mover la máscara\n"
+"Mayús+BCR: Establecer lugar del punto de pivote\n"
+"Rueda: Girar alrededor del centro o del punto pivote\n"
+"Mayús+Rueda: Escalar alrededor del centro o pivote\n"
+"Ctrl+Rueda: Girar alrededor del pivote o cursor del ratón\n"
+"Ctrl+Mayús+Rueda: Escalar - cursor del ratón como pivote"

 
 #: cinelerra/cwindowtool.C:3024 cinelerra/cwindowtool.C:3065
 msgid "mask smooth"
 
 #: cinelerra/cwindowtool.C:3024 cinelerra/cwindowtool.C:3065
 msgid "mask smooth"


@@ -3105,11 +3119,11 @@ msgstr "Guardar máscara:"
 
 #: cinelerra/cwindowtool.C:3398
 msgid "Delete mask:"
 
 #: cinelerra/cwindowtool.C:3398
 msgid "Delete mask:"

-msgstr "Eliminar máscara:"
+msgstr "Eliminar preestablecido:"

 
 #: cinelerra/cwindowtool.C:3451
 msgid "Delete preset"
 
 #: cinelerra/cwindowtool.C:3451
 msgid "Delete preset"

-msgstr "Eliminar predeterminado"
+msgstr "Eliminar preestablecido"

 
 #: cinelerra/cwindowtool.C:3471
 msgid "center mask"
 
 #: cinelerra/cwindowtool.C:3471
 msgid "center mask"


@@ -3117,7 +3131,7 @@ msgstr "centrar máscara"
 
 #: cinelerra/cwindowtool.C:3486
 msgid "normalize mask"
 
 #: cinelerra/cwindowtool.C:3486
 msgid "normalize mask"

-msgstr "normalizar máscara"
+msgstr "restaurar tamaño de la máscara"

 
 #: cinelerra/cwindowtool.C:3657
 msgid ": Ruler"
 
 #: cinelerra/cwindowtool.C:3657
 msgid ": Ruler"


@@ -3172,7 +3186,7 @@ msgstr "%0.01f pixeles"
 msgid "Media DB..."
 msgstr "Media db..."
 
 msgid "Media DB..."
 msgstr "Media db..."
 

-#: cinelerra/dbwindow.C:202 cinelerra/mainmenu.C:1638
+#: cinelerra/dbwindow.C:202 cinelerra/mainmenu.C:1640

 msgid "Shift-M"
 msgstr "Mayús-M"
 
 msgid "Shift-M"
 msgstr "Mayús-M"
 


@@ -3902,19 +3916,19 @@ msgstr "Insertar etiqueta en la posición actual ( l )"
 
 #: cinelerra/editpanel.C:472
 msgid "Next label ( ctrl -> )"
 
 #: cinelerra/editpanel.C:472
 msgid "Next label ( ctrl -> )"

-msgstr "Ir a la Etiqueta siguiente ( ctrl -> )"
+msgstr "Ir a la Etiqueta siguiente ( ctrl + → )"

 
 #: cinelerra/editpanel.C:506
 msgid "Previous label ( ctrl <- )"
 
 #: cinelerra/editpanel.C:506
 msgid "Previous label ( ctrl <- )"

-msgstr "Ir a la Etiqueta anterior ( ctrl <- )"
+msgstr "Ir a la Etiqueta anterior ( ctrl + ← )"

 
 #: cinelerra/editpanel.C:540
 msgid "Previous edit (alt <- )"
 
 #: cinelerra/editpanel.C:540
 msgid "Previous edit (alt <- )"

-msgstr "Ir al corte anterior ( alt <- )"
+msgstr "Ir al corte anterior ( alt + ← )"

 
 #: cinelerra/editpanel.C:574
 msgid "Next edit ( alt -> )"
 
 #: cinelerra/editpanel.C:574
 msgid "Next edit ( alt -> )"

-msgstr "Ir al siguiente corte ( alt -> )"
+msgstr "Ir al siguiente corte ( alt + → )"

 
 #: cinelerra/editpanel.C:607
 msgid "Copy ( c )"
 
 #: cinelerra/editpanel.C:607
 msgid "Copy ( c )"


@@ -4186,7 +4200,7 @@ msgstr "errar lectura %s: línea %d\n"
 
 #: cinelerra/ffmpeg.C:2268
 msgid "(unkn)"
 
 #: cinelerra/ffmpeg.C:2268
 msgid "(unkn)"

-msgstr ""
+msgstr "(Desconocido)"

 
 #: cinelerra/ffmpeg.C:2272
 #, c-format
 
 #: cinelerra/ffmpeg.C:2272
 #, c-format


@@ -4305,7 +4319,7 @@ msgstr ""
 #: cinelerra/ffmpeg.C:3010
 #, c-format
 msgid "bad format options %s\n"
 #: cinelerra/ffmpeg.C:3010
 #, c-format
 msgid "bad format options %s\n"

-msgstr "Opciones de formato incorrectas %s\n"
+msgstr "opciones de formato incorrectas %s\n"

 
 #: cinelerra/ffmpeg.C:3501
 #, c-format
 
 #: cinelerra/ffmpeg.C:3501
 #, c-format


@@ -4359,8 +4373,8 @@ msgstr ""
 "%m\n"
 
 #: cinelerra/fileac3.C:346 cinelerra/filedv.C:930 cinelerra/fileflac.C:340
 "%m\n"
 
 #: cinelerra/fileac3.C:346 cinelerra/filedv.C:930 cinelerra/fileflac.C:340

-#: cinelerra/filempeg.C:1724 cinelerra/fileogg.C:1524
-#: cinelerra/filesndfile.C:373 cinelerra/filevorbis.C:361
+#: cinelerra/filempeg.C:1724 cinelerra/filesndfile.C:373
+#: cinelerra/filevorbis.C:361

 msgid ": Audio Compression"
 msgstr ": Compresión de audio"
 
 msgid ": Audio Compression"
 msgstr ": Compresión de audio"
 


@@ -4474,8 +4488,8 @@ msgstr "No hay opciones de audio para este formato"
 
 #: cinelerra/filedv.C:960 cinelerra/fileexr.C:574 cinelerra/filejpeg.C:329
 #: cinelerra/filejpeglist.C:127 cinelerra/filempeg.C:1877
 
 #: cinelerra/filedv.C:960 cinelerra/fileexr.C:574 cinelerra/filejpeg.C:329
 #: cinelerra/filejpeglist.C:127 cinelerra/filempeg.C:1877

-#: cinelerra/fileogg.C:1648 cinelerra/filepng.C:352 cinelerra/fileppm.C:197
-#: cinelerra/filetga.C:820 cinelerra/filetiff.C:566
+#: cinelerra/filepng.C:352 cinelerra/fileppm.C:197 cinelerra/filetga.C:820
+#: cinelerra/filetiff.C:566

 msgid ": Video Compression"
 msgstr ": Compresión de vídeo"
 
 msgid ": Video Compression"
 msgstr ": Compresión de vídeo"
 


@@ -4512,185 +4526,185 @@ msgstr "info:\n"
 msgid "== open failed\n"
 msgstr "== abrir fallado\n"
 
 msgid "== open failed\n"
 msgstr "== abrir fallado\n"
 

-#: cinelerra/fileffmpeg.C:498
+#: cinelerra/fileffmpeg.C:505

 msgid ": Audio Preset"
 msgstr ": Audio Preset"
 
 msgid ": Audio Preset"
 msgstr ": Audio Preset"
 

-#: cinelerra/fileffmpeg.C:558
+#: cinelerra/fileffmpeg.C:571

 msgid "Preset:"
 msgstr "Preset:"
 
 msgid "Preset:"
 msgstr "Preset:"
 

-#: cinelerra/fileffmpeg.C:564 cinelerra/fileffmpeg.C:729
-#: cinelerra/filempeg.C:1982 cinelerra/fileogg.C:1670
+#: cinelerra/fileffmpeg.C:577 cinelerra/fileffmpeg.C:748
+#: cinelerra/filempeg.C:1982 cinelerra/fileogg.C:1780

 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 

-#: cinelerra/fileffmpeg.C:569 cinelerra/fileffmpeg.C:734
+#: cinelerra/fileffmpeg.C:582 cinelerra/fileffmpeg.C:753

 #: cinelerra/filejpeg.C:347 cinelerra/filejpeglist.C:144
 #: cinelerra/filejpeg.C:347 cinelerra/filejpeglist.C:144

-#: cinelerra/fileogg.C:1675 cinelerra/formatwindow.C:112
+#: cinelerra/fileogg.C:1785 cinelerra/formatwindow.C:112

 msgid "Quality:"
 msgstr "Compresión:"
 
 msgid "Quality:"
 msgstr "Compresión:"
 

-#: cinelerra/fileffmpeg.C:575
+#: cinelerra/fileffmpeg.C:588

 msgid "Samples:"
 msgstr "Muestras:"
 
 msgid "Samples:"
 msgstr "Muestras:"
 

-#: cinelerra/fileffmpeg.C:587
+#: cinelerra/fileffmpeg.C:600

 msgid "Audio Options:"
 msgstr "Opciones de audio:"
 
 msgid "Audio Options:"
 msgstr "Opciones de audio:"
 

-#: cinelerra/fileffmpeg.C:592 cinelerra/fileffmpeg.C:757
-#: cinelerra/fileffmpeg.C:863
+#: cinelerra/fileffmpeg.C:605 cinelerra/fileffmpeg.C:776
+#: cinelerra/fileffmpeg.C:895

 msgid "view"
 msgstr "ver"
 
 msgid "view"
 msgstr "ver"
 

-#: cinelerra/fileffmpeg.C:594 cinelerra/fileffmpeg.C:759
-#: cinelerra/fileffmpeg.C:1111
+#: cinelerra/fileffmpeg.C:607 cinelerra/fileffmpeg.C:778
+#: cinelerra/fileffmpeg.C:1144

 msgid "format"
 msgstr "formato"
 
 msgid "format"
 msgstr "formato"
 

-#: cinelerra/fileffmpeg.C:654
+#: cinelerra/fileffmpeg.C:667

 msgid ": Video Preset"
 msgstr ": Vídeo Preestablecido"
 
 msgid ": Video Preset"
 msgstr ": Vídeo Preestablecido"
 

-#: cinelerra/fileffmpeg.C:740 plugins/puzzleobj/puzzleobjwindow.C:51
+#: cinelerra/fileffmpeg.C:759 plugins/puzzleobj/puzzleobjwindow.C:51

 msgid "Pixels:"
 msgstr "Píxeles:"
 
 msgid "Pixels:"
 msgstr "Píxeles:"
 

-#: cinelerra/fileffmpeg.C:752
+#: cinelerra/fileffmpeg.C:771

 msgid "Video Options:"
 msgstr "Opciones de vídeo:"
 
 msgid "Video Options:"
 msgstr "Opciones de vídeo:"
 

-#: cinelerra/fileffmpeg.C:818
+#: cinelerra/fileffmpeg.C:837

 msgid ": Format Preset"
 msgstr ": Predefinidos de formato"
 
 msgid ": Format Preset"
 msgstr ": Predefinidos de formato"
 

-#: cinelerra/fileffmpeg.C:859
+#: cinelerra/fileffmpeg.C:891

 msgid "Format Options:"
 msgstr "Opciones de formato:"
 
 msgid "Format Options:"
 msgstr "Opciones de formato:"
 

-#: cinelerra/fileffmpeg.C:948 cinelerra/filempeg.C:836
+#: cinelerra/fileffmpeg.C:980 cinelerra/filempeg.C:836

 #, c-format
 msgid "Creating %s\n"
 msgstr "Creando %s\n"
 
 #, c-format
 msgid "Creating %s\n"
 msgstr "Creando %s\n"
 

-#: cinelerra/fileffmpeg.C:988
+#: cinelerra/fileffmpeg.C:1020

 msgid "option"
 msgstr "opción"
 
 msgid "option"
 msgstr "opción"
 

-#: cinelerra/fileffmpeg.C:988 plugins/bluebanana/bluebananawindow.C:2119
+#: cinelerra/fileffmpeg.C:1020 plugins/bluebanana/bluebananawindow.C:2119

 msgid "value"
 msgstr "valor"
 
 msgid "value"
 msgstr "valor"
 

-#: cinelerra/fileffmpeg.C:1110
+#: cinelerra/fileffmpeg.C:1143

 msgid "codec"
 msgstr "códec"
 
 msgid "codec"
 msgstr "códec"
 

-#: cinelerra/fileffmpeg.C:1408
+#: cinelerra/fileffmpeg.C:1449

 msgid "<flags>"
 msgstr "<Flags>"
 
 msgid "<flags>"
 msgstr "<Flags>"
 

-#: cinelerra/fileffmpeg.C:1409
+#: cinelerra/fileffmpeg.C:1450

 msgid "<int>"
 msgstr "<Int>"
 
 msgid "<int>"
 msgstr "<Int>"
 

-#: cinelerra/fileffmpeg.C:1410
+#: cinelerra/fileffmpeg.C:1451

 msgid "<int64>"
 msgstr "<Int64>"
 
 msgid "<int64>"
 msgstr "<Int64>"
 

-#: cinelerra/fileffmpeg.C:1411
+#: cinelerra/fileffmpeg.C:1452

 msgid "<double>"
 msgstr "<Double>"
 
 msgid "<double>"
 msgstr "<Double>"
 

-#: cinelerra/fileffmpeg.C:1412
+#: cinelerra/fileffmpeg.C:1453

 msgid "<float>"
 msgstr "<Float>"
 
 msgid "<float>"
 msgstr "<Float>"
 

-#: cinelerra/fileffmpeg.C:1413
+#: cinelerra/fileffmpeg.C:1454

 msgid "<string>"
 msgstr "<Cadena>"
 
 msgid "<string>"
 msgstr "<Cadena>"
 

-#: cinelerra/fileffmpeg.C:1414
+#: cinelerra/fileffmpeg.C:1455

 msgid "<rational>"
 msgstr "<Racional>"
 
 msgid "<rational>"
 msgstr "<Racional>"
 

-#: cinelerra/fileffmpeg.C:1415
+#: cinelerra/fileffmpeg.C:1456

 msgid "<binary>"
 msgstr "<Binario>"
 
 msgid "<binary>"
 msgstr "<Binario>"
 

-#: cinelerra/fileffmpeg.C:1416
+#: cinelerra/fileffmpeg.C:1457

 msgid "<image_size>"
 msgstr "<Image_size>"
 
 msgid "<image_size>"
 msgstr "<Image_size>"
 

-#: cinelerra/fileffmpeg.C:1417
+#: cinelerra/fileffmpeg.C:1458

 msgid "<video_rate>"
 msgstr "<Video_rate>"
 
 msgid "<video_rate>"
 msgstr "<Video_rate>"
 

-#: cinelerra/fileffmpeg.C:1418
+#: cinelerra/fileffmpeg.C:1459

 msgid "<pix_fmt>"
 msgstr "<Pix_fmt>"
 
 msgid "<pix_fmt>"
 msgstr "<Pix_fmt>"
 

-#: cinelerra/fileffmpeg.C:1419
+#: cinelerra/fileffmpeg.C:1460

 msgid "<sample_fmt>"
 msgstr "<Sample_fmt>"
 
 msgid "<sample_fmt>"
 msgstr "<Sample_fmt>"
 

-#: cinelerra/fileffmpeg.C:1420
+#: cinelerra/fileffmpeg.C:1461

 msgid "<duration>"
 msgstr "<Duración>"
 
 msgid "<duration>"
 msgstr "<Duración>"
 

-#: cinelerra/fileffmpeg.C:1421
+#: cinelerra/fileffmpeg.C:1462

 msgid "<color>"
 msgstr "<Color>"
 
 msgid "<color>"
 msgstr "<Color>"
 

-#: cinelerra/fileffmpeg.C:1422
+#: cinelerra/fileffmpeg.C:1463

 msgid "<channel_layout>"
 msgstr "<Channel_layout>"
 
 msgid "<channel_layout>"
 msgstr "<Channel_layout>"
 

-#: cinelerra/fileffmpeg.C:1423
+#: cinelerra/fileffmpeg.C:1464

 msgid "<bool>"
 msgstr "<Bool>"
 
 msgid "<bool>"
 msgstr "<Bool>"
 

-#: cinelerra/fileffmpeg.C:1424
+#: cinelerra/fileffmpeg.C:1465

 msgid "<undef>"
 msgstr "<Undef>"
 
 msgid "<undef>"
 msgstr "<Undef>"
 

-#: cinelerra/fileffmpeg.C:1544
+#: cinelerra/fileffmpeg.C:1585

 msgid ": Options"
 msgstr "Opciones"
 
 msgid ": Options"
 msgstr "Opciones"
 

-#: cinelerra/fileffmpeg.C:1565
+#: cinelerra/fileffmpeg.C:1606

 msgid "Format: "
 msgstr "Formato: "
 
 msgid "Format: "
 msgstr "Formato: "
 

-#: cinelerra/fileffmpeg.C:1570
+#: cinelerra/fileffmpeg.C:1611

 msgid "Codec: "
 msgstr "Codec: "
 
 msgid "Codec: "
 msgstr "Codec: "
 

-#: cinelerra/fileffmpeg.C:1575 cinelerra/pluginfclient.C:555
+#: cinelerra/fileffmpeg.C:1616 cinelerra/pluginfclient.C:555

 #, c-format
 msgid "Type: "
 msgstr "Tipo: "
 
 #, c-format
 msgid "Type: "
 msgstr "Tipo: "
 

-#: cinelerra/fileffmpeg.C:1579 cinelerra/pluginfclient.C:560
+#: cinelerra/fileffmpeg.C:1620 cinelerra/pluginfclient.C:560

 #, c-format
 msgid "Range: "
 msgstr "Distancia: "
 
 #, c-format
 msgid "Range: "
 msgstr "Distancia: "
 

-#: cinelerra/fileffmpeg.C:1593
+#: cinelerra/fileffmpeg.C:1634

 msgid "Kind:"
 msgstr "Tipo:"
 
 msgid "Kind:"
 msgstr "Tipo:"
 

-#: cinelerra/fileffmpeg.C:1803 cinelerra/fileffmpeg.C:1843
+#: cinelerra/fileffmpeg.C:1846 cinelerra/fileffmpeg.C:1884

 #, c-format
 msgid "no codec named: %s: %s"
 msgstr "ningún códec nombrado: %s: %s"
 
 #, c-format
 msgid "no codec named: %s: %s"
 msgstr "ningún códec nombrado: %s: %s"
 

-#: cinelerra/fileffmpeg.C:1808 cinelerra/fileffmpeg.C:1848
+#: cinelerra/fileffmpeg.C:1851 cinelerra/fileffmpeg.C:1889

 #, c-format
 msgid "no codec context: %s: %s"
 #, c-format
 msgid "no codec context: %s: %s"

-msgstr "Códec sin contexto: %s: %s"
+msgstr "códec sin contexto: %s: %s"

 
 

-#: cinelerra/fileffmpeg.C:1905
+#: cinelerra/fileffmpeg.C:1944

 #, c-format
 msgid "no format named: %s"
 msgstr "formato sin nombre: %s"
 #, c-format
 msgid "no format named: %s"
 msgstr "formato sin nombre: %s"


@@ -5242,7 +5256,7 @@ msgstr "720p ATSC"
 msgid "ATSC 1080i"
 msgstr "ATSC 1080i"
 
 msgid "ATSC 1080i"
 msgstr "ATSC 1080i"
 

-#: cinelerra/filempeg.C:2145 cinelerra/fileogg.C:1733
+#: cinelerra/filempeg.C:2145 cinelerra/fileogg.C:1845

 #: cinelerra/filevorbis.C:423
 msgid "Fixed bitrate"
 msgstr "Tasa de bits fija"
 #: cinelerra/filevorbis.C:423
 msgid "Fixed bitrate"
 msgstr "Tasa de bits fija"


@@ -5259,196 +5273,210 @@ msgstr "YUV 4: 2: 0"
 msgid "YUV 4:2:2"
 msgstr "YUV 4: 2: 2"
 
 msgid "YUV 4:2:2"
 msgstr "YUV 4: 2: 2"
 

-#: cinelerra/fileogg.C:204
-#, c-format
-msgid "Error while opening \"%s\" for writing. %m\n"
-msgstr "Error al abrir \"%s\" para escribir. %m\n"
+#: cinelerra/fileogg.C:432
+msgid "Could not set rate flags"
+msgstr "No se pudieron establecer indicadores de tasa"

 
 

-#: cinelerra/fileogg.C:219
-msgid "WARNING: Encoding theora when width or height are not dividable by 16 is suboptimal\n"
-msgstr "ADVERTENCIA: Codificar con theora cuando el ancho o la altura no son divisibles por 16 NO es óptimo\n"
+#: cinelerra/fileogg.C:438
+msgid "Could not set rate buffer"
+msgstr "Could not set rate buffer"

 
 

-#: cinelerra/fileogg.C:265
-msgid "(FileOGG:file_open) initialization of theora codec failed\n"
-msgstr "(ArchivoOGG:Archivo_abierto) La inicialización del códe theora a fallado\n"
+#: cinelerra/fileogg.C:443
+msgid "theora init context failed"
+msgstr "el contexto de theora init falló"

 
 

-#: cinelerra/fileogg.C:292
-msgid ""
-"The Vorbis encoder could not set up a mode according to\n"
-"the requested quality or bitrate.\n"
-"\n"
-msgstr ""
-"El codificador Vorbis no pudo configurar un modo de acuerdo con\n"
-"la calidad o tasa de bits solicitada.\n"
-"\n"
+#: cinelerra/fileogg.C:461
+msgid "write header out failed"
+msgstr "falló la escritura del encabezado"

 
 

-#: cinelerra/fileogg.C:315 cinelerra/fileogg.C:341 cinelerra/fileogg.C:359
-#: cinelerra/fileogg.C:370
-msgid "Internal Ogg library error.\n"
-msgstr "Error interno en la libreria Ogg\n"
+#: cinelerra/fileogg.C:467
+msgid "ogg_encoder_init video failed"
+msgstr "falló el inicio de codificación ogg de vídeo"

 
 

-#: cinelerra/fileogg.C:382
-#, c-format
-msgid "Error while opening %s for reading. %m\n"
-msgstr "Error al abrir %s para lectura %m\n"
+#: cinelerra/fileogg.C:497
+msgid "ogg_encoder_init audio init failed"
+msgstr "falló el inicio de codificación ogg de audio"
+
+#: cinelerra/fileogg.C:520
+msgid "ogg_encoder_init audio failed"
+msgstr "falló el inicio de codificación ogg de audio"

 
 

-#: cinelerra/fileogg.C:466 cinelerra/fileogg.C:470
-msgid "FileOGG: Error parsing Theora stream headers; corrupt stream?\n"
-msgstr "ArchivoOGG: Error al analizar los encabezados de secuencia de Theora; ¿flujo corrupto?\n"
+#: cinelerra/fileogg.C:551
+msgid "render init failed"
+msgstr "falló el inicio del render"

 
 

-#: cinelerra/fileogg.C:480 cinelerra/fileogg.C:484
-msgid "FileOGG: Error parsing Vorbis stream headers; corrupt stream?\n"
-msgstr "ArchivoOGG: Error al analizar los encabezados de secuencia de Theora; ¿flujo corrupto?\n"
+#: cinelerra/fileogg.C:561
+msgid "Error in probe data"
+msgstr "Error en los datos de prueba"

 
 

-#: cinelerra/fileogg.C:502
-msgid "FileOGG: End of file while searching for codec headers.\n"
-msgstr "ArchivoOgg: Fin del archivo mientras busca encabezados de códec\n"
+#: cinelerra/fileogg.C:572
+msgid "cannot read video page from file"
+msgstr "no se puede leer la página de vídeo desde el archivo"

 
 

-#: cinelerra/fileogg.C:520
+#: cinelerra/fileogg.C:581

 #, c-format
 #, c-format

-msgid "Frame content is %dx%d with offset (%d,%d), We do not support this yet. You will get black border.\n"
-msgstr "El contenido del cuadro es %dx%d con desplazamiento (%d, %d), todavía no lo admitimos. Obtendrás borde negro.\n"
+msgid "FileOGG: Broken ogg file - broken page: ogg_page_packets == 0 and granulepos != -1\n"
+msgstr "ArchivoOGG: Archivo OGG roto - página rota: paquetes de página ogg == 0 y granulepos! = -1\n"

 
 

-#: cinelerra/fileogg.C:538
+#: cinelerra/fileogg.C:591

 #, c-format
 #, c-format

-msgid "FileOGG: Cannot find next page while looking for first non-header packet\n"
-msgstr "ArchivoOgg: No se puede encontrar la página siguiente mientras se busca el primer paquete sin encabezado\n"
+msgid "FileOGG: Cannot read data past header\n"
+msgstr "ArchivoOGG: No se puede leer el histótico de datos de la cabecera\n"

 
 

-#: cinelerra/fileogg.C:551
+#: cinelerra/fileogg.C:603
+msgid "no video frames in file"
+msgstr "no hay cuadros de video en el archivo"
+
+#: cinelerra/fileogg.C:640
+msgid "cannot read audio page from file"
+msgstr "no puede leer la sección de audio del archivo"
+
+#: cinelerra/fileogg.C:653
+msgid "no audio samples in file"
+msgstr "no hay muestras de audio en el archivo"
+
+#: cinelerra/fileogg.C:763
+msgid "Error in headers"
+msgstr "Error en encabezados"
+
+#: cinelerra/fileogg.C:911

 #, c-format
 #, c-format

-msgid "FileOGG: Broken ogg file - broken page: ogg_page_packets == 0 and granulepos != -1\n"
-msgstr "ArchivoOGG: Archivo OGG roto - página rota: paquetes de página ogg == 0 y granulepos! = -1\n"
+msgid "Error while opening %s for writing. %m\n"
+msgstr "Error al abrir %s para escribir. %m\n"
+
+#: cinelerra/fileogg.C:920
+#, c-format
+msgid "Error while opening %s for reading. %m\n"
+msgstr "Error al abrir %s para lectura %m\n"

 
 

-#: cinelerra/fileogg.C:764
+#: cinelerra/fileogg.C:980

 #, c-format
 msgid "FileOGG: Illegal seek beyond end of samples\n"
 msgstr "ArchivoOGG: FileOGG: Búsqueda irregular más allá del final de las muestras\n"
 
 #, c-format
 msgid "FileOGG: Illegal seek beyond end of samples\n"
 msgstr "ArchivoOGG: FileOGG: Búsqueda irregular más allá del final de las muestras\n"
 

-#: cinelerra/fileogg.C:808
-msgid "FileOGG: Seeking to sample's page failed\n"
-msgstr "ArchivoOGG: Error al buscar la página de muestras\n"
+#: cinelerra/fileogg.C:991
+#, c-format
+msgid "FileOGG: llegal seek no pages\n"
+msgstr "ArchivoOGG: No buscar en páginas\n"

 
 

-#: cinelerra/fileogg.C:821 cinelerra/fileogg.C:1109
-msgid "FileOGG: Cannot find next page while seeking\n"
-msgstr "ArchivoOGG: no se puede encontrar la página siguiente al buscar\n"
+#: cinelerra/fileogg.C:1032
+msgid "Seeking to sample's page failed\n"
+msgstr "La búsqueda de la página de muestras falló\n"

 
 

-#: cinelerra/fileogg.C:834
-msgid "Ogg decoding error while seeking sample\n"
-msgstr "Ogg, error de decodificación buscando la muestra\n"
+#: cinelerra/fileogg.C:1055
+msgid "Something wrong while trying to seek\n"
+msgstr "Algo anda mal mientras trato de buscar\n"

 
 

-#: cinelerra/fileogg.C:850
-msgid "FileOGG: Something wrong while trying to seek\n"
-msgstr "ArchivoOGG: Algo a ido mal mientras busco\n"
+#: cinelerra/fileogg.C:1080
+msgid "Illegal seek beyond end of frames\n"
+msgstr "Búsqueda erronea más allá del final de los fotogramas\n"

 
 

-#: cinelerra/fileogg.C:863
-msgid "FileOGG: Illegal seek beyond end of frames\n"
-msgstr "ARchivoOGG: Búsqueda incorrecta más allá del final de los fotogramas\n"
+#: cinelerra/fileogg.C:1084
+msgid "Illegal seek before start of frames\n"
+msgstr "Búsqueda erronea antes del inicio de fotogramas\n"

 
 

-#: cinelerra/fileogg.C:874
+#: cinelerra/fileogg.C:1164

 #, c-format
 #, c-format

-msgid "FileOGG: ogg_sync_and_get_next_page failed\n"
-msgstr "ArchivoOGG: la sincronización de ogg y la página siguiente fallaron\n"
+msgid "Seeking to keyframe %jd search failed\n"
+msgstr "Buscando el fotograma clave %jd La búsqueda ha fallado\n"

 
 

-#: cinelerra/fileogg.C:1085
+#: cinelerra/fileogg.C:1258

 #, c-format
 #, c-format

-msgid "FileOGG:: Error while seeking to frame's keyframe (frame: %jd, keyframe: %jd)\n"
-msgstr "ArchivoOGG:: Error al intentar encuadrar el fotograma clave (fotograma: %jd, fotograma clave: %jd)\n"
+msgid "Error while seeking to frame's keyframe (frame: %jd, keyframe: %jd)\n"
+msgstr "Error mientras buscaba (fotograma: %jd, fotograma clave: %jd)\n"

 
 

-#: cinelerra/fileogg.C:1093
+#: cinelerra/fileogg.C:1266

 #, c-format
 #, c-format

-msgid "FileOGG:: Error while seeking to keyframe, wrong keyframe number (frame: %jd, keyframe: %jd)\n"
-msgstr "ArchivoOGG:: Error al buscar el fotograma clave, número de fotograma clave incorrecto (fotograma: %jd, fotograma clave: %jd) \\ n\n"
+msgid "Error while seeking to keyframe, wrong keyframe number (frame: %jd, keyframe: %jd)\n"
+msgstr "Error al buscar el fotograma clave, número de fotograma clave incorrecto (fotograma: %jd, fotograma clave: %jd)\n"

 
 

-#: cinelerra/fileogg.C:1117
+#: cinelerra/fileogg.C:1281

 msgid "FileOGG: Expecting keyframe, but didn't get it\n"
 msgstr "ArchivoOGG: Se esperaba el fotograma clave, pero no lo conseguí\n"
 
 msgid "FileOGG: Expecting keyframe, but didn't get it\n"
 msgstr "ArchivoOGG: Se esperaba el fotograma clave, pero no lo conseguí\n"
 

-#: cinelerra/fileogg.C:1131
+#: cinelerra/fileogg.C:1294

 #, c-format
 #, c-format

-msgid "FileOGG: theora_decode_YUVout failed with code %i\n"
-msgstr ""
-"ArchivoOGG:\n"
-" decodificador_Theora_YUV out falló con el código %i\n"
+msgid "th_decode_ycbcr_out failed with code %i\n"
+msgstr "th_decode_ycbcr_out falló con el código %i\n"

 
 

-#: cinelerra/fileogg.C:1153
-msgid "FileOGG: Cannot find next page while trying to decode more samples\n"
-msgstr "ArchivoOGG: no se puede encontrar la página siguiente al intentar decodificar más muestras\n"
+#: cinelerra/fileogg.C:1343
+msgid "Cannot find next page while trying to decode more samples\n"
+msgstr "No se puede encontrar la página siguiente al intentar decodificar más muestras\n"

 
 

-#: cinelerra/fileogg.C:1192
+#: cinelerra/fileogg.C:1366

 #, c-format
 msgid "max samples=%d\n"
 msgstr "max samples=%d\n"
 
 #, c-format
 msgid "max samples=%d\n"
 msgstr "max samples=%d\n"
 

-#: cinelerra/fileogg.C:1241
-msgid "FileOGG: Error at finding out what to read from file\n"
-msgstr "ArchivoOGG:\n"
+#: cinelerra/fileogg.C:1415
+msgid "Error in finding read file position\n"
+msgstr "Error al encontrar la posición del archivo leído\n"

 
 

-#: cinelerra/fileogg.C:1257
+#: cinelerra/fileogg.C:1431

 msgid "Error while seeking to sample\n"
 msgid "Error while seeking to sample\n"

-msgstr "Error al intentar muestrear \\ n\n"
+msgstr "Error al intentar muestrear  n\n"

 
 

-#: cinelerra/fileogg.C:1298
+#: cinelerra/fileogg.C:1472

 #, c-format
 msgid "FileOGG:: History not aligned properly \n"
 msgstr "ArchivoOGG:: Historial no alineado correctamente\n"
 
 #, c-format
 msgid "FileOGG:: History not aligned properly \n"
 msgstr "ArchivoOGG:: Historial no alineado correctamente\n"
 

-#: cinelerra/fileogg.C:1299
+#: cinelerra/fileogg.C:1473

 #, c-format
 msgid "\tnext_sample_position: %jd, length: %jd\n"
 msgstr "\tsiguiente_posición_de_muestra: %jd, longitud: %jd\n"
 
 #, c-format
 msgid "\tnext_sample_position: %jd, length: %jd\n"
 msgstr "\tsiguiente_posición_de_muestra: %jd, longitud: %jd\n"
 

-#: cinelerra/fileogg.C:1300
+#: cinelerra/fileogg.C:1474

 #, c-format
 msgid "\thistory_start: %jd, length: %jd\n"
 msgstr "\tempezar_historia: %jd, longitud: %jd\n"
 
 #, c-format
 msgid "\thistory_start: %jd, length: %jd\n"
 msgstr "\tempezar_historia: %jd, longitud: %jd\n"
 

-#: cinelerra/fileogg.C:1316
+#: cinelerra/fileogg.C:1490

 msgid "error writing audio page\n"
 msgstr "error al escribir audio\n"
 
 msgid "error writing audio page\n"
 msgstr "error al escribir audio\n"
 

-#: cinelerra/fileogg.C:1327
+#: cinelerra/fileogg.C:1498

 msgid "error writing video page\n"
 msgstr "error al escribir vídeo\n"
 
 msgid "error writing video page\n"
 msgstr "error al escribir vídeo\n"
 

-#: cinelerra/fileogg.C:1492
-#, c-format
-msgid "FileOGG: theora_encode_YUVin failed with code %i\n"
-msgstr "ArchivoOGG: theora_encode_YUVin fallo con el código %i\n"
+#: cinelerra/fileogg.C:1601
+msgid "th_encode_ycbcr_in failed"
+msgstr "th_encode_ycbcr_in falló"

 
 

-#: cinelerra/fileogg.C:1550 cinelerra/filevorbis.C:392
+#: cinelerra/fileogg.C:1659 cinelerra/filevorbis.C:392

 msgid "Min bitrate:"
 msgid "Min bitrate:"

-msgstr "Tasa de bits mínima"
+msgstr "Tasa de bits mínima:"

 
 

-#: cinelerra/fileogg.C:1554 cinelerra/filevorbis.C:396
+#: cinelerra/fileogg.C:1663 cinelerra/filevorbis.C:396

 msgid "Avg bitrate:"
 msgid "Avg bitrate:"

-msgstr "Prom TasaDeBits"
+msgstr "Prom TasaDeBits:"

 
 

-#: cinelerra/fileogg.C:1559 cinelerra/filevorbis.C:401
+#: cinelerra/fileogg.C:1668 cinelerra/filevorbis.C:401

 msgid "Max bitrate:"
 msgid "Max bitrate:"

-msgstr "Tasa de bits Max."
+msgstr "Tasa de bits Max:"

 
 

-#: cinelerra/fileogg.C:1576
+#: cinelerra/fileogg.C:1685

 msgid "Average bitrate"
 msgstr "Promedio de la tasa de bits"
 
 msgid "Average bitrate"
 msgstr "Promedio de la tasa de bits"
 

-#: cinelerra/fileogg.C:1588 cinelerra/filevorbis.C:435
+#: cinelerra/fileogg.C:1697 cinelerra/filevorbis.C:435

 msgid "Variable bitrate"
 msgstr "Velocidad de bits variable"
 
 msgid "Variable bitrate"
 msgstr "Velocidad de bits variable"
 

-#: cinelerra/fileogg.C:1684
+#: cinelerra/fileogg.C:1794

 msgid "Keyframe frequency:"
 msgstr "Fotograma clave de frecuencia:"
 
 msgid "Keyframe frequency:"
 msgstr "Fotograma clave de frecuencia:"
 

-#: cinelerra/fileogg.C:1690
+#: cinelerra/fileogg.C:1800

 msgid "Keyframe force frequency:"
 msgstr "Forzar FotogramaClave de frecuancia:"
 
 msgid "Keyframe force frequency:"
 msgstr "Forzar FotogramaClave de frecuancia:"
 

-#: cinelerra/fileogg.C:1696 plugins/denoisemjpeg/denoisemjpeg.C:379
+#: cinelerra/fileogg.C:1806 plugins/denoisemjpeg/denoisemjpeg.C:379

 #: plugins/greycstoration/greycstorationwindow.C:50
 msgid "Sharpness:"
 msgstr "Nitidez:"
 
 #: plugins/greycstoration/greycstorationwindow.C:50
 msgid "Sharpness:"
 msgstr "Nitidez:"
 

-#: cinelerra/fileogg.C:1747
+#: cinelerra/fileogg.C:1859

 msgid "Fixed quality"
 msgstr "Calidad fija"
 
 msgid "Fixed quality"
 msgstr "Calidad fija"
 


@@ -5473,7 +5501,7 @@ msgstr "buffer =%p\n"
 #: cinelerra/filesndfile.C:304
 #, c-format
 msgid "FileSndFile::read_samples fd=%p temp_double=%p len=%jd asset=%p asset->channels=%d\n"
 #: cinelerra/filesndfile.C:304
 #, c-format
 msgid "FileSndFile::read_samples fd=%p temp_double=%p len=%jd asset=%p asset->channels=%d\n"

-msgstr "FileSndFile::read_samples fd=%p temp_double=%p len=%jd asset=%p asset->channels=%d\n"
+msgstr "FileSndFile::read_samples fd=%p temp_double=%p len=%jd asset=%p asset→channels=%d\n"

 
 #: cinelerra/filesndfile.C:416 cinelerra/formatwindow.C:159
 msgid "Dither"
 
 #: cinelerra/filesndfile.C:416 cinelerra/formatwindow.C:159
 msgid "Dither"


@@ -5785,7 +5813,7 @@ msgstr "Edición:"
 
 #: cinelerra/interfaceprefs.C:80
 msgid "Keyframe reticle:"
 
 #: cinelerra/interfaceprefs.C:80
 msgid "Keyframe reticle:"

-msgstr "Keyframe reticle:"
+msgstr "Retícula de fotogramas clave:"

 
 #: cinelerra/interfaceprefs.C:88
 msgid "Snapshot path:"
 
 #: cinelerra/interfaceprefs.C:88
 msgid "Snapshot path:"


@@ -6048,15 +6076,15 @@ msgstr "Copiar fotograma clave"
 
 #: cinelerra/keyframepopup.C:459
 msgid "linear segments"
 
 #: cinelerra/keyframepopup.C:459
 msgid "linear segments"

-msgstr "Lineal"
+msgstr "segmentos lineales"

 
 #: cinelerra/keyframepopup.C:460
 msgid "tangent edit"
 
 #: cinelerra/keyframepopup.C:460
 msgid "tangent edit"

-msgstr "Tangente en bloque - usar ( Ctrl )"
+msgstr "tangente en bloque - usar ( Ctrl )"

 
 #: cinelerra/keyframepopup.C:461
 msgid "disjoint edit"
 
 #: cinelerra/keyframepopup.C:461
 msgid "disjoint edit"

-msgstr "Tangente Disjunta - usar ( Ctrl )"
+msgstr "tangente Disjunta - usar ( Ctrl )"

 
 #: cinelerra/keyframepopup.C:463
 msgid "misconfigured"
 
 #: cinelerra/keyframepopup.C:463
 msgid "misconfigured"


@@ -6452,7 +6480,7 @@ msgstr "Dividir | Cortar"
 
 #: cinelerra/mainmenu.C:924
 msgid "Clear..."
 
 #: cinelerra/mainmenu.C:924
 msgid "Clear..."

-msgstr "Eliminar →..."
+msgstr "Opciones para Eliminar..."

 
 #: cinelerra/mainmenu.C:944 cinelerra/recordbatches.C:546
 #: cinelerra/swindow.C:563 plugins/compressor/compressor.C:688
 
 #: cinelerra/mainmenu.C:944 cinelerra/recordbatches.C:546
 #: cinelerra/swindow.C:563 plugins/compressor/compressor.C:688


@@ -6461,7 +6489,7 @@ msgstr "Eliminar →..."
 #: plugins/histogram_bezier/bistogramwindow.C:83 plugins/piano/piano.C:906
 #: plugins/synthesizer/synthesizer.C:1374
 msgid "Clear"
 #: plugins/histogram_bezier/bistogramwindow.C:83 plugins/piano/piano.C:906
 #: plugins/synthesizer/synthesizer.C:1374
 msgid "Clear"

-msgstr "Eliminar (Elimina el hueco)"
+msgstr "Eliminar"

 
 #: cinelerra/mainmenu.C:960
 msgid "Paste silence"
 
 #: cinelerra/mainmenu.C:960
 msgid "Paste silence"


@@ -6545,178 +6573,178 @@ msgstr "Eliminar primera pista"
 msgid "Delete last track"
 msgstr "Eliminar última pista"
 
 msgid "Delete last track"
 msgstr "Eliminar última pista"
 

-#: cinelerra/mainmenu.C:1265
+#: cinelerra/mainmenu.C:1267

 msgid "Move tracks up"
 msgstr "Mover pistas hacia arriba"
 
 msgid "Move tracks up"
 msgstr "Mover pistas hacia arriba"
 

-#: cinelerra/mainmenu.C:1265
+#: cinelerra/mainmenu.C:1267

 msgid "Shift-Up"
 msgstr "Mayús-Arriba↑"
 
 msgid "Shift-Up"
 msgstr "Mayús-Arriba↑"
 

-#: cinelerra/mainmenu.C:1279
+#: cinelerra/mainmenu.C:1281

 msgid "Move tracks down"
 msgstr "Mover pistas hacia abajo"
 
 msgid "Move tracks down"
 msgstr "Mover pistas hacia abajo"
 

-#: cinelerra/mainmenu.C:1279
+#: cinelerra/mainmenu.C:1281

 msgid "Shift-Down"
 msgstr "Mayús-Abajo↓"
 
 msgid "Shift-Down"
 msgstr "Mayús-Abajo↓"
 

-#: cinelerra/mainmenu.C:1295
+#: cinelerra/mainmenu.C:1297

 msgid "Concatenate tracks"
 msgstr "Concatenar pistas"
 
 msgid "Concatenate tracks"
 msgstr "Concatenar pistas"
 

-#: cinelerra/mainmenu.C:1312
+#: cinelerra/mainmenu.C:1314

 msgid "Loop Playback"
 msgstr "Reproducción en bucle"
 
 msgid "Loop Playback"
 msgstr "Reproducción en bucle"
 

-#: cinelerra/mainmenu.C:1312
+#: cinelerra/mainmenu.C:1314

 msgid "Shift-L"
 msgstr "Mayús-L"
 
 msgid "Shift-L"
 msgstr "Mayús-L"
 

-#: cinelerra/mainmenu.C:1334
+#: cinelerra/mainmenu.C:1336

 msgid "Add subttl"
 msgstr "Añadir SUBTTL"
 
 msgid "Add subttl"
 msgstr "Añadir SUBTTL"
 

-#: cinelerra/mainmenu.C:1334
+#: cinelerra/mainmenu.C:1336

 msgid "Shift-Y"
 msgstr "Mayús-Y"
 
 msgid "Shift-Y"
 msgstr "Mayús-Y"
 

-#: cinelerra/mainmenu.C:1348 cinelerra/swindow.C:461
+#: cinelerra/mainmenu.C:1350 cinelerra/swindow.C:461

 msgid "paste subttl"
 msgstr "pegar SUBTTL"
 
 msgid "paste subttl"
 msgstr "pegar SUBTTL"
 

-#: cinelerra/mainmenu.C:1362
+#: cinelerra/mainmenu.C:1364

 msgid "Toggle background rendering"
 msgstr "Alternar renderizado de fondo"
 
 msgid "Toggle background rendering"
 msgstr "Alternar renderizado de fondo"
 

-#: cinelerra/mainmenu.C:1362
+#: cinelerra/mainmenu.C:1364

 msgid "Shift-G"
 msgstr "Mayús-G"
 
 msgid "Shift-G"
 msgstr "Mayús-G"
 

-#: cinelerra/mainmenu.C:1380
+#: cinelerra/mainmenu.C:1382

 msgid "Edit labels"
 msgstr "Editar etiquetas"
 
 msgid "Edit labels"
 msgstr "Editar etiquetas"
 

-#: cinelerra/mainmenu.C:1397
+#: cinelerra/mainmenu.C:1399

 msgid "Edit effects"
 msgstr "Editar efectos"
 
 msgid "Edit effects"
 msgstr "Editar efectos"
 

-#: cinelerra/mainmenu.C:1414
+#: cinelerra/mainmenu.C:1416

 msgid "Keyframes follow edits"
 msgstr "Fotogramas clave siguen las ediciones"
 
 msgid "Keyframes follow edits"
 msgstr "Fotogramas clave siguen las ediciones"
 

-#: cinelerra/mainmenu.C:1429
+#: cinelerra/mainmenu.C:1431

 msgid "Align cursor on frames"
 msgstr "Alinear el cursor a los fotogramas"
 
 msgid "Align cursor on frames"
 msgstr "Alinear el cursor a los fotogramas"
 

-#: cinelerra/mainmenu.C:1429
+#: cinelerra/mainmenu.C:1431

 msgid "Ctrl-a"
 msgstr "Ctrl-a"
 
 msgid "Ctrl-a"
 msgstr "Ctrl-a"
 

-#: cinelerra/mainmenu.C:1445
+#: cinelerra/mainmenu.C:1447

 msgid "Typeless keyframes"
 msgstr "Fotogramas clave sin tipo"
 
 msgid "Typeless keyframes"
 msgstr "Fotogramas clave sin tipo"
 

-#: cinelerra/mainmenu.C:1460 cinelerra/mainmenu.C:1470
+#: cinelerra/mainmenu.C:1462 cinelerra/mainmenu.C:1472

 msgid "Slow Shuttle"
 msgstr "Trasladar lento"
 
 msgid "Slow Shuttle"
 msgstr "Trasladar lento"
 

-#: cinelerra/mainmenu.C:1475
+#: cinelerra/mainmenu.C:1477

 msgid "Fast Shuttle"
 msgstr "Trasladar Fast"
 
 msgid "Fast Shuttle"
 msgstr "Trasladar Fast"
 

-#: cinelerra/mainmenu.C:1481
+#: cinelerra/mainmenu.C:1483

 msgid "Save settings now"
 msgstr "Guardar preferencias ahora"
 
 msgid "Save settings now"
 msgstr "Guardar preferencias ahora"
 

-#: cinelerra/mainmenu.C:1481
+#: cinelerra/mainmenu.C:1483

 msgid "Ctrl-s"
 msgstr "Ctrl-s"
 
 msgid "Ctrl-s"
 msgstr "Ctrl-s"
 

-#: cinelerra/mainmenu.C:1491
+#: cinelerra/mainmenu.C:1493

 msgid "Saved settings."
 msgstr "Preferencias guardadas."
 
 msgid "Saved settings."
 msgstr "Preferencias guardadas."
 

-#: cinelerra/mainmenu.C:1504
+#: cinelerra/mainmenu.C:1506

 msgid "Show Viewer"
 msgstr "Mostrar Visor"
 
 msgid "Show Viewer"
 msgstr "Mostrar Visor"
 

-#: cinelerra/mainmenu.C:1516
+#: cinelerra/mainmenu.C:1518

 msgid "Show Resources"
 msgstr "Mostrar Recursos"
 
 msgid "Show Resources"
 msgstr "Mostrar Recursos"
 

-#: cinelerra/mainmenu.C:1528
+#: cinelerra/mainmenu.C:1530

 msgid "Show Compositor"
 msgstr "Mostrar Compositor"
 
 msgid "Show Compositor"
 msgstr "Mostrar Compositor"
 

-#: cinelerra/mainmenu.C:1541
+#: cinelerra/mainmenu.C:1543

 msgid "Show Overlays"
 msgstr "Mostrar Superposiciones"
 
 msgid "Show Overlays"
 msgstr "Mostrar Superposiciones"
 

-#: cinelerra/mainmenu.C:1541
+#: cinelerra/mainmenu.C:1543

 msgid "Ctrl-0"
 msgstr "Ctrl-0"
 
 msgid "Ctrl-0"
 msgstr "Ctrl-0"
 

-#: cinelerra/mainmenu.C:1561
+#: cinelerra/mainmenu.C:1563

 msgid "Show Levels"
 msgstr "Mostrar Niveles"
 
 msgid "Show Levels"
 msgstr "Mostrar Niveles"
 

-#: cinelerra/mainmenu.C:1594
+#: cinelerra/mainmenu.C:1596

 msgid "Split X pane"
 msgstr "Dividir hoja X"
 
 msgid "Split X pane"
 msgstr "Dividir hoja X"
 

-#: cinelerra/mainmenu.C:1594
+#: cinelerra/mainmenu.C:1596

 msgid "Ctrl-1"
 msgstr "Ctrl-1"
 
 msgid "Ctrl-1"
 msgstr "Ctrl-1"
 

-#: cinelerra/mainmenu.C:1608
+#: cinelerra/mainmenu.C:1610

 msgid "Split Y pane"
 msgstr "Dividir hoja Y"
 
 msgid "Split Y pane"
 msgstr "Dividir hoja Y"
 

-#: cinelerra/mainmenu.C:1608
+#: cinelerra/mainmenu.C:1610

 msgid "Ctrl-2"
 msgstr "Ctrl-2"
 
 msgid "Ctrl-2"
 msgstr "Ctrl-2"
 

-#: cinelerra/mainmenu.C:1623
+#: cinelerra/mainmenu.C:1625

 msgid "Mixers..."
 msgstr "Mezcladores..."
 
 msgid "Mixers..."
 msgstr "Mezcladores..."
 

-#: cinelerra/mainmenu.C:1638
+#: cinelerra/mainmenu.C:1640

 msgid "Mixer Viewer"
 msgstr "Visor de mezcladores"
 
 msgid "Mixer Viewer"
 msgstr "Visor de mezcladores"
 

-#: cinelerra/mainmenu.C:1651
+#: cinelerra/mainmenu.C:1653

 msgid "Tile mixers"
 msgstr "Mezcladores de mosaico"
 
 msgid "Tile mixers"
 msgstr "Mezcladores de mosaico"
 

-#: cinelerra/mainmenu.C:1664
+#: cinelerra/mainmenu.C:1666

 msgid "Align mixers"
 msgstr "Alinear mezcladores"
 
 msgid "Align mixers"
 msgstr "Alinear mezcladores"
 

-#: cinelerra/mainmenu.C:1685
+#: cinelerra/mainmenu.C:1687

 #, c-format
 msgid "Ctrl-Shift+F%d"
 msgstr "Ctrl-Mayús+F%d"
 
 #, c-format
 msgid "Ctrl-Shift+F%d"
 msgstr "Ctrl-Mayús+F%d"
 

-#: cinelerra/mainmenu.C:1730 cinelerra/mainmenu.C:1776
+#: cinelerra/mainmenu.C:1732 cinelerra/mainmenu.C:1778

 #, c-format
 msgid "Layout %d"
 msgstr "Diseño %d"
 
 #, c-format
 msgid "Layout %d"
 msgstr "Diseño %d"
 

-#: cinelerra/mainmenu.C:1864
+#: cinelerra/mainmenu.C:1866

 msgid ": Layout"
 msgstr ": Diseño"
 
 msgid ": Layout"
 msgstr ": Diseño"
 

-#: cinelerra/mainmenu.C:1883
+#: cinelerra/mainmenu.C:1885

 msgid "Layout Name:"
 msgstr "Nombre de diseño:"
 
 msgid "Layout Name:"
 msgstr "Nombre de diseño:"
 

-#: cinelerra/mainmenu.C:1892
+#: cinelerra/mainmenu.C:1894

 #, c-format
 msgid "a-z,A-Z,0-9_ only, %dch max"
 msgstr "a-z,A-Z,0-9_ solo, %dch max"
 
 #, c-format
 msgid "a-z,A-Z,0-9_ only, %dch max"
 msgstr "a-z,A-Z,0-9_ solo, %dch max"
 

-#: cinelerra/mainmenu.C:1948
+#: cinelerra/mainmenu.C:1950

 msgid "Load Recent..."
 msgstr "Cargar recientes..."
 
 msgid "Load Recent..."
 msgstr "Cargar recientes..."
 


@@ -7198,7 +7226,9 @@ msgstr "proxy"
 msgid ""
 "The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
 "The project won't be rendered as it was meant and Cinelerra might crash.\n"
 msgid ""
 "The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n"
 "The project won't be rendered as it was meant and Cinelerra might crash.\n"

-msgstr "El %s '%s' en el archivo '%s' no es parte de la instalación de Cinelerra.  NLa proyecto no se rindió ya que estaba destinado y Cinelerra puede bloquearse.\n"
+msgstr ""
+"La %s '%s' en el archivo '%s' no forma parte de su instalación de Cinelerra. \n"
+"Posiblemente su proyecto no se exportará correctamente y Cinelerra puede bloquearse. \n"

 
 #: cinelerra/mwindow.C:2642
 #, c-format
 
 #: cinelerra/mwindow.C:2642
 #, c-format


@@ -7337,7 +7367,7 @@ msgstr "eliminar"
 
 #: cinelerra/mwindowedit.C:354
 msgid "clear keyframes"
 
 #: cinelerra/mwindowedit.C:354
 msgid "clear keyframes"

-msgstr "eliminar keyframes"
+msgstr "eliminar clave"

 
 #: cinelerra/mwindowedit.C:367
 msgid "clear default keyframe"
 
 #: cinelerra/mwindowedit.C:367
 msgid "clear default keyframe"


@@ -7587,7 +7617,7 @@ msgstr ": Programa"
 
 #: cinelerra/mwindowgui.C:2338
 msgid "Changing the base codecs may require rebuilding indexes."
 
 #: cinelerra/mwindowgui.C:2338
 msgid "Changing the base codecs may require rebuilding indexes."

-msgstr "Changing the base codecs may require rebuilding indexes."
+msgstr "Cambiar los códecs base puede requerir la reconstrucción de índices."

 
 #: cinelerra/mwindowgui.C:2377 cinelerra/mwindowgui.C:2411
 msgid "Disable proxy"
 
 #: cinelerra/mwindowgui.C:2377 cinelerra/mwindowgui.C:2411
 msgid "Disable proxy"


@@ -7651,7 +7681,7 @@ msgstr "Cinelerra: BuscarCanales"
 
 #: cinelerra/mwindow.inc:72
 msgid "Cinelerra: Clip Info"
 
 #: cinelerra/mwindow.inc:72
 msgid "Cinelerra: Clip Info"

-msgstr "Cinelerra: la información del clip"
+msgstr "Cinelerra: Información del clip"

 
 #: cinelerra/mwindow.inc:73
 msgid "Cinelerra: Color"
 
 #: cinelerra/mwindow.inc:73
 msgid "Cinelerra: Color"


@@ -8326,7 +8356,7 @@ msgstr "Reproducir audio en prioridad tiempo real (sólo root)"
 
 #: cinelerra/playbackprefs.C:292 cinelerra/recordprefs.C:295
 msgid "Map 5.1->2"
 
 #: cinelerra/playbackprefs.C:292 cinelerra/recordprefs.C:295
 msgid "Map 5.1->2"

-msgstr "Mapa 5.1->2"
+msgstr "Mapa 5.1→2"

 
 #: cinelerra/playbackprefs.C:308
 msgid "Interpolate CR2 images"
 
 #: cinelerra/playbackprefs.C:308
 msgid "Interpolate CR2 images"


@@ -9119,8 +9149,8 @@ msgid "no audio or video in render asset format\n"
 msgstr "sin audio o video en formato de renderizado de recursos\n"
 
 #: cinelerra/render.C:341
 msgstr "sin audio o video en formato de renderizado de recursos\n"
 
 #: cinelerra/render.C:341

-msgid "render file per label and no labels\n"
-msgstr "renderizar archivo por etiqueta y sin etiqueta\n"
+msgid "Create new file at labels checked, but no labels\n"
+msgstr "Crear un nuevo archivo en las etiquetas marcadas, pero sin etiquetas\n"

 
 #: cinelerra/render.C:347
 msgid "Video data and range less than 1 frame"
 
 #: cinelerra/render.C:347
 msgid "Video data and range less than 1 frame"


@@ -10169,12 +10199,12 @@ msgstr "AudioScope"
 #: plugins/bandslide/bandslide.C:77 plugins/bandwipe/bandwipe.C:77
 #: plugins/irissquare/irissquare.C:49 plugins/slide/slide.C:94
 msgid "In"
 #: plugins/bandslide/bandslide.C:77 plugins/bandwipe/bandwipe.C:77
 #: plugins/irissquare/irissquare.C:49 plugins/slide/slide.C:94
 msgid "In"

-msgstr "Dentro"
+msgstr "Entrar"

 
 #: plugins/bandslide/bandslide.C:99 plugins/bandwipe/bandwipe.C:99
 #: plugins/irissquare/irissquare.C:71 plugins/slide/slide.C:116
 msgid "Out"
 
 #: plugins/bandslide/bandslide.C:99 plugins/bandwipe/bandwipe.C:99
 #: plugins/irissquare/irissquare.C:71 plugins/slide/slide.C:116
 msgid "Out"

-msgstr "Fuera"
+msgstr "Salir"

 
 #: plugins/bandslide/bandslide.C:138 plugins/bandwipe/bandwipe.C:136
 #: plugins/vocoder/vocoder.C:316
 
 #: plugins/bandslide/bandslide.C:138 plugins/bandwipe/bandwipe.C:136
 #: plugins/vocoder/vocoder.C:316


@@ -10192,7 +10222,7 @@ msgstr "DeslizarBandas"
 
 #: plugins/bandwipe/bandwipe.C:182
 msgid "BandWipe"
 
 #: plugins/bandwipe/bandwipe.C:182
 msgid "BandWipe"

-msgstr "EliminarBandas"
+msgstr "BarridoBandas"

 
 #: plugins/bluebanana/bluebanana.C:87
 msgid "Blue Banana"
 
 #: plugins/bluebanana/bluebanana.C:87
 msgid "Blue Banana"


@@ -10899,7 +10929,7 @@ msgstr "Posición"
 
 #: plugins/crossfade/crossfade.C:46
 msgid "Crossfade"
 
 #: plugins/crossfade/crossfade.C:46
 msgid "Crossfade"

-msgstr "Crossfade"
+msgstr "FundidoCruzado"

 
 #: plugins/decimate/decimate.C:247
 #: plugins/interpolatevideo/interpolatewindow.C:59
 
 #: plugins/decimate/decimate.C:247
 #: plugins/interpolatevideo/interpolatewindow.C:59


@@ -11306,8 +11336,7 @@ msgstr "Compensación vertical"
 
 #: plugins/downsample/downsample.C:378 plugins/reframert/reframert.C:241
 msgid "Downsample"
 
 #: plugins/downsample/downsample.C:378 plugins/reframert/reframert.C:241
 msgid "Downsample"

-msgstr ""
-"Pixelizar"
+msgstr "Pixelizar"

 
 #: plugins/echo/echo.C:147
 msgid "Level: "
 
 #: plugins/echo/echo.C:147
 msgid "Level: "


@@ -11907,7 +11936,7 @@ msgstr "Invertir"
 
 #: plugins/irissquare/irissquare.C:146
 msgid "IrisSquare"
 
 #: plugins/irissquare/irissquare.C:146
 msgid "IrisSquare"

-msgstr "IrisSquare"
+msgstr "IrisCuadrado"

 
 #: plugins/ivtc/ivtc.C:36 plugins/ivtc/ivtcwindow.C:32
 msgid "A  B  BC  CD  D"
 
 #: plugins/ivtc/ivtc.C:36 plugins/ivtc/ivtcwindow.C:32
 msgid "A  B  BC  CD  D"


@@ -12169,7 +12198,7 @@ msgid ""
 msgstr ""
 "Para mejores resultados\n"
 " Fijar: Reproduce cada fotograma\n"
 msgstr ""
 "Para mejores resultados\n"
 " Fijar: Reproduce cada fotograma\n"

-" Preferencias-> Reproducción-> Salida de vídeo"
+" Preferencias→ Reproducción→ Salida de vídeo"

 
 #: plugins/motion/motionwindow.C:187 plugins/motion51/motionwindow51.C:110
 #: plugins/motion-cv/motionwindow-cv.C:165
 
 #: plugins/motion/motionwindow.C:187 plugins/motion51/motionwindow51.C:110
 #: plugins/motion-cv/motionwindow-cv.C:165


@@ -12839,11 +12868,11 @@ msgstr "Vídeo inverso"
 
 #: plugins/rgb601/rgb601window.C:57
 msgid "RGB -> 601 compression"
 
 #: plugins/rgb601/rgb601window.C:57
 msgid "RGB -> 601 compression"

-msgstr "RGB -> 601 de compresión"
+msgstr "RGB → 601 de compresión"

 
 #: plugins/rgb601/rgb601window.C:64
 msgid "601 -> RGB expansion"
 
 #: plugins/rgb601/rgb601window.C:64
 msgid "601 -> RGB expansion"

-msgstr "601 -> expansión RGB"
+msgstr "601 → expansión RGB"

 
 #: plugins/rgbshift/rgbshift.C:167
 msgid "R_dx:"
 
 #: plugins/rgbshift/rgbshift.C:167
 msgid "R_dx:"


@@ -12993,7 +13022,7 @@ msgstr "Reajustar la pluma"
 
 #: plugins/shapewipe/shapewipe.C:272 plugins/wipe/wipe.C:146
 msgid "Wipe"
 
 #: plugins/shapewipe/shapewipe.C:272 plugins/wipe/wipe.C:146
 msgid "Wipe"

-msgstr "Limpia"
+msgstr "Barrido"

 
 #: plugins/shapewipe/shapewipe.C:300
 msgid "Direction"
 
 #: plugins/shapewipe/shapewipe.C:300
 msgid "Direction"


@@ -13001,12 +13030,12 @@ msgstr "Dirección"
 
 #: plugins/shapewipe/shapewipe.C:365
 msgid "Shape Wipe"
 
 #: plugins/shapewipe/shapewipe.C:365
 msgid "Shape Wipe"

-msgstr "Barrido"
+msgstr "BarridoFormas"

 
 #: plugins/shapewipe/shapewipe.C:601
 #, c-format
 msgid "Shape Wipe: cannot load shape %s\n"
 
 #: plugins/shapewipe/shapewipe.C:601
 #, c-format
 msgid "Shape Wipe: cannot load shape %s\n"

-msgstr "Shape Wipe: no puede cargar de forma %s\n"
+msgstr "Barrido con Forma: no se puede cargar la forma %s\n"

 
 #: plugins/sharpen/sharpen.C:133
 msgid "Sharpen"
 
 #: plugins/sharpen/sharpen.C:133
 msgid "Sharpen"


@@ -13341,19 +13370,19 @@ msgstr "Canales intercambio"
 
 #: plugins/swapchannels/swapchannels.C:111
 msgid "-> Red"
 
 #: plugins/swapchannels/swapchannels.C:111
 msgid "-> Red"

-msgstr "-> Rojo"
+msgstr "→ Rojo"

 
 #: plugins/swapchannels/swapchannels.C:115
 msgid "-> Green"
 
 #: plugins/swapchannels/swapchannels.C:115
 msgid "-> Green"

-msgstr "-> Verde"
+msgstr "→ Verde"

 
 #: plugins/swapchannels/swapchannels.C:119
 msgid "-> Blue"
 
 #: plugins/swapchannels/swapchannels.C:119
 msgid "-> Blue"

-msgstr "-> Azul"
+msgstr "→ Azul"

 
 #: plugins/swapchannels/swapchannels.C:123
 msgid "-> Alpha"
 
 #: plugins/swapchannels/swapchannels.C:123
 msgid "-> Alpha"

-msgstr "-> Alfa"
+msgstr "→ Alfa"

 
 #: plugins/swapframes/swapframes.C:118
 msgid "Swap 0-1, 2-3, 4-5..."
 
 #: plugins/swapframes/swapframes.C:118
 msgid "Swap 0-1, 2-3, 4-5..."


@@ -13964,3 +13993,15 @@ msgstr "Y Ampliación:"
 #: plugins/zoomblur/zoomblur.C:352
 msgid "Zoom Blur"
 msgstr "Desenfoque Zoom"
 #: plugins/zoomblur/zoomblur.C:352
 msgid "Zoom Blur"
 msgstr "Desenfoque Zoom"

+
+#; cinelerra/zwindowgui.C:223
+msgid "Tile Mixers"
+msgstr "Mezcladores en mosaico"
+
+#; cinelerra/zwindowgui.C:234
+msgid "Playable"
+msgstr "Reproducible"
+
+#: cinelerra/canvas.C:1052
+msgid "Resize Window..."
+msgstr "Redimensionar Ventana..."

diff --git a/cinelerra-5.1/tips/tips.es b/cinelerra-5.1/tips/tips.es
index a6ca5d30fea88a3318c33870d7f4eb0c7e4b3014..0ad17f50893a7f5b9486e63c9d9fdf1e42ce6ae8 100644 (file)
--- a/cinelerra-5.1/tips/tips.es
+++ b/cinelerra-5.1/tips/tips.es
@@ -64,3 +64,24 @@ mantienes pulsada la tecla Ctrl.
 La tecla "F" pulsada sobre la línea de tiempo ajusta el contenido a la ventana. La misma 
 tecla sobre los monitores de recorte o previsualización, los pone a pantalla completa.
 
 La tecla "F" pulsada sobre la línea de tiempo ajusta el contenido a la ventana. La misma 
 tecla sobre los monitores de recorte o previsualización, los pone a pantalla completa.
 

+Si tienes claves de fotograma insertadas en los clips de efectos puedes ir a la siguiente
+clave con la tecla "k" y la anterior con la combinación "ctrl+k"
+
+Pulsando "Mayús+K" crearás una selección desde la posición del cursor al fotograma clave
+de la derecha, o final del clip, si no hay claves a la derecha del cursor. Con "Ctrl+Mayús+k"
+lo mismo que hemos visto, pero hacía la izquierda.
+
+Puedes crear fácilmente fundidos de entrada y salida con la transición de "Disolver"
+
+Para crear un fundido a negro entre clips en una misma pista, con la transición de disolver,
+deberás recortar el final de este clip y dejar un hueco entre clips de la duración de la
+transición.
+
+Si quieres que un clip acabe por corte y el siguiente, estando en la misma pista, empiece por
+fundido desde negro, deberás separar estos clips un fotograma como mínimo, he insertar la
+transición de disolver en el inicio del clip deseado.
+
+Puedes insertar un efecto, por ejemplo de texto, en una pista vacía sobre un clip de vídeo o
+imagen, para ello selecciona el clip, con doble clic, e inserta el efecto sobre la selección,
+en la parte alta de la pista vacía. Importante que sea en la parte de arriba de la pista.
+