sams folder icons, snap drag, sort folders, in/out ptr bug, interp bg fix, filebox...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / edl.C

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 591b4ca93141a08a4e9e8a499abb0cb8afcaffe5..d6810aa763b05bd779b34a4a3c441c648aa381bf 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -1061,8 +1061,7 @@ int EDL::dump(FILE *fp)
                        "  output_h: %d\n"
                        "  aspect_w: %f\n"
                        "  aspect_h: %f\n"
-                       "  color_model: %d\n"
-                       "  proxy_scale: %d\n",
+                       "  color_model: %d\n",
                                session->video_channels,
                                session->video_tracks,
                                session->frame_rate,
@@ -1071,8 +1070,7 @@ int EDL::dump(FILE *fp)
                                session->output_h,
                                session->aspect_w,
                                session->aspect_h,
-                               session->color_model,
-                               session->proxy_scale);
+                               session->color_model);
 
                fprintf(fp," CLIPS\n");
                fprintf(fp,"  total: %d\n", clips.total);
@@ -1551,3 +1549,51 @@ void EDL::append_vwindow_edl(EDL *edl, int increase_counter)
 }
 
 
+double EDL::next_edit(double position)
+{
+       Units::fix_double(&position);
+       double new_position = tracks->total_length();
+
+       double max_rate = get_frame_rate();
+       int sample_rate = get_sample_rate();
+       if( sample_rate > max_rate ) max_rate = sample_rate;
+       double min_movement = max_rate > 0 ? 1. / max_rate : 1e-6;
+
+// Test for edit handles after position
+       for( Track *track=tracks->first; track; track=track->next ) {
+               if( !track->record ) continue;
+               for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                       double edit_end = track->from_units(edit->startproject + edit->length);
+                       Units::fix_double(&edit_end);
+                       if( fabs(edit_end-position) < min_movement ) continue;
+                       if( edit_end > position && edit_end < new_position )
+                               new_position = edit_end;
+               }
+       }
+       return new_position;
+}
+
+double EDL::prev_edit(double position)
+{
+       Units::fix_double(&position);
+       double new_position = -1;
+
+       double max_rate = get_frame_rate();
+       int sample_rate = get_sample_rate();
+       if( sample_rate > max_rate ) max_rate = sample_rate;
+       double min_movement = max_rate > 0 ? 1. / max_rate : 1e-6;
+
+// Test for edit handles before cursor position
+       for( Track *track=tracks->first; track; track=track->next ) {
+               if( !track->record ) continue;
+               for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+                       double edit_end = track->from_units(edit->startproject);
+                       Units::fix_double(&edit_end);
+                       if( fabs(edit_end-position) < min_movement ) continue;
+                       if( edit_end < position && edit_end > new_position )
+                               new_position = edit_end;
+               }
+       }
+       return new_position;
+}
+