projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowedit.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowedit.C
b/cinelerra-5.1/cinelerra/mwindowedit.C
index 66910d2a33ce8404d0a39c4e0435dfbd457a5582..5f7aa62f2dc0beff81466819970a7be1cb8ab26c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/
cinelerra-5.1/cinelerra/mwindowedit.C
@@
-1,6
+1,7
@@
/*
* CINELERRA
* Copyright (C) 1997-2012 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 1997-2012 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-841,8
+842,8
@@
void MWindow::insert_effect(char *title, SharedLocation *shared_location,
SharedLocation shared_location_local;
shared_location_local.copy_from(shared_location);
int first_track = 1;
SharedLocation shared_location_local;
shared_location_local.copy_from(shared_location);
int first_track = 1;
- double start_pos = edl->local_session->get_selectionstart(
1
);
- double end_pos = edl->local_session->get_selectionend(
1
);
+ double start_pos = edl->local_session->get_selectionstart();
+ double end_pos = edl->local_session->get_selectionend();
for( ; current; current=NEXT ) {
if( current->data_type != data_type ) continue;
if( !current->is_armed() ) continue;
for( ; current; current=NEXT ) {
if( current->data_type != data_type ) continue;
if( !current->is_armed() ) continue;
@@
-2869,6
+2870,10
@@
int MWindow::masters_to_mixers()
for( ; track && !track->master; track=track->next )
mixer_last = track;
Track *next_track = track;
for( ; track && !track->master; track=track->next )
mixer_last = track;
Track *next_track = track;
+ if( !master_track->armed ) {
+ master_track = next_track;
+ continue;
+ }
Mixer *master_mixer = 0;
for( int i=0, n=edl->mixers.size(); i<n; ++i ) {
if( master_track->index_in(edl->mixers[i]) >= 0 ) {
Mixer *master_mixer = 0;
for( int i=0, n=edl->mixers.size(); i<n; ++i ) {
if( master_track->index_in(edl->mixers[i]) >= 0 ) {