projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bdd6708
)
hard edges rework, add hard edge in gwdw, config.ac nv/cuda tweaks, message log warn...
author
Good Guy
<good1.2guy@gmail.com>
Thu, 20 Jun 2019 22:54:10 +0000
(16:54 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Thu, 20 Jun 2019 22:54:10 +0000
(16:54 -0600)
39 files changed:
cinelerra-5.1/cinelerra/autoconf.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/autoconf.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/automation.inc
patch
|
blob
|
history
cinelerra-5.1/cinelerra/edits.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/gwindowgui.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/gwindowgui.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/mainerror.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/performanceprefs.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/shbtnprefs.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/shbtnprefs.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/shbtnprefs.inc
patch
|
blob
|
history
cinelerra-5.1/cinelerra/theme.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/theme.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/trackcanvas.C
patch
|
blob
|
history
cinelerra-5.1/configure.ac
patch
|
blob
|
history
cinelerra-5.1/guicast/bctextbox.C
patch
|
blob
|
history
cinelerra-5.1/guicast/bctextbox.h
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_blond/blondtheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_blond/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_blond_cv/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_blue/bluetheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_blue/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_blue_dot/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_bright/brighttheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_bright/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_cakewalk/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_hulk/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_neophyte/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_pinklady/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_suv/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_suv/suv.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_unflat/data/hardedge.png
[new file with mode: 0644]
patch
|
blob
cinelerra-5.1/plugins/theme_unflat/unflattheme.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/autoconf.C
b/cinelerra-5.1/cinelerra/autoconf.C
index 6b5e8d7c08cdb8bf966baf284c1fe95d01df111f..b434d990c259ffcf9ceb6ed34998f6a042dabb72 100644
(file)
--- a/
cinelerra-5.1/cinelerra/autoconf.C
+++ b/
cinelerra-5.1/cinelerra/autoconf.C
@@
-64,6
+64,7
@@
int AutoConf::load_defaults(BC_Hash* defaults)
}
transitions = defaults->get("SHOW_TRANSITIONS", 1);
plugins = defaults->get("SHOW_PLUGINS", 1);
}
transitions = defaults->get("SHOW_TRANSITIONS", 1);
plugins = defaults->get("SHOW_PLUGINS", 1);
+ hard_edges = defaults->get("SHOW_HARD_EDGES", 1);
return 0;
}
return 0;
}
@@
-75,6
+76,7
@@
void AutoConf::load_xml(FileXML *file)
}
transitions = file->tag.get_property("SHOW_TRANSITIONS", 1);
plugins = file->tag.get_property("SHOW_PLUGINS", 1);
}
transitions = file->tag.get_property("SHOW_TRANSITIONS", 1);
plugins = file->tag.get_property("SHOW_PLUGINS", 1);
+ hard_edges = file->tag.get_property("SHOW_HARD_EDGES", 1);
}
int AutoConf::save_defaults(BC_Hash* defaults)
}
int AutoConf::save_defaults(BC_Hash* defaults)
@@
-85,27
+87,28
@@
int AutoConf::save_defaults(BC_Hash* defaults)
}
defaults->update("SHOW_TRANSITIONS", transitions);
defaults->update("SHOW_PLUGINS", plugins);
}
defaults->update("SHOW_TRANSITIONS", transitions);
defaults->update("SHOW_PLUGINS", plugins);
+ defaults->update("SHOW_HARD_EDGES", hard_edges);
return 0;
}
void AutoConf::save_xml(FileXML *file)
{
return 0;
}
void AutoConf::save_xml(FileXML *file)
{
- for(int i = 0; i < AUTOMATION_TOTAL; i++)
- {
+ for(int i = 0; i < AUTOMATION_TOTAL; i++) {
file->tag.set_property(xml_titles[i], autos[i]);
}
file->tag.set_property("SHOW_TRANSITIONS", transitions);
file->tag.set_property("SHOW_PLUGINS", plugins);
file->tag.set_property(xml_titles[i], autos[i]);
}
file->tag.set_property("SHOW_TRANSITIONS", transitions);
file->tag.set_property("SHOW_PLUGINS", plugins);
+ file->tag.set_property("SHOW_HARD_EDGES", hard_edges);
}
int AutoConf::set_all(int value)
{
}
int AutoConf::set_all(int value)
{
- for(int i = 0; i < AUTOMATION_TOTAL; i++)
- {
+ for(int i = 0; i < AUTOMATION_TOTAL; i++) {
autos[i] = value;
}
transitions = value;
plugins = value;
autos[i] = value;
}
transitions = value;
plugins = value;
+ hard_edges = value;
return 0;
}
return 0;
}
@@
-117,12
+120,12
@@
AutoConf& AutoConf::operator=(AutoConf &that)
void AutoConf::copy_from(AutoConf *src)
{
void AutoConf::copy_from(AutoConf *src)
{
- for(int i = 0; i < AUTOMATION_TOTAL; i++)
- {
+ for(int i = 0; i < AUTOMATION_TOTAL; i++) {
autos[i] = src->autos[i];
}
transitions = src->transitions;
plugins = src->plugins;
autos[i] = src->autos[i];
}
transitions = src->transitions;
plugins = src->plugins;
+ hard_edges = src->hard_edges;
}
}
diff --git
a/cinelerra-5.1/cinelerra/autoconf.h
b/cinelerra-5.1/cinelerra/autoconf.h
index e5f38341ebdd40ba55fd390b7c6ac31aeedb3fa5..2395a191a4f2b46db0ca3629cc3bb602f4f220e8 100644
(file)
--- a/
cinelerra-5.1/cinelerra/autoconf.h
+++ b/
cinelerra-5.1/cinelerra/autoconf.h
@@
-51,6
+51,7
@@
public:
// Other viewable things
int transitions;
int plugins;
// Other viewable things
int transitions;
int plugins;
+ int hard_edges;
};
#endif
};
#endif
diff --git
a/cinelerra-5.1/cinelerra/automation.inc
b/cinelerra-5.1/cinelerra/automation.inc
index 98ba2b00d2d821ed7e01d72a0537c9f3c98d3f66..f573c3ecce2d48b64a8c2dc4cfd2860de972676e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/automation.inc
+++ b/
cinelerra-5.1/cinelerra/automation.inc
@@
-54,6
+54,7
@@
enum
NON_AUTOMATION_TITLES,
NON_AUTOMATION_TRANSITIONS,
NON_AUTOMATION_PLUGIN_AUTOS,
NON_AUTOMATION_TITLES,
NON_AUTOMATION_TRANSITIONS,
NON_AUTOMATION_PLUGIN_AUTOS,
+ NON_AUTOMATION_HARD_EDGES,
NON_AUTOMATION_TOTAL
};
NON_AUTOMATION_TOTAL
};
diff --git
a/cinelerra-5.1/cinelerra/edits.C
b/cinelerra-5.1/cinelerra/edits.C
index ae7ab0c7d3ef8edf15119a71aeaa3728dc8a3e76..74bd416446c00ce6e072e87dc1e94d9807db0eef 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edits.C
+++ b/
cinelerra-5.1/cinelerra/edits.C
@@
-223,9
+223,7
@@
Edit* Edits::insert_new_edit(int64_t position)
//printf("Edits::insert_new_edit 1\n");
Edit *new_edit = create_edit();
//printf("Edits::insert_new_edit 1\n");
Edit *new_edit = create_edit();
- if( current ) new_edit->hard_right = current->hard_left;
if( current ) current = PREVIOUS;
if( current ) current = PREVIOUS;
- if( current ) new_edit->hard_left = current->hard_right;
//printf("Edits::insert_new_edit 1\n");
insert_after(current, new_edit);
new_edit->startproject = position;
//printf("Edits::insert_new_edit 1\n");
insert_after(current, new_edit);
new_edit->startproject = position;
@@
-247,6
+245,14
@@
Edit* Edits::split_edit(int64_t position)
new_edit->copy_from(edit);
new_edit->length = new_edit->startproject + new_edit->length - position;
edit->length = position - edit->startproject;
new_edit->copy_from(edit);
new_edit->length = new_edit->startproject + new_edit->length - position;
edit->length = position - edit->startproject;
+ if( !new_edit->length )
+ new_edit->hard_left = new_edit->hard_right = 0;
+ else if( !edit->length )
+ edit->hard_left = edit->hard_right = 0;
+ else {
+ new_edit->hard_right = edit->hard_right;
+ new_edit->hard_left = edit->hard_right = 0;
+ }
new_edit->startproject = position;
new_edit->startsource += edit->length;
new_edit->startproject = position;
new_edit->startsource += edit->length;
@@
-367,13
+373,19
@@
int Edits::optimize()
// delete 0 length edits
for( current = first; !result && current; ) {
// delete 0 length edits
for( current = first; !result && current; ) {
- Edit* next = current->next;
+ Edit*
prev = current->previous, *
next = current->next;
if( current->length == 0 ) {
if( next && current->transition && !next->transition) {
next->transition = current->transition;
next->transition->edit = next;
current->transition = 0;
}
if( current->length == 0 ) {
if( next && current->transition && !next->transition) {
next->transition = current->transition;
next->transition->edit = next;
current->transition = 0;
}
+ if( !current->silence() ) {
+ if( current->hard_left && next && !next->silence() )
+ next->hard_left = 1;
+ if( current->hard_right && prev && !prev->silence())
+ prev->hard_right = 1;
+ }
delete current;
result = 1;
break;
delete current;
result = 1;
break;
@@
-394,7
+406,8
@@
int Edits::optimize()
Edit *next_edit = 0;
for( ; current && (next_edit=current->next); current=NEXT ) {
// both edges are not hard edges
Edit *next_edit = 0;
for( ; current && (next_edit=current->next); current=NEXT ) {
// both edges are not hard edges
- if( current->hard_right || next_edit->hard_left ) continue;
+ if( current->hard_right || next_edit->hard_left )
+ continue;
// next edit is a glitch
if( is_glitch(next_edit) )
break;
// next edit is a glitch
if( is_glitch(next_edit) )
break;
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.C
b/cinelerra-5.1/cinelerra/gwindowgui.C
index 81520f018ac0fe1e23ce3eebb2c48c2a2a86ed47..f90a387815add0beaf2a066a44ae59f8059f5d78 100644
(file)
--- a/
cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/gwindowgui.C
@@
-63,6
+63,7
@@
const char *GWindowGUI::non_auto_text[NON_AUTOMATION_TOTAL] =
N_("Titles"),
N_("Transitions"),
N_("Plugin Keyframes"),
N_("Titles"),
N_("Transitions"),
N_("Plugin Keyframes"),
+ N_("Hard Edges"),
};
const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] =
};
const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] =
@@
-138,6
+139,7
@@
static toggleinfo toggle_order[] =
{1, AUTOMATION_MODE},
{1, AUTOMATION_PAN},
{1, AUTOMATION_MASK},
{1, AUTOMATION_MODE},
{1, AUTOMATION_PAN},
{1, AUTOMATION_MASK},
+ {-1, NON_AUTOMATION_HARD_EDGES},
{0, -1}, // bar
{1, AUTOMATION_CAMERA_X},
{1, AUTOMATION_CAMERA_Y},
{0, -1}, // bar
{1, AUTOMATION_CAMERA_X},
{1, AUTOMATION_CAMERA_Y},
@@
-154,7
+156,14
@@
const char *GWindowGUI::toggle_text(toggleinfo *tp)
{
if( tp->isauto > 0 ) return _(auto_text[tp->ref]);
if( !tp->isauto ) return _(non_auto_text[tp->ref]);
{
if( tp->isauto > 0 ) return _(auto_text[tp->ref]);
if( !tp->isauto ) return _(non_auto_text[tp->ref]);
- return _("XYZ");
+ switch( tp->ref ) {
+ case NONAUTOTOGGLES_CAMERA_XYZ:
+ case NONAUTOTOGGLES_PROJECTOR_XYZ:
+ return _("XYZ");
+ case NON_AUTOMATION_HARD_EDGES:
+ return _("Hard Edges");
+ }
+ return "()";
}
void GWindowGUI::calculate_extents(BC_WindowBase *gui, int *w, int *h)
}
void GWindowGUI::calculate_extents(BC_WindowBase *gui, int *w, int *h)
@@
-263,7
+272,7
@@
void GWindowGUI::create_objects()
else
draw_vframe(vframe, get_w()-vframe->get_w()-10, y);
}
else
draw_vframe(vframe, get_w()-vframe->get_w()-10, y);
}
- else
if( tp->isauto < 0 )
{
+ else {
const char *accel = 0;
switch( ref ) {
case NONAUTOTOGGLES_CAMERA_XYZ:
const char *accel = 0;
switch( ref ) {
case NONAUTOTOGGLES_CAMERA_XYZ:
@@
-274,6
+283,11
@@
void GWindowGUI::create_objects()
projector_xyz = toggle;
accel = _("Shift-F2");
break;
projector_xyz = toggle;
accel = _("Shift-F2");
break;
+ case NON_AUTOMATION_HARD_EDGES:
+ VFrame *vframe = mwindow->theme->hardedge_data;
+ draw_vframe(vframe, get_w()-vframe->get_w()-10, y);
+ hard_edges = toggle;
+ break;
}
if( accel ) {
int x1 = get_w() - BC_Title::calculate_w(this, accel) - 10;
}
if( accel ) {
int x1 = get_w() - BC_Title::calculate_w(this, accel) - 10;
@@
-412,13
+426,12
@@
int* GWindowGUI::get_main_value(toggleinfo *info)
{
if( info->isauto > 0 )
return &mwindow->edl->session->auto_conf->autos[info->ref];
{
if( info->isauto > 0 )
return &mwindow->edl->session->auto_conf->autos[info->ref];
- if( !info->isauto ) {
- switch( info->ref ) {
- case NON_AUTOMATION_ASSETS: return &mwindow->edl->session->show_assets;
- case NON_AUTOMATION_TITLES: return &mwindow->edl->session->show_titles;
- case NON_AUTOMATION_TRANSITIONS: return &mwindow->edl->session->auto_conf->transitions;
- case NON_AUTOMATION_PLUGIN_AUTOS: return &mwindow->edl->session->auto_conf->plugins;
- }
+ switch( info->ref ) {
+ case NON_AUTOMATION_ASSETS: return &mwindow->edl->session->show_assets;
+ case NON_AUTOMATION_TITLES: return &mwindow->edl->session->show_titles;
+ case NON_AUTOMATION_TRANSITIONS: return &mwindow->edl->session->auto_conf->transitions;
+ case NON_AUTOMATION_PLUGIN_AUTOS: return &mwindow->edl->session->auto_conf->plugins;
+ case NON_AUTOMATION_HARD_EDGES: return &mwindow->edl->session->auto_conf->hard_edges;
}
return 0;
}
}
return 0;
}
@@
-477,6
+490,7
@@
int GWindowToggle::handle_event()
switch( info->ref ) {
case NONAUTOTOGGLES_CAMERA_XYZ: group = AUTOMATION_CAMERA_X; break;
case NONAUTOTOGGLES_PROJECTOR_XYZ: group = AUTOMATION_PROJECTOR_X; break;
switch( info->ref ) {
case NONAUTOTOGGLES_CAMERA_XYZ: group = AUTOMATION_CAMERA_X; break;
case NONAUTOTOGGLES_PROJECTOR_XYZ: group = AUTOMATION_PROJECTOR_X; break;
+ case NON_AUTOMATION_HARD_EDGES: *gui->get_main_value(info) = value; break;
}
if( group >= 0 ) {
gui->xyz_check(group, value);
}
if( group >= 0 ) {
gui->xyz_check(group, value);
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.h
b/cinelerra-5.1/cinelerra/gwindowgui.h
index 302417cfa0fb2227f4993d129f8b8816862d75e1..6490c851c4ff3f2f713a017ff6ed00453134fb63 100644
(file)
--- a/
cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/
cinelerra-5.1/cinelerra/gwindowgui.h
@@
-34,6
+34,7
@@
enum {
NONAUTOTOGGLES_TITLES,
NONAUTOTOGGLES_TRANSITIONS,
NONAUTOTOGGLES_PLUGIN_AUTOS,
NONAUTOTOGGLES_TITLES,
NONAUTOTOGGLES_TRANSITIONS,
NONAUTOTOGGLES_PLUGIN_AUTOS,
+ NONAUTOTOGGLES_HARD_EDGES,
NONAUTOTOGGLES_CAMERA_XYZ,
NONAUTOTOGGLES_PROJECTOR_XYZ,
NONAUTOTOGGLES_BAR1,
NONAUTOTOGGLES_CAMERA_XYZ,
NONAUTOTOGGLES_PROJECTOR_XYZ,
NONAUTOTOGGLES_BAR1,
@@
-77,7
+78,7
@@
public:
MWindow *mwindow;
GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
MWindow *mwindow;
GWindowToggle *toggles[NONAUTOTOGGLES_COUNT + AUTOMATION_TOTAL];
- GWindowToggle *camera_xyz, *projector_xyz;
+ GWindowToggle *camera_xyz, *projector_xyz
, *hard_edges
;
};
class GWindowToggle : public BC_CheckBox
};
class GWindowToggle : public BC_CheckBox
diff --git
a/cinelerra-5.1/cinelerra/mainerror.C
b/cinelerra-5.1/cinelerra/mainerror.C
index 4fdc592f49bd00cea67db480960150ef84236548..c82d23a3662379cdb61d998f263e9b7f56bacc6d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainerror.C
+++ b/
cinelerra-5.1/cinelerra/mainerror.C
@@
-40,7
+40,7
@@
MainError* MainError::main_error = 0;
MainErrorGUI::MainErrorGUI(MWindow *mwindow, MainError *thread, int x, int y)
MainErrorGUI::MainErrorGUI(MWindow *mwindow, MainError *thread, int x, int y)
- : BC_Window(_(PROGRAM_NAME ":
Error
s"),
+ : BC_Window(_(PROGRAM_NAME ":
Message
s"),
x,
y,
mwindow->session->ewindow_w,
x,
y,
mwindow->session->ewindow_w,
@@
-68,7
+68,7
@@
void MainErrorGUI::create_objects()
BC_Button *button;
add_subwindow(button = new BC_OKButton(this));
int x = 10, y = 10;
BC_Button *button;
add_subwindow(button = new BC_OKButton(this));
int x = 10, y = 10;
- add_subwindow(title = new BC_Title(x, y, _("
The following errors occurred
:")));
+ add_subwindow(title = new BC_Title(x, y, _("
Message log
:")));
y += title->get_h() + 5;
add_subwindow(list = new BC_ListBox(x, y,
get_w() - 20, button->get_y() - y - 5,
y += title->get_h() + 5;
add_subwindow(list = new BC_ListBox(x, y,
get_w() - 20, button->get_y() - y - 5,
diff --git
a/cinelerra-5.1/cinelerra/performanceprefs.C
b/cinelerra-5.1/cinelerra/performanceprefs.C
index cb19f905672c1664f54e5e52edcbf78b93b2f5f0..c00ca7324229154137a65d500027cc5744e04a42 100644
(file)
--- a/
cinelerra-5.1/cinelerra/performanceprefs.C
+++ b/
cinelerra-5.1/cinelerra/performanceprefs.C
@@
-332,10
+332,19
@@
PrefsUseHWDev::PrefsUseHWDev(PreferencesWindow *pwindow,
void PrefsUseHWDev::create_objects()
{
BC_PopupTextBox::create_objects();
void PrefsUseHWDev::create_objects()
{
BC_PopupTextBox::create_objects();
+ set_tooltip(_("vdpau - Nvidia, Nouveau, Amdgpu\n"
+ "vaapi - Broadcom, Intel HD graphics, Radeon\n"
+ "cuda - Nvidia + Cuda SDK"));
hw_dev_names.append(new BC_ListBoxItem(_("none")));
hw_dev_names.append(new BC_ListBoxItem(_("none")));
+#ifdef HAVE_VAAPI
hw_dev_names.append(new BC_ListBoxItem("vaapi"));
hw_dev_names.append(new BC_ListBoxItem("vaapi"));
+#endif
+#ifdef HAVE_VDPAU
hw_dev_names.append(new BC_ListBoxItem("vdpau"));
hw_dev_names.append(new BC_ListBoxItem("vdpau"));
- hw_dev_names.append(new BC_ListBoxItem(""));
+#endif
+#ifdef HAVE_NV
+ hw_dev_names.append(new BC_ListBoxItem("cuda"));
+#endif
update_list(&hw_dev_names);
update(&pwindow->thread->preferences->use_hw_dev[0]);
}
update_list(&hw_dev_names);
update(&pwindow->thread->preferences->use_hw_dev[0]);
}
diff --git
a/cinelerra-5.1/cinelerra/shbtnprefs.C
b/cinelerra-5.1/cinelerra/shbtnprefs.C
index 2945c0353b71d347b5ac9bbf3d2ef7fcd8ac4c4c..679d16f447040dc9ed5e541122e50dcf4a48e970 100644
(file)
--- a/
cinelerra-5.1/cinelerra/shbtnprefs.C
+++ b/
cinelerra-5.1/cinelerra/shbtnprefs.C
@@
-43,17
+43,22
@@
void ShBtnRun::run()
perror("fork");
return;
}
perror("fork");
return;
}
- if( pid > 0 ) {
- int stat; waitpid(pid, &stat, 0);
- if( warn && stat ) {
- char msg[BCTEXTLEN];
- sprintf(msg, "%s: error exit status %d", name, stat);
- MainError::show_error(msg);
- }
+ char msg[BCTEXTLEN];
+ if( !pid ) {
+ argv.append(0);
+ execvp(argv[0], &argv[0]);
return;
}
return;
}
- argv.append(0);
- execvp(argv[0], &argv[0]);
+ // warn <0:always, =0:never, >0:on err
+ if( !warn ) return;
+ int stat; waitpid(pid, &stat, 0);
+ if( !stat ) {
+ if( warn > 0 ) return;
+ sprintf(msg, "%s: completed", name);
+ }
+ else
+ sprintf(msg, "%s: error exit status %d", name, stat);
+ MainError::show_error(msg);
}
ShBtnPref::ShBtnPref(const char *nm, const char *cmds, int warn, int run_script)
}
ShBtnPref::ShBtnPref(const char *nm, const char *cmds, int warn, int run_script)
@@
-223,15
+228,43
@@
ShBtnTextWindow::~ShBtnTextWindow()
{
}
{
}
+
+ShBtnErrWarnItem::ShBtnErrWarnItem(ShBtnErrWarn *popup,
+ const char *text, int warn)
+ : BC_MenuItem(text)
+{
+ this->popup = popup;
+ this->warn = warn;
+}
+
+int ShBtnErrWarnItem::handle_event()
+{
+ popup->set_text(get_text());
+ popup->st_window->warn = warn;
+ return 1;
+}
+
ShBtnErrWarn::ShBtnErrWarn(ShBtnTextWindow *st_window, int x, int y)
ShBtnErrWarn::ShBtnErrWarn(ShBtnTextWindow *st_window, int x, int y)
- : BC_CheckBox(x, y, &st_window->warn, _("Warn on err exit"))
+ : BC_PopupMenu(x, y, 120, st_window->warn < 0 ? _("Always"):
+ !st_window->warn ? _("Never") : _("On Error"))
{
this->st_window = st_window;
}
{
this->st_window = st_window;
}
-
ShBtnErrWarn::~ShBtnErrWarn()
{
}
ShBtnErrWarn::~ShBtnErrWarn()
{
}
+int ShBtnErrWarn::handle_event()
+{
+ return 0;
+}
+
+void ShBtnErrWarn::create_objects()
+{
+ add_item(new ShBtnErrWarnItem(this,_("Always"), -1));
+ add_item(new ShBtnErrWarnItem(this,_("Never"), 0));
+ add_item(new ShBtnErrWarnItem(this,_("On Error"), 1));
+}
+
ShBtnRunScript::ShBtnRunScript(ShBtnTextWindow *st_window, int x, int y)
: BC_CheckBox(x, y, &st_window->run_script, _("run /path/script.sh + argvs"))
ShBtnRunScript::ShBtnRunScript(ShBtnTextWindow *st_window, int x, int y)
: BC_CheckBox(x, y, &st_window->run_script, _("run /path/script.sh + argvs"))
@@
-259,7
+292,10
@@
void ShBtnTextWindow::create_objects()
cmd_text = new BC_ScrollTextBox(this, x1, y, get_w()-x1-20, 4, pref->commands);
cmd_text->create_objects();
y += cmd_text->get_h() + 16;
cmd_text = new BC_ScrollTextBox(this, x1, y, get_w()-x1-20, 4, pref->commands);
cmd_text->create_objects();
y += cmd_text->get_h() + 16;
+ add_subwindow(title = new BC_Title(x1,y, _("OnExit Notify:")));
+ x1 += title->get_w() + 10;
add_subwindow(st_err_warn = new ShBtnErrWarn(this, x1, y));
add_subwindow(st_err_warn = new ShBtnErrWarn(this, x1, y));
+ st_err_warn->create_objects();
x1 += st_err_warn->get_w() + 20;
add_subwindow(st_run_script = new ShBtnRunScript(this, x1, y));
y = get_h() - ShBtnTextOK::calculate_h() - 10;
x1 += st_err_warn->get_w() + 20;
add_subwindow(st_run_script = new ShBtnRunScript(this, x1, y));
y = get_h() - ShBtnTextOK::calculate_h() - 10;
diff --git
a/cinelerra-5.1/cinelerra/shbtnprefs.h
b/cinelerra-5.1/cinelerra/shbtnprefs.h
index 360222051899c6465a0a5275314c1a8c88f82ccc..de7050d3dead177506d150b155417c059e01a64b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/shbtnprefs.h
+++ b/
cinelerra-5.1/cinelerra/shbtnprefs.h
@@
-107,12
+107,26
@@
public:
~ShBtnTextOK();
};
~ShBtnTextOK();
};
-class ShBtnErrWarn : public BC_CheckBox
+class ShBtnErrWarnItem : public BC_MenuItem
+{
+public:
+ ShBtnErrWarnItem(ShBtnErrWarn *popup, const char *text, int warn);
+ ShBtnErrWarnItem();
+ int handle_event();
+
+ ShBtnErrWarn *popup;
+ int warn;
+};
+
+class ShBtnErrWarn : public BC_PopupMenu
{
public:
ShBtnErrWarn(ShBtnTextWindow *st_window, int x, int y);
~ShBtnErrWarn();
{
public:
ShBtnErrWarn(ShBtnTextWindow *st_window, int x, int y);
~ShBtnErrWarn();
+ void create_objects();
+ int handle_event();
+
ShBtnTextWindow *st_window;
};
ShBtnTextWindow *st_window;
};
diff --git
a/cinelerra-5.1/cinelerra/shbtnprefs.inc
b/cinelerra-5.1/cinelerra/shbtnprefs.inc
index 1ce40933320ed4433c26b556fe5dea5f1a48ce05..ed626105581af38b72946fe7722b28d4f72f9003 100644
(file)
--- a/
cinelerra-5.1/cinelerra/shbtnprefs.inc
+++ b/
cinelerra-5.1/cinelerra/shbtnprefs.inc
@@
-9,6
+9,7
@@
class ShBtnDelButton;
class ShBtnEditButton;
class ShBtnTextDialog;
class ShBtnTextOK;
class ShBtnEditButton;
class ShBtnTextDialog;
class ShBtnTextOK;
+class ShBtnErrWarnItem;
class ShBtnErrWarn;
class ShBtnTextWindow;
class ShBtnPrefItem;
class ShBtnErrWarn;
class ShBtnTextWindow;
class ShBtnPrefItem;
diff --git
a/cinelerra-5.1/cinelerra/theme.C
b/cinelerra-5.1/cinelerra/theme.C
index 3b5de9539a5891d058cc1f892655729a37776500..4141f08fabc7c6449d06a1eac23430cc83dd441d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/theme.C
+++ b/
cinelerra-5.1/cinelerra/theme.C
@@
-140,6
+140,7
@@
Theme::Theme()
lift_data = 0;
maskkeyframe_data = 0;
modekeyframe_data = 0;
lift_data = 0;
maskkeyframe_data = 0;
modekeyframe_data = 0;
+ hardedge_data = 0;
movedn_data = 0;
moveup_data = 0;
newbin_data = 0;
movedn_data = 0;
moveup_data = 0;
newbin_data = 0;
diff --git
a/cinelerra-5.1/cinelerra/theme.h
b/cinelerra-5.1/cinelerra/theme.h
index 1845b8710d012483fff05fa496de687aa29ca9f0..7055ee153caa72a28c72b97e8d59cb9801ad26f6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/theme.h
+++ b/
cinelerra-5.1/cinelerra/theme.h
@@
-331,6
+331,7
@@
public:
VFrame **lift_data;
VFrame *maskkeyframe_data;
VFrame *modekeyframe_data;
VFrame **lift_data;
VFrame *maskkeyframe_data;
VFrame *modekeyframe_data;
+ VFrame *hardedge_data;
VFrame **movedn_data;
VFrame **moveup_data;
VFrame **newbin_data;
VFrame **movedn_data;
VFrame **moveup_data;
VFrame **newbin_data;
diff --git
a/cinelerra-5.1/cinelerra/trackcanvas.C
b/cinelerra-5.1/cinelerra/trackcanvas.C
index 7dbda4e139aee689e986394046e99e83e657bd77..3f526fd624200e7f53594847f7e26a4c72acc084 100644
(file)
--- a/
cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/
cinelerra-5.1/cinelerra/trackcanvas.C
@@
-1888,6
+1888,8
@@
void TrackCanvas::refresh_plugintoggles()
void TrackCanvas::draw_hard_edges()
{
void TrackCanvas::draw_hard_edges()
{
+ if( !mwindow->edl->session->auto_conf->hard_edges )
+ return;
int64_t x, y, w, h;
for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
int64_t x, y, w, h;
for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 574b0db28ce6fe5d4c6f0e94339331d933ee1dd1..77fe5cacd36f7089ed26dda758669331c40df8b6 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-867,7
+867,8
@@
if test "x$WANT_CIN_3RDPARTY" != "xno"; then
fi
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
fi
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
- COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB; do
+ COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB \
+ VAAPI VDPAU CUDA NV; do
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
diff --git
a/cinelerra-5.1/guicast/bctextbox.C
b/cinelerra-5.1/guicast/bctextbox.C
index 725bbfa56683a9d46bd41e3e0dcb1f444ff6029a..078134c011f6a0c8b595c762a83bf0e8783dd840 100644
(file)
--- a/
cinelerra-5.1/guicast/bctextbox.C
+++ b/
cinelerra-5.1/guicast/bctextbox.C
@@
-2626,6
+2626,11
@@
void BC_PopupTextBox::reposition_window(int x, int y)
// if(flush) parent_window->flush();
}
// if(flush) parent_window->flush();
}
+void BC_PopupTextBox::set_tooltip(const char *text)
+{
+ listbox->set_tooltip(text);
+}
+
BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
BC_TumbleTextBoxText::BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
diff --git
a/cinelerra-5.1/guicast/bctextbox.h
b/cinelerra-5.1/guicast/bctextbox.h
index fa569fa809a22f8b67572ea202d7bf1ccd15b8d7..d58605775b6d58090128c87cb65d1f264c36f48e 100644
(file)
--- a/
cinelerra-5.1/guicast/bctextbox.h
+++ b/
cinelerra-5.1/guicast/bctextbox.h
@@
-358,6
+358,7
@@
public:
int get_h();
int get_show_query();
void set_show_query(int v);
int get_h();
int get_show_query();
void set_show_query(int v);
+ void set_tooltip(const char *text);
void update(const char *text);
void update_list(ArrayList<BC_ListBoxItem*> *data);
void update(const char *text);
void update_list(ArrayList<BC_ListBoxItem*> *data);
diff --git
a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index da215d57ee23e51a041f0593e56aff3a9898cf57..37e2c39719149d3cb56405eb7b1951729104caa6 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/
cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@
-97,6
+97,7
@@
BlondTheme::~BlondTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-879,6
+880,7
@@
void BlondTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_blond/data/hardedge.png
b/cinelerra-5.1/plugins/theme_blond/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 246aab942fefdaec96cea1b4804a09c1f26e8174..6ab7a9e7745960aa91427be5a3fe4c279c1bb193 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/
cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@
-97,6
+97,7
@@
BlondCVTheme::~BlondCVTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-1189,6
+1190,7
@@
void BlondCVTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/hardedge.png
b/cinelerra-5.1/plugins/theme_blond_cv/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_blue/bluetheme.C
b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
index 63216e41ed6cd67713f861c9bbf3489f873374f1..ea43e59d6a02801d85cba1608799df4522aca0f2 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_blue/bluetheme.C
+++ b/
cinelerra-5.1/plugins/theme_blue/bluetheme.C
@@
-97,6
+97,7
@@
BlueDotTheme::~BlueDotTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-876,6
+877,7
@@
void BlueDotTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_blue/data/hardedge.png
b/cinelerra-5.1/plugins/theme_blue/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index 7d43a6983395df779f663851a332df36dcc6b728..e55d920bda50d4665d629f052588fd76680f47e2 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@
-100,6
+100,7
@@
BlueDotTheme::~BlueDotTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-1246,6
+1247,7
@@
void BlueDotTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/hardedge.png
b/cinelerra-5.1/plugins/theme_blue_dot/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 4a2735ef236cf07f296375dffaa51c42a74c289c..cd3acc9ccf78a8a02b3c0644c8bfc150652206e7 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/
cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@
-95,6
+95,7
@@
BrightTheme::~BrightTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-882,6
+883,7
@@
void BrightTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_bright/data/hardedge.png
b/cinelerra-5.1/plugins/theme_bright/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
index ac1f5159d61ce0ef1c006b94a8a7547bd04b6c52..b4170efda0c009fa8345ce5abd5b42d1ac0ce828 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/
cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@
-65,6
+65,7
@@
CAKEWALKTHEME::~CAKEWALKTHEME()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-997,6
+998,7
@@
void CAKEWALKTHEME::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/hardedge.png
b/cinelerra-5.1/plugins/theme_cakewalk/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/hardedge.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/hardedge.png
b/cinelerra-5.1/plugins/theme_hulk/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index 082b9654acf1237e48450caaa84bf4e2660ed2e9..8222d6dfd9f535b30013ebaae696ae371905653c 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/
cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@
-98,6
+98,7
@@
HULKTHEME::~HULKTHEME()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-881,6
+882,7
@@
void HULKTHEME::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hardedge.png
b/cinelerra-5.1/plugins/theme_neophyte/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index de9d59c0f59fd91c9d95b5b5febd056a47dc66e7..3d34c83709db398d32eb149f63fd3f895e434744 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@
-94,6
+94,7
@@
NEOPHYTETHEME::~NEOPHYTETHEME()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-1185,6
+1186,7
@@
void NEOPHYTETHEME::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/hardedge.png
b/cinelerra-5.1/plugins/theme_pinklady/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 671da39412031cceb0505efb979f982390aed46d..50017627df7207353beacc874888d4dcdbfd7572 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/
cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@
-83,6
+83,7
@@
PINKLADY::~PINKLADY()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-863,6
+864,7
@@
void PINKLADY::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_suv/data/hardedge.png
b/cinelerra-5.1/plugins/theme_suv/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_suv/suv.C
b/cinelerra-5.1/plugins/theme_suv/suv.C
index 3c6de6f28f9f0f049161a342c32d2d6443f9eb88..40ad35c4d34c4f1a8d24ee9438ccf9fcec0c8da0 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_suv/suv.C
+++ b/
cinelerra-5.1/plugins/theme_suv/suv.C
@@
-94,6
+94,7
@@
SUV::~SUV()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-876,6
+877,7
@@
void SUV::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/hardedge.png
b/cinelerra-5.1/plugins/theme_unflat/data/hardedge.png
new file mode 100644
(file)
index 0000000..
c3724eb
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/hardedge.png differ
diff --git
a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index def4469b58c5c3e41bbf3b8240c9fb8c88b86470..55a3dd049a8461937fed4be7cf5b1d28beef0f61 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/
cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@
-92,6
+92,7
@@
UNFLATTHEME::~UNFLATTHEME()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-872,6
+873,7
@@
void UNFLATTHEME::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}