projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fast drag unselected edit, ctrl drag select in arrow mode
[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 489a96944de08a04aef3984e56014292344e73f9..40e7151a93aed99773d626f21e1ed999fe484412 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-86,6
+86,8
@@
void Edit::reset()
is_selected = 0;
hard_left = 0;
hard_right = 0;
is_selected = 0;
hard_left = 0;
hard_right = 0;
+ color = 0;
+ group_id = 0;
}
Indexable* Edit::get_source()
}
Indexable* Edit::get_source()
@@
-141,6
+143,8
@@
int Edit::copy(int64_t start,
file->tag.set_property("LENGTH", length_in_selection);
file->tag.set_property("HARD_LEFT", hard_left);
file->tag.set_property("HARD_RIGHT", hard_right);
file->tag.set_property("LENGTH", length_in_selection);
file->tag.set_property("HARD_LEFT", hard_left);
file->tag.set_property("HARD_RIGHT", hard_right);
+ file->tag.set_property("COLOR", color);
+ file->tag.set_property("GROUP_ID", group_id);
if(user_title[0]) file->tag.set_property("USER_TITLE", user_title);
//printf("Edit::copy 5\n");
if(user_title[0]) file->tag.set_property("USER_TITLE", user_title);
//printf("Edit::copy 5\n");
@@
-238,7
+242,23
@@
int Edit::silence()
asset || nested_edl :
*((SEdit *)this)->get_text()) ? 0 : 1;
}
asset || nested_edl :
*((SEdit *)this)->get_text()) ? 0 : 1;
}
+void Edit::mute()
+{
+ if( track->data_type != TRACK_SUBTITLE ) {
+ asset = 0;
+ nested_edl = 0;
+ }
+ else
+ *((SEdit *)this)->get_text() = 0;
+}
+void Edit::set_selected(int v)
+{
+ if( group_id )
+ edl->tracks->set_group_selected(group_id, v);
+ else
+ is_selected = v >= 0 ? v : !is_selected ? 1 : 0;
+}
void Edit::copy_from(Edit *edit)
{
void Edit::copy_from(Edit *edit)
{
@@
-249,6
+269,8
@@
void Edit::copy_from(Edit *edit)
this->length = edit->length;
this->hard_left = edit->hard_left;
this->hard_right = edit->hard_right;
this->length = edit->length;
this->hard_left = edit->hard_left;
this->hard_right = edit->hard_right;
+ this->color = edit->color;
+ this->group_id = edit->group_id;
strcpy (this->user_title, edit->user_title);
if(edit->transition)
strcpy (this->user_title, edit->user_title);
if(edit->transition)
@@
-324,8
+346,6
@@
int Edit::identical(Edit &edit)
this->startsource == edit.startsource &&
this->startproject == edit.startproject &&
this->length == edit.length &&
this->startsource == edit.startsource &&
this->startproject == edit.startproject &&
this->length == edit.length &&
- this->hard_left == edit.hard_left &&
- this->hard_right == edit.hard_right &&
this->transition == edit.transition &&
this->channel == edit.channel);
return result;
this->transition == edit.transition &&
this->channel == edit.channel);
return result;
@@
-377,7
+397,8
@@
int Edit::dump(FILE *fp)
asset,
asset ? asset->path : "");
fflush(fp);
asset,
asset ? asset->path : "");
fflush(fp);
- fprintf(fp," channel %d\n", channel);
+ 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);
@@
-394,6
+415,8
@@
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", 0);
+ group_id = file->tag.get_property("GROUP_ID", group_id);
user_title[0] = 0;
file->tag.get_property("USER_TITLE", user_title);
this->startproject = startproject;
user_title[0] = 0;
file->tag.get_property("USER_TITLE", user_title);
this->startproject = startproject;
@@
-751,34
+774,6
@@
int Edit::shift_end_out(int edit_mode,
return 0;
}
return 0;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
int Edit::popup_transition(float view_start, float zoom_units, int cursor_x, int cursor_y)
{
int64_t left, right, left_unit, right_unit;
int Edit::popup_transition(float view_start, float zoom_units, int cursor_x, int cursor_y)
{
int64_t left, right, left_unit, right_unit;