projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove incorrectly named
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mixersalign.C
diff --git
a/cinelerra-5.1/cinelerra/mixersalign.C
b/cinelerra-5.1/cinelerra/mixersalign.C
index b5fe9227402cf6239206375f2942441b40865614..bd4116f39bd0a595443f4f39da4e73792b46b14e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mixersalign.C
+++ b/
cinelerra-5.1/cinelerra/mixersalign.C
@@
-521,6
+521,8
@@
MixersAlignWindow::MixersAlignWindow(MixersAlign *dialog, int x, int y)
: BC_Window(_("Align Mixers"), x, y, xS(880), yS(380), xS(880), yS(380), 1)
{
this->dialog = dialog;
: BC_Window(_("Align Mixers"), x, y, xS(880), yS(380), xS(880), yS(380), 1)
{
this->dialog = dialog;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Video sync using Waveforms");
}
MixersAlignWindow::~MixersAlignWindow()
{
}
MixersAlignWindow::~MixersAlignWindow()
{
@@
-704,7
+706,7
@@
void MixersAlign::nudge_tracks()
while( track && track->mixer_id != id ) track = track->next;
if( !track ) continue;
double nudge = mix->nudge;
while( track && track->mixer_id != id ) track = track->next;
if( !track ) continue;
double nudge = mix->nudge;
- int
record = track->record; track->recor
d = 1;
+ int
armed = track->armed; track->arme
d = 1;
if( nudge < 0 ) {
track->clear(0, -nudge, 1,
edl->session->labels_follow_edits,
if( nudge < 0 ) {
track->clear(0, -nudge, 1,
edl->session->labels_follow_edits,
@@
-716,7
+718,7
@@
void MixersAlign::nudge_tracks()
edl->session->plugins_follow_edits,
edl->session->autos_follow_edits);
}
edl->session->plugins_follow_edits,
edl->session->autos_follow_edits);
}
- track->
record = recor
d;
+ track->
armed = arme
d;
}
}
edl->optimize();
}
}
edl->optimize();
@@
-736,8
+738,8
@@
void MixersAlign::nudge_selected()
ArrayList<int> track_arms; // ugly
for( Track *track=edl->tracks->first; track; track=track->next ) {
ArrayList<int> track_arms; // ugly
for( Track *track=edl->tracks->first; track; track=track->next ) {
- track_arms.append(track->
recor
d);
- track->
recor
d = 0;
+ track_arms.append(track->
arme
d);
+ track->
arme
d = 0;
}
for( int m, i=0; (m=ma_gui->mixer_list->get_selection_number(0,i))>=0; ++i ) {
if( m == midx ) continue; // master does not move
}
for( int m, i=0; (m=ma_gui->mixer_list->get_selection_number(0,i))>=0; ++i ) {
if( m == midx ) continue; // master does not move
@@
-749,7
+751,7
@@
void MixersAlign::nudge_selected()
while( track && track->mixer_id != id ) track = track->next;
if( !track ) continue;
double nudge = mix->nudge;
while( track && track->mixer_id != id ) track = track->next;
if( !track ) continue;
double nudge = mix->nudge;
- track->
recor
d = 1;
+ track->
arme
d = 1;
double position = 0; Track *first_track = 0;
EDL *clip = edl->selected_edits_to_clip(0, &position, &first_track);
if( clip ) {
double position = 0; Track *first_track = 0;
EDL *clip = edl->selected_edits_to_clip(0, &position, &first_track);
if( clip ) {
@@
-775,12
+777,12
@@
void MixersAlign::nudge_selected()
position += nudge;
edl->paste_edits(clip, first_track, position, 1);
}
position += nudge;
edl->paste_edits(clip, first_track, position, 1);
}
- track->
recor
d = 0;
+ track->
arme
d = 0;
}
}
int i = 0;
for( Track *track=edl->tracks->first; track; track=track->next )
}
}
int i = 0;
for( Track *track=edl->tracks->first; track; track=track->next )
- track->
recor
d = track_arms[i++];
+ track->
arme
d = track_arms[i++];
edl->optimize();
mwindow->update_gui(1);
edl->optimize();
mwindow->update_gui(1);
@@
-1009,7
+1011,7
@@
void MixersAlign::apply_undo(int no)
MixersAlignARender::MixersAlignARender(MWindow *mwindow, EDL *edl)
: RenderEngine(0, mwindow->preferences, 0, 0)
{
MixersAlignARender::MixersAlignARender(MWindow *mwindow, EDL *edl)
: RenderEngine(0, mwindow->preferences, 0, 0)
{
- TransportCommand command;
+ TransportCommand command
(mwindow->preferences)
;
command.command = NORMAL_FWD;
command.get_edl()->copy_all(edl);
command.change_type = CHANGE_ALL;
command.command = NORMAL_FWD;
command.get_edl()->copy_all(edl);
command.change_type = CHANGE_ALL;