projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new boxblur plugin, mods to videoscope, fix segv for menu btns kfrm-tweak/kfrm...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
localsession.C
diff --git
a/cinelerra-5.1/cinelerra/localsession.C
b/cinelerra-5.1/cinelerra/localsession.C
index 9556dce3d6ebd693e6b3d5dde01230e6d552d179..50837a135044536a7949a27a6fa6693880cdba46 100644
(file)
--- a/
cinelerra-5.1/cinelerra/localsession.C
+++ b/
cinelerra-5.1/cinelerra/localsession.C
@@
-64,6
+64,7
@@
LocalSession::LocalSession(EDL *edl)
strcpy(clip_notes, _("Hello world"));
strcpy(clip_icon, "");
clipboard_length = 0;
strcpy(clip_notes, _("Hello world"));
strcpy(clip_icon, "");
clipboard_length = 0;
+ asset2edl = 0;
loop_playback = 0;
loop_start = loop_end = 0;
playback_start = -1;
loop_playback = 0;
loop_start = loop_end = 0;
playback_start = -1;
@@
-101,12
+102,14
@@
LocalSession::LocalSession(EDL *edl)
automation_maxs[AUTOGROUPTYPE_INT255] = 255;
zoombar_showautotype = AUTOGROUPTYPE_AUDIO_FADE;
automation_maxs[AUTOGROUPTYPE_INT255] = 255;
zoombar_showautotype = AUTOGROUPTYPE_AUDIO_FADE;
+ zoombar_showautocolor = -1;
floatauto_type = FloatAuto::SMOOTH;
red = green = blue = 0;
red_max = green_max = blue_max = 0;
use_max = 0;
floatauto_type = FloatAuto::SMOOTH;
red = green = blue = 0;
red_max = green_max = blue_max = 0;
use_max = 0;
+ solo_track_id = -1;
}
LocalSession::~LocalSession()
}
LocalSession::~LocalSession()
@@
-146,6
+149,7
@@
void LocalSession::copy_from(LocalSession *that)
green_max = that->green_max;
blue_max = that->blue_max;
use_max = that->use_max;
green_max = that->green_max;
blue_max = that->blue_max;
use_max = that->use_max;
+ solo_track_id = that->solo_track_id;
for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
automation_mins[i] = that->automation_mins[i];
for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
automation_mins[i] = that->automation_mins[i];
@@
-236,6
+240,8
@@
void LocalSession::synchronize_params(LocalSession *that)
red_max = that->red_max;
green_max = that->green_max;
blue_max = that->blue_max;
red_max = that->red_max;
green_max = that->green_max;
blue_max = that->blue_max;
+ if( solo_track_id < 0 || that->solo_track_id < 0 )
+ solo_track_id = that->solo_track_id;
}
}