projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colorpicker upgrades, titler fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
render.C
diff --git
a/cinelerra-5.1/cinelerra/render.C
b/cinelerra-5.1/cinelerra/render.C
index 9010ac2939aa3dad6c7dd09afd86e245a0de0fbc..d6db3811469629a999d44d1889e91b66d1475673 100644
(file)
--- a/
cinelerra-5.1/cinelerra/render.C
+++ b/
cinelerra-5.1/cinelerra/render.C
@@
-294,7
+294,7
@@
void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
start_render();
}
else if( in_progress ) {
start_render();
}
else if( in_progress ) {
- ErrorBox error_box(
PROGRAM_NAME ": Error"
,
+ ErrorBox error_box(
_(PROGRAM_NAME ": Error")
,
mwindow->gui->get_abs_cursor_x(1),
mwindow->gui->get_abs_cursor_y(1));
error_box.create_objects("Already rendering");
mwindow->gui->get_abs_cursor_x(1),
mwindow->gui->get_abs_cursor_y(1));
error_box.create_objects("Already rendering");
@@
-330,20
+330,16
@@
BC_Window* Render::new_gui()
batch_cancelled = 0;
format_error = 0;
result = 0;
batch_cancelled = 0;
format_error = 0;
result = 0;
- completion->reset();
if(mode == Render::INTERACTIVE) {
// Fix the asset for rendering
if(!asset) asset = new Asset;
load_defaults(asset);
check_asset(mwindow->edl, *asset);
if(mode == Render::INTERACTIVE) {
// Fix the asset for rendering
if(!asset) asset = new Asset;
load_defaults(asset);
check_asset(mwindow->edl, *asset);
-
+ int px = mwindow->gui->get_pop_cursor_x(1);
+ int py = mwindow->gui->get_pop_cursor_y(1);
// Get format from user
// Get format from user
- render_window = new RenderWindow(mwindow,
- this,
- asset,
- mwindow->gui->get_abs_cursor_x(1),
- mwindow->gui->get_abs_cursor_y(1));
+ render_window = new RenderWindow(mwindow, this, asset, px, py);
render_window->create_objects();
}
render_window->create_objects();
}
@@
-529,6
+525,7
@@
void Render::start_render()
in_progress = 0;
elapsed_time = 0.0;
result = 0;
in_progress = 0;
elapsed_time = 0.0;
result = 0;
+ completion->reset();
thread->start();
}
thread->start();
}
@@
-1011,7
+1008,6
@@
if(debug) printf("Render::render %d\n", __LINE__);
render->packages = 0;
render->in_progress = 0;
render->packages = 0;
render->in_progress = 0;
- render->completion->unlock();
if(debug) printf("Render::render %d\n", __LINE__);
}
if(debug) printf("Render::render %d\n", __LINE__);
}
@@
-1096,6
+1092,7
@@
void RenderThread::run()
mwindow->batch_render->update_done(-1, 0, 0);
}
}
mwindow->batch_render->update_done(-1, 0, 0);
}
}
+ render->completion->unlock();
}
}
@@
-1108,10
+1105,8
@@
RenderWindow::RenderWindow(MWindow *mwindow,
Asset *asset,
int x,
int y)
Asset *asset,
int x,
int y)
- : BC_Window(_(PROGRAM_NAME ": Render"),
- x - WIDTH / 2, y - HEIGHT / 2,
- WIDTH, HEIGHT, WIDTH, HEIGHT,
- 0, 0, 1)
+ : BC_Window(_(PROGRAM_NAME ": Render"), x, y,
+ WIDTH, HEIGHT, WIDTH, HEIGHT, 0, 0, 1)
{
this->mwindow = mwindow;
this->render = render;
{
this->mwindow = mwindow;
this->render = render;