projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andrew minor fix for console running of Batch Render + RafaMar Spanish updates
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
C41
/
c41.C
diff --git
a/cinelerra-5.1/plugins/C41/c41.C
b/cinelerra-5.1/plugins/C41/c41.C
index e56c3c0276f690341bca5b7f224001d026b3fadb..f0cbd94807bbb4460dc288587e04910b13a6f563 100644
(file)
--- a/
cinelerra-5.1/plugins/C41/c41.C
+++ b/
cinelerra-5.1/plugins/C41/c41.C
@@
-20,6
+20,7
@@
#include "c41.h"
#include "bccolors.h"
#include "clip.h"
#include "c41.h"
#include "bccolors.h"
#include "clip.h"
+#include "edl.h"
#include "edlsession.h"
#include "filexml.h"
#include "language.h"
#include "edlsession.h"
#include "filexml.h"
#include "language.h"
@@
-37,7
+38,7
@@
C41Config::C41Config()
fix_min_r = fix_min_g = fix_min_b = fix_light = 0.;
fix_gamma_g = fix_gamma_b = fix_coef1 = fix_coef2 = 0.;
min_col = max_col = min_row = max_row = 0;
fix_min_r = fix_min_g = fix_min_b = fix_light = 0.;
fix_gamma_g = fix_gamma_b = fix_coef1 = fix_coef2 = 0.;
min_col = max_col = min_row = max_row = 0;
- window_w =
500; window_h = 510
;
+ window_w =
xS(500); window_h = yS(510)
;
}
void C41Config::copy_from(C41Config &src)
}
void C41Config::copy_from(C41Config &src)
@@
-122,7
+123,7
@@
int C41Enable::handle_event()
// C41TextBox
C41TextBox::C41TextBox(C41Effect *plugin, float *value, int x, int y)
// C41TextBox
C41TextBox::C41TextBox(C41Effect *plugin, float *value, int x, int y)
- : BC_TextBox(x, y,
160
, 1, *value)
+ : BC_TextBox(x, y,
xS(160)
, 1, *value)
{
this->plugin = plugin;
this->boxValue = value;
{
this->plugin = plugin;
this->boxValue = value;
@@
-186,14
+187,14
@@
int C41BoxButton::handle_event()
C41Slider::C41Slider(C41Effect *plugin, int *output, int x, int y, int is_row)
C41Slider::C41Slider(C41Effect *plugin, int *output, int x, int y, int is_row)
- : BC_ISlider(x, y, 0,
200, 200
, 0, is_row ?
- plugin->get_edl
session()
->output_h :
- plugin->get_edl
session()
->output_w , *output)
+ : BC_ISlider(x, y, 0,
xS(200), yS(200)
, 0, is_row ?
+ plugin->get_edl
()->session
->output_h :
+ plugin->get_edl
()->session
->output_w , *output)
{
this->plugin = plugin;
this->output = output;
this->is_row = is_row;
{
this->plugin = plugin;
this->output = output;
this->is_row = is_row;
- EDLSession *session = plugin->get_edl
session()
;
+ EDLSession *session = plugin->get_edl
()->session
;
this->max = is_row ? session->output_h : session->output_w;
}
this->max = is_row ? session->output_h : session->output_w;
}
@@
-206,10
+207,10
@@
int C41Slider::handle_event()
int C41Slider::update(int v)
{
int C41Slider::update(int v)
{
- EDLSession *session = plugin->get_edl
session()
;
+ EDLSession *session = plugin->get_edl
()->session
;
int max = is_row ? session->output_h : session->output_w;
bclamp(v, 0, max);
int max = is_row ? session->output_h : session->output_w;
bclamp(v, 0, max);
- if( this->max != max ) return BC_ISlider::update(
200
, v, 0, this->max = max);
+ if( this->max != max ) return BC_ISlider::update(
xS(200)
, v, 0, this->max = max);
if( v != get_value() ) return BC_ISlider::update(v);
return 1;
}
if( v != get_value() ) return BC_ISlider::update(v);
return 1;
}
@@
-225,147
+226,149
@@
LOAD_CONFIGURATION_MACRO(C41Effect, C41Config)
C41Window::C41Window(C41Effect *plugin)
: PluginClientWindow(plugin,
plugin->config.window_w, plugin->config.window_h,
C41Window::C41Window(C41Effect *plugin)
: PluginClientWindow(plugin,
plugin->config.window_w, plugin->config.window_h,
-
500, 510
, 1)
+
xS(500), yS(510)
, 1)
{
}
void C41Window::create_objects()
{
{
}
void C41Window::create_objects()
{
- int x = 10, y = 10;
+ int xs10 = xS(10), xs20 = xS(20), xs40 = xS(40), xs80 = xS(80);
+ int ys10 = yS(10), ys20 = yS(20), ys25 = yS(25), ys30 = yS(30), ys40 = yS(40), ys60 = yS(60);
+ int x = xs10, y = ys10;
C41Effect *plugin = (C41Effect *)client;
add_subwindow(active = new C41Enable(plugin,
&plugin->config.active, x, y, _("Activate processing")));
C41Effect *plugin = (C41Effect *)client;
add_subwindow(active = new C41Enable(plugin,
&plugin->config.active, x, y, _("Activate processing")));
- y += 40;
+ y +=
ys
40;
add_subwindow(compute_magic = new C41Enable(plugin,
&plugin->config.compute_magic, x, y, _("Compute negfix values")));
add_subwindow(compute_magic = new C41Enable(plugin,
&plugin->config.compute_magic, x, y, _("Compute negfix values")));
- y += 20;
+ y +=
ys
20;
- add_subwindow(new BC_Title(x + 20, y, _("(uncheck for faster rendering)")));
- y += 40;
+ add_subwindow(new BC_Title(x +
xs
20, y, _("(uncheck for faster rendering)")));
+ y +=
ys
40;
add_subwindow(new BC_Title(x, y, _("Computed negfix values:")));
add_subwindow(new BC_Title(x, y, _("Computed negfix values:")));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min/Max R:")));
add_subwindow(new BC_Title(x, y, _("Min/Max R:")));
- add_subwindow(min_r = new BC_Title(x + 80, y, "0.0000 / 0.0000"));
- y += 30;
+ add_subwindow(min_r = new BC_Title(x +
xs
80, y, "0.0000 / 0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min/Max G:")));
add_subwindow(new BC_Title(x, y, _("Min/Max G:")));
- add_subwindow(min_g = new BC_Title(x + 80, y, "0.0000 / 0.0000"));
- y += 30;
+ add_subwindow(min_g = new BC_Title(x +
xs
80, y, "0.0000 / 0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min/Max B:")));
add_subwindow(new BC_Title(x, y, _("Min/Max B:")));
- add_subwindow(min_b = new BC_Title(x + 80, y, "0.0000 / 0.0000"));
- y += 30;
+ add_subwindow(min_b = new BC_Title(x +
xs
80, y, "0.0000 / 0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Light:")));
add_subwindow(new BC_Title(x, y, _("Light:")));
- add_subwindow(light = new BC_Title(x + 80, y, "0.0000"));
- y += 30;
+ add_subwindow(light = new BC_Title(x +
xs
80, y, "0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Gamma G:")));
add_subwindow(new BC_Title(x, y, _("Gamma G:")));
- add_subwindow(gamma_g = new BC_Title(x + 80, y, "0.0000"));
- y += 30;
+ add_subwindow(gamma_g = new BC_Title(x +
xs
80, y, "0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Gamma B:")));
add_subwindow(new BC_Title(x, y, _("Gamma B:")));
- add_subwindow(gamma_b = new BC_Title(x + 80, y, "0.0000"));
- y += 30;
+ add_subwindow(gamma_b = new BC_Title(x +
xs
80, y, "0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Contrast:")));
add_subwindow(new BC_Title(x, y, _("Contrast:")));
- add_subwindow(coef1 = new BC_Title(x + 80, y, "0.0000"));
- y += 30;
+ add_subwindow(coef1 = new BC_Title(x +
xs
80, y, "0.0000"));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Brightness:")));
add_subwindow(new BC_Title(x, y, _("Brightness:")));
- add_subwindow(coef2 = new BC_Title(x + 80, y, "0.0000"));
- y += 30;
+ add_subwindow(coef2 = new BC_Title(x +
xs
80, y, "0.0000"));
+ y +=
ys
30;
add_subwindow(lock = new C41Button(plugin, this, x, y));
add_subwindow(lock = new C41Button(plugin, this, x, y));
- y += 30;
+ y +=
ys
30;
#define BOX_COL 120
add_subwindow(new BC_Title(x, y, _("Box col:")));
#define BOX_COL 120
add_subwindow(new BC_Title(x, y, _("Box col:")));
- add_subwindow(box_col_min = new BC_Title(x + 80, y, "0"));
+ add_subwindow(box_col_min = new BC_Title(x +
xs
80, y, "0"));
add_subwindow(box_col_max = new BC_Title(x + BOX_COL, y, "0"));
add_subwindow(box_col_max = new BC_Title(x + BOX_COL, y, "0"));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Box row:")));
add_subwindow(new BC_Title(x, y, _("Box row:")));
- add_subwindow(box_row_min = new BC_Title(x + 80, y, "0"));
+ add_subwindow(box_row_min = new BC_Title(x +
xs
80, y, "0"));
add_subwindow(box_row_max = new BC_Title(x + BOX_COL, y, "0"));
add_subwindow(box_row_max = new BC_Title(x + BOX_COL, y, "0"));
- y += 30;
+ y +=
ys
30;
add_subwindow(boxlock = new C41BoxButton(plugin, this, x, y));
add_subwindow(boxlock = new C41BoxButton(plugin, this, x, y));
- y = 10;
- x =
250
;
+ y =
ys
10;
+ x =
xS(250)
;
add_subwindow(show_box = new C41Enable(plugin,
&plugin->config.show_box, x, y, _("Show active area")));
add_subwindow(show_box = new C41Enable(plugin,
&plugin->config.show_box, x, y, _("Show active area")));
- y += 40;
+ y +=
ys
40;
add_subwindow(postproc = new C41Enable(plugin,
&plugin->config.postproc, x, y, _("Postprocess")));
add_subwindow(postproc = new C41Enable(plugin,
&plugin->config.postproc, x, y, _("Postprocess")));
- y += 60;
+ y +=
ys
60;
add_subwindow(new BC_Title(x, y, _("negfix values to apply:")));
add_subwindow(new BC_Title(x, y, _("negfix values to apply:")));
- y += 30;
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min R:")));
add_subwindow(fix_min_r = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Min R:")));
add_subwindow(fix_min_r = new C41TextBox(plugin,
- &plugin->config.fix_min_r, x + 80, y));
- y += 30;
+ &plugin->config.fix_min_r, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min G:")));
add_subwindow(fix_min_g = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Min G:")));
add_subwindow(fix_min_g = new C41TextBox(plugin,
- &plugin->config.fix_min_g, x + 80, y));
- y += 30;
+ &plugin->config.fix_min_g, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Min B:")));
add_subwindow(fix_min_b = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Min B:")));
add_subwindow(fix_min_b = new C41TextBox(plugin,
- &plugin->config.fix_min_b, x + 80, y));
- y += 30;
+ &plugin->config.fix_min_b, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Light:")));
add_subwindow(fix_light = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Light:")));
add_subwindow(fix_light = new C41TextBox(plugin,
- &plugin->config.fix_light, x + 80, y));
- y += 30;
+ &plugin->config.fix_light, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Gamma G:")));
add_subwindow(fix_gamma_g = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Gamma G:")));
add_subwindow(fix_gamma_g = new C41TextBox(plugin,
- &plugin->config.fix_gamma_g, x + 80, y));
- y += 30;
+ &plugin->config.fix_gamma_g, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Gamma B:")));
add_subwindow(fix_gamma_b = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Gamma B:")));
add_subwindow(fix_gamma_b = new C41TextBox(plugin,
- &plugin->config.fix_gamma_b, x + 80, y));
- y += 30;
+ &plugin->config.fix_gamma_b, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Contrast:")));
add_subwindow(fix_coef1 = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Contrast:")));
add_subwindow(fix_coef1 = new C41TextBox(plugin,
- &plugin->config.fix_coef1, x + 80, y));
- y += 30;
+ &plugin->config.fix_coef1, x +
xs
80, y));
+ y +=
ys
30;
add_subwindow(new BC_Title(x, y, _("Brightness:")));
add_subwindow(fix_coef2 = new C41TextBox(plugin,
add_subwindow(new BC_Title(x, y, _("Brightness:")));
add_subwindow(fix_coef2 = new C41TextBox(plugin,
- &plugin->config.fix_coef2, x + 80, y));
- y += 30;
+ &plugin->config.fix_coef2, x +
xs
80, y));
+ y +=
ys
30;
- x += 40;
- add_subwindow(new BC_Title(x - 40, y, _("Col:")));
+ x +=
xs
40;
+ add_subwindow(new BC_Title(x -
xs
40, y, _("Col:")));
add_subwindow(min_col = new C41Slider(plugin,
&plugin->config.min_col, x, y, 0));
add_subwindow(min_col = new C41Slider(plugin,
&plugin->config.min_col, x, y, 0));
- y += 25;
+ y +=
ys
25;
add_subwindow(max_col = new C41Slider(plugin,
&plugin->config.max_col, x, y, 0));
add_subwindow(max_col = new C41Slider(plugin,
&plugin->config.max_col, x, y, 0));
- y += 25;
+ y +=
ys
25;
- add_subwindow(new BC_Title(x - 40, y, _("Row:")));
+ add_subwindow(new BC_Title(x -
xs
40, y, _("Row:")));
add_subwindow(min_row = new C41Slider(plugin,
&plugin->config.min_row, x, y, 1));
add_subwindow(min_row = new C41Slider(plugin,
&plugin->config.min_row, x, y, 1));
- y += 25;
+ y +=
ys
25;
add_subwindow(max_row = new C41Slider(plugin,
&plugin->config.max_row, x, y, 1));
add_subwindow(max_row = new C41Slider(plugin,
&plugin->config.max_row, x, y, 1));
- y += 25;
+ y +=
ys
25;
update_magic();
show_window(1);
update_magic();
show_window(1);
@@
-802,7
+805,7
@@
int C41Effect::process_realtime(VFrame *input, VFrame *output)
}
if( config.show_box ) {
}
if( config.show_box ) {
- EDLSession *session = get_edl
session()
;
+ EDLSession *session = get_edl
()->session
;
int line_w = bmax(session->output_w,session->output_h) / 600 + 1;
for( int k=0; k<line_w; ++k ) {
float **rows = (float **)frame->get_rows();
int line_w = bmax(session->output_w,session->output_h) / 600 + 1;
for( int k=0; k<line_w; ++k ) {
float **rows = (float **)frame->get_rows();