projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drag+drop honours labels/plugins/autos, new drag icon, phantom keyframe fix
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
edit.C
diff --git
a/cinelerra-5.1/cinelerra/edit.C
b/cinelerra-5.1/cinelerra/edit.C
index e40b8c18924c5f1d712d620582b8c08240c062fe..20e8b93bff063052288fde2966e89733f5e97347 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-242,14
+242,13
@@
int Edit::silence()
asset || nested_edl :
*((SEdit *)this)->get_text()) ? 0 : 1;
}
asset || nested_edl :
*((SEdit *)this)->get_text()) ? 0 : 1;
}
-void Edit::mute()
+
+void Edit::set_selected(int v)
{
{
- if( track->data_type != TRACK_SUBTITLE ) {
- asset = 0;
- nested_edl = 0;
- }
+ if( group_id )
+ edl->tracks->set_group_selected(group_id, v);
else
else
-
*((SEdit *)this)->get_text() =
0;
+
is_selected = v >= 0 ? v : !is_selected ? 1 :
0;
}
void Edit::copy_from(Edit *edit)
}
void Edit::copy_from(Edit *edit)
@@
-389,7
+388,8
@@
int Edit::dump(FILE *fp)
asset,
asset ? asset->path : "");
fflush(fp);
asset,
asset ? asset->path : "");
fflush(fp);
- fprintf(fp," channel %d, color %08x, group_id %d\n", channel, color, group_id);
+ fprintf(fp," channel %d, color %08x, group_id %d, is_selected %d\n",
+ channel, color, group_id, is_selected);
if(transition)
{
fprintf(fp," TRANSITION %p\n", transition);
if(transition)
{
fprintf(fp," TRANSITION %p\n", transition);
@@
-406,7
+406,7
@@
int Edit::load_properties(FileXML *file, int64_t &startproject)
length = file->tag.get_property("LENGTH", (int64_t)0);
hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0);
hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0);
length = file->tag.get_property("LENGTH", (int64_t)0);
hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0);
hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0);
- color = file->tag.get_property("COLOR",
(int64_t)-1
);
+ color = file->tag.get_property("COLOR",
0
);
group_id = file->tag.get_property("GROUP_ID", group_id);
user_title[0] = 0;
file->tag.get_property("USER_TITLE", user_title);
group_id = file->tag.get_property("GROUP_ID", group_id);
user_title[0] = 0;
file->tag.get_property("USER_TITLE", user_title);