X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=cbc62e1f1a7f4b3055594077b68ae5486e538fe9;hb=853407b57330e275b6c58432c678159b2eac00db;hp=4de073e34a281231075b3e7c69a71f5aca5db171;hpb=5c1aff2fd123b65be6e51ca7652185e14ddaf168;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 4de073e3..cbc62e1f 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -27,6 +27,8 @@
 #include "bctimer.h"
 #include "clip.h"
 #include "bccolors.h"
+#include "cache.h"
+#include "canvas.h"
 #include "cplayback.h"
 #include "cursors.h"
 #include "cwindowgui.h"
@@ -67,6 +69,7 @@
 #include "pluginset.h"
 #include "plugintoggles.h"
 #include "preferences.h"
+#include "renderengine.h"
 #include "resourcepixmap.h"
 #include "resourcethread.h"
 #include "swindow.h"
@@ -80,6 +83,7 @@
 #include "transportque.h"
 #include "vframe.h"
 #include "vpatchgui.inc"
+#include "vrender.h"
 #include "zoombar.h"
 
 #include <string.h>
@@ -3597,14 +3601,85 @@ void TrackCanvas::update_drag_handle()
 	{
 		mwindow->session->drag_position = new_position;
 		gui->mainclock->update(new_position);
-
-
 		timebar_position = new_position;
 		gui->update_timebar(0);
-// Que the CWindow.  Doesn't do anything if selectionstart and selection end
-// aren't changed.
-//		mwindow->cwindow->update(1, 0, 0);
+
+		EDL *edl = new EDL;
+		edl->create_objects();
+		edl->copy_all(mwindow->edl);
+		MainSession *session = mwindow->session;
+		int edit_mode = mwindow->edl->session->edit_handle_mode[session->drag_button];
+		edl->modify_edithandles(session->drag_start,
+			session->drag_position,
+			session->drag_handle,
+			edit_mode,
+			edl->session->labels_follow_edits,
+			edl->session->plugins_follow_edits,
+			edl->session->autos_follow_edits);
+		double position = edit_mode != MOVE_NO_EDITS &&
+			( session->drag_handle || edit_mode == MOVE_ONE_EDIT ) ?
+				session->drag_position : session->drag_start;
+		Track *track = session->drag_edit->edits->track;
+		int64_t pos = track->to_units(position, 0);
+		render_handle_frame(edl, pos, shift_down() ? 0 :
+			session->drag_handle ? 1 : 2);
+		edl->remove_user();
+	}
+}
+
+int TrackCanvas::render_handle_frame(EDL *edl, int64_t pos, int mode)
+{
+	int result = 0;
+	int64_t left = pos-1;
+	if( left < 0 ) left = 0;
+	switch( mode ) {
+	case 0: {
+		VFrame vlt(edl->get_w(), edl->get_h(), edl->session->color_model);
+		VFrame vrt(edl->get_w(), edl->get_h(), edl->session->color_model);
+		TransportCommand command;
+		command.command = CURRENT_FRAME;
+		command.get_edl()->copy_all((EDL *)edl);
+		command.change_type = CHANGE_ALL;
+		command.realtime = 0;
+		Preferences *preferences = mwindow->preferences;
+		RenderEngine *render_engine = new RenderEngine(0, preferences, 0, 0);
+		CICache *video_cache = new CICache(preferences);
+		render_engine->set_vcache(video_cache);
+		render_engine->arm_command(&command);
+		int64_t left = pos-1;
+		if( left < 0 ) left = 0;
+		VRender *vrender = render_engine->vrender;
+		result = vrender &&
+			!vrender->process_buffer(&vlt, left, 0) &&
+			!vrender->process_buffer(&vrt, pos , 0) ? 0 : 1;
+		delete render_engine;
+		delete video_cache;
+		mwindow->cwindow->gui->lock_window("TrackCanvas::render_handle_frame 0");
+		Canvas *canvas = mwindow->cwindow->gui->canvas;
+		canvas->lock_canvas("TrackCanvas::render_handle_frame 1");
+		int w = canvas->w, h = canvas->h, w2 = w/2, h2 = h/2;
+		int lx = 0, ly = h2/2, rx = w2, ry = h2/2;
+		BC_WindowBase *window = canvas->get_canvas();
+		window->draw_vframe(&vlt, lx,ly, w2,h2, 0,0,vlt.get_w(),vlt.get_h());
+		window->draw_vframe(&vrt, rx,ry, w2,h2, 0,0,vrt.get_w(),vrt.get_h());
+		window->flash(1);
+		canvas->unlock_canvas();
+		mwindow->cwindow->gui->unlock_window();
+		break; }
+	case 1:
+	case 2: {
+		Track *track = mwindow->session->drag_edit->edits->track;
+		double position = track->from_units(mode == 1 ? left : pos);
+		if( position < 0 ) position = 0;
+		edl->local_session->set_selectionstart(position);
+		edl->local_session->set_selectionend(position);
+		PlaybackEngine *playback_engine = mwindow->cwindow->playback_engine;
+		if( playback_engine->is_playing_back )
+			playback_engine->stop_playback(1);
+		mwindow->cwindow->playback_engine->refresh_frame(CHANGE_EDL, edl, 0);
+		break; }
 	}
+	return result;
 }
 
 int TrackCanvas::update_drag_edit()