projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
last push faux paux, update shortcuts doc, period/comma alt shortcuts, popup deactiva...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
tracks.C
diff --git
a/cinelerra-5.1/cinelerra/tracks.C
b/cinelerra-5.1/cinelerra/tracks.C
index 8db132bc1eff7c9c50838b9147d46d9745c57bef..4df744922f1d50941a8081c007f6333c596df37f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracks.C
+++ b/
cinelerra-5.1/cinelerra/tracks.C
@@
-287,83
+287,39
@@
Track* Tracks::add_audio_track(int above, Track *dst_track)
Track* Tracks::add_video_track(int above, Track *dst_track)
{
Track* Tracks::add_video_track(int above, Track *dst_track)
{
-const int debug = 0;
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
VTrack* new_track = new VTrack(edl, this);
VTrack* new_track = new VTrack(edl, this);
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
if(!dst_track)
dst_track = (above ? first : last);
if(!dst_track)
dst_track = (above ? first : last);
-
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
if(above)
if(above)
- {
insert_before(dst_track, (Track*)new_track);
insert_before(dst_track, (Track*)new_track);
- }
else
else
- {
insert_after(dst_track, (Track*)new_track);
insert_after(dst_track, (Track*)new_track);
- }
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
-
-
-// Shift effects referenced below the new track
- for(Track *track = last;
- track && track != new_track;
- track = track->previous)
- {
+ for(Track *track = last; track && track != new_track; track = track->previous)
change_modules(number_of(track) - 1, number_of(track), 0);
change_modules(number_of(track) - 1, number_of(track), 0);
- }
-
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
-
new_track->create_objects();
new_track->create_objects();
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
new_track->set_default_title();
new_track->set_default_title();
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
return new_track;
}
Track* Tracks::add_subttl_track(int above, Track *dst_track)
{
return new_track;
}
Track* Tracks::add_subttl_track(int above, Track *dst_track)
{
-const int debug = 0;
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
STrack* new_track = new STrack(edl, this);
STrack* new_track = new STrack(edl, this);
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
if(!dst_track)
dst_track = (above ? first : last);
if(!dst_track)
dst_track = (above ? first : last);
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
if(above)
if(above)
- {
insert_before(dst_track, (Track*)new_track);
insert_before(dst_track, (Track*)new_track);
- }
else
else
- {
insert_after(dst_track, (Track*)new_track);
insert_after(dst_track, (Track*)new_track);
- }
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
-
-// Shift effects referenced below the new track
- for(Track *track = last;
- track && track != new_track;
- track = track->previous)
- {
+ for(Track *track = last; track && track != new_track; track = track->previous)
change_modules(number_of(track) - 1, number_of(track), 0);
change_modules(number_of(track) - 1, number_of(track), 0);
- }
-
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
new_track->create_objects();
new_track->create_objects();
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
new_track->set_default_title();
new_track->set_default_title();
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
// new_track->paste_silence(0,total_length(),0);
return new_track;
}
// new_track->paste_silence(0,total_length(),0);
return new_track;
}
@@
-491,15
+447,18
@@
double Tracks::total_playable_length()
double total = 0;
for(Track *current = first; current; current = NEXT)
{
double total = 0;
for(Track *current = first; current; current = NEXT)
{
- double length = current->get_length();
- if(length > total) total = length;
+ if( current->play )
+ {
+ double length = current->get_length();
+ if(length > total) total = length;
+ }
}
return total;
}
double Tracks::total_recordable_length()
{
}
return total;
}
double Tracks::total_recordable_length()
{
- double total =
0
;
+ double total =
-1
;
for(Track *current = first; current; current = NEXT)
{
if(current->record)
for(Track *current = first; current; current = NEXT)
{
if(current->record)
@@
-516,7
+475,8
@@
double Tracks::total_length()
double total = 0;
for(Track *current = first; current; current = NEXT)
{
double total = 0;
for(Track *current = first; current; current = NEXT)
{
- if(current->get_length() > total) total = current->get_length();
+ double length = current->get_length();
+ if(length > total) total = length;
}
return total;
}
}
return total;
}