load fn from resources, del kfrm speed update, svg exec cmd/file win fixes, undo...

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

diff --git a/cinelerra-5.1/cinelerra/timebar.C b/cinelerra-5.1/cinelerra/timebar.C
index ed0011cd71f102a52d9b4b45f81436533f1a1536..7d25fb2c3195e37563ad58db99cefa8df4427a2c 100644 (file)
--- a/cinelerra-5.1/cinelerra/timebar.C
+++ b/cinelerra-5.1/cinelerra/timebar.C
@@ -97,7 +97,7 @@ int LabelGUI::button_press_event()
        if( this->is_event_win() && get_buttonpress() == 3 ) {
                if( label ) {
                        int cur_x, cur_y;
-                       get_abs_cursor_xy(cur_x, cur_y, 0);
+                       get_abs_cursor(cur_x, cur_y, 0);
                        timebar->label_edit->start(label, cur_x, cur_y);
                }
                result = 1;
@@ -430,7 +430,10 @@ void TimeBar::update(int flush)
                double position = edl->local_session->get_selectionstart(1);
                int64_t pixel = position_to_pixel(position);
 // Draw insertion point position.
-               set_color(mwindow->theme->timebar_cursor_color);
+               int color = mwindow->theme->timebar_cursor_color;
+               if( mwindow->preferences->forward_render_displacement )
+                       color ^= 0x00ffff;
+               set_color(color);
                draw_line(pixel, 0, pixel, get_h());
        }
 
@@ -516,24 +519,9 @@ int TimeBar::draw()
 
 double TimeBar::get_edl_length()
 {
-       edl_length = 0;
-
-       if( get_edl() ) {
-//printf("TimeBar::get_edl_length 1 %f\n", get_edl()->tracks->total_playable_length());
-               edl_length = get_edl()->tracks->total_playable_length();
-       }
-
-//printf("TimeBar::get_edl_length 2\n");
-       if( !EQUIV(edl_length, 0) ) {
-//printf("TimeBar::get_edl_length 3\n");
-               time_per_pixel = edl_length / get_w();
-//printf("TimeBar::get_edl_length 4\n");
-       }
-       else {
-               time_per_pixel = 0;
-       }
-//printf("TimeBar::get_edl_length 5\n");
-
+       edl_length = get_edl() ? get_edl()->tracks->total_length() : 0;
+       int w1 = get_w()-1;
+       time_per_pixel = !EQUIV(edl_length, 0) ? edl_length/w1 : w1;
        return edl_length;
 }