X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;fp=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=c6722e794db0d42d53456dfb66817aaf99c18d3f;hp=536fabc6325e5d31e07c9ea444680291fa997ae0;hb=b384d47608e07b9f5b6ce5fe1d0d76d9bda38202;hpb=81915b8dd7046fd88697e3a9cc1a11b891be62db

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 536fabc6..c6722e79 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -805,14 +805,11 @@ void TrackCanvas::draw_resources(int mode,
 
 	resource_timer->update();
 
+	if(!indexes_only) {
 // Age resource pixmaps for deletion
-	if(!indexes_only)
 		for(int i = 0; i < gui->resource_pixmaps.total; i++)
 			gui->resource_pixmaps.values[i]->visible--;
-
-	if(mode == FORCE_REDRAW)
-		gui->resource_pixmaps.remove_all_objects();
-
+	}
 	if(debug) PRINT_TRACE
 	if(mode != IGNORE_THREAD)
 		gui->resource_thread->reset(pane->number, indexes_only);
@@ -978,12 +975,9 @@ ResourcePixmap* TrackCanvas::create_pixmap(Edit *edit,
 	if(!result)
 	{
 //SET_TRACE
-		result = new ResourcePixmap(mwindow,
-			gui,
-			edit,
-			pane->number,
-			pixmap_w,
-			pixmap_h);
+		result = new ResourcePixmap(mwindow, gui, edit, pane->number, pixmap_w, pixmap_h);
+		set_bg_color(BLACK);
+		clear_box(0,0, pixmap_w,pixmap_h, result);
 //SET_TRACE
 		gui->resource_pixmaps.append(result);
 	}
@@ -2240,7 +2234,8 @@ int TrackCanvas::do_keyframes(int cursor_x,
 // track context menu to appear
 	int result = 0;
 	EDLSession *session = mwindow->edl->session;
-	int gang = session->gang_tracks != GANG_NONE || get_double_click() ? 1 : 0;
+	int gang = mwindow->edl->local_session->gang_tracks != GANG_NONE ||
+			get_double_click() ? 1 : 0;
 
 	static BC_Pixmap *auto_pixmaps[AUTOMATION_TOTAL] =
 	{
@@ -5105,6 +5100,8 @@ int TrackCanvas::do_plugin_handles(int cursor_x,
 int TrackCanvas::do_transition_handles(int cursor_x, int cursor_y, int button_press,
 		int &rerender, int &update_overlay, int &new_cursor, int &update_cursor)
 {
+	if( !mwindow->edl->session->auto_conf->transitions )
+		return 0;
 	Transition *trans_result = 0;
 	int result = 0;