X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frecordmonitor.C;h=c72317fb9be46168807e22250a8706c7d25260b6;hb=e55a625a562bc3ad94deb8008c7ede2bf1768daa;hp=dd65f6c3d189eb9849b90078b23c1bd5c98ab129;hpb=d4cfc2eaf603cd5abc76e98676a5ac8a53285c4e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/recordmonitor.C b/cinelerra-5.1/cinelerra/recordmonitor.C
index dd65f6c3..c72317fb 100644
--- a/cinelerra-5.1/cinelerra/recordmonitor.C
+++ b/cinelerra-5.1/cinelerra/recordmonitor.C
@@ -306,17 +306,14 @@ void RecordMonitorGUI::create_objects()
 // y offset for video canvas if we have the transport controls
 	lock_window("RecordMonitorGUI::create_objects");
 	int driver = mwindow->edl->session->vconfig_in->driver;
-	int do_channel = (driver == VIDEO4LINUX ||
-			driver == CAPTURE_BUZ ||
-			driver == CAPTURE_DVB ||
+	int do_channel = (driver == CAPTURE_DVB ||
 			driver == VIDEO4LINUX2 ||
 			driver == VIDEO4LINUX2JPEG ||
 			driver == VIDEO4LINUX2MPEG ||
 			driver == CAPTURE_JPEG_WEBCAM ||
 			driver == CAPTURE_YUYV_WEBCAM);
 	int do_scopes = do_channel || driver == SCREENCAPTURE;
-	int do_interlace = (driver == CAPTURE_BUZ ||
-		driver == VIDEO4LINUX2JPEG);
+	int do_interlace = (driver == VIDEO4LINUX2JPEG);
 	int background_done = 0;
 	int do_audio = record->default_asset->audio_data;
 	int do_video = record->default_asset->video_data;
@@ -347,7 +344,7 @@ void RecordMonitorGUI::create_objects()
 				add_subwindow(avc1394transport_timecode =
 					new BC_Title(avc1394_transport->x_end,
 						mwindow->theme->rmonitor_tx_y + 10,
-						_("00:00:00:00"),
+						"00:00:00:00",
 						MEDIUM_7SEGMENT,
 						BLACK));
 
@@ -395,8 +392,7 @@ void RecordMonitorGUI::create_objects()
 			channel_picker->create_objects();
 			x += channel_picker->get_w() + mwindow->theme->widget_border;
 		}
-		if( driver == CAPTURE_BUZ ||
-			driver == VIDEO4LINUX2JPEG ) {
+		if( driver == VIDEO4LINUX2JPEG ) {
 			add_subwindow(reverse_interlace = new ReverseInterlace(record,
 				mwindow->theme->rmonitor_interlace_x,
 				mwindow->theme->rmonitor_interlace_y));
@@ -437,6 +433,16 @@ int RecordMonitorGUI::button_press_event()
 {
 	if(mwindow->session->rwindow_fullscreen && canvas && canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
+
+	if( get_buttonpress() == 2 ) {
+		return 0;
+	}
+	else
+// Right button
+	if( get_buttonpress() == 3 ) {
+		monitor_menu->activate_menu();
+		return 1;
+	}
 	return 0;
 }
 
@@ -456,10 +462,6 @@ int RecordMonitorGUI::cursor_enter_event()
 
 int RecordMonitorGUI::button_release_event()
 {
-	if( get_buttonpress() == 3 && cursor_inside() ) {
-		monitor_menu->activate_menu();
-		return 1;
-	}
 	if( canvas && canvas->get_canvas() )
 		return canvas->button_release_event();
 	return 0;
@@ -549,17 +551,14 @@ int RecordMonitorGUI::translation_event()
 int RecordMonitorGUI::resize_event(int w, int h)
 {
 	int driver = mwindow->edl->session->vconfig_in->driver;
-	int do_channel = (driver == VIDEO4LINUX ||
-			driver == CAPTURE_BUZ ||
-			driver == CAPTURE_DVB ||
+	int do_channel = (driver == CAPTURE_DVB ||
 			driver == VIDEO4LINUX2 ||
 			driver == VIDEO4LINUX2JPEG ||
 			driver == VIDEO4LINUX2MPEG ||
 			driver == CAPTURE_JPEG_WEBCAM ||
 			driver == CAPTURE_YUYV_WEBCAM);
 	int do_scopes = do_channel || driver == SCREENCAPTURE;
-	int do_interlace = (driver == CAPTURE_BUZ ||
-		driver == VIDEO4LINUX2JPEG);
+	int do_interlace = (driver == VIDEO4LINUX2JPEG);
 	int do_avc = 0;
 #ifdef HAVE_FIREWIRE
 	do_avc = avc1394_transport ? 1 : 0;
@@ -856,9 +855,6 @@ RecordMonitorFullsize::RecordMonitorFullsize(MWindow *mwindow,
 }
 int RecordMonitorFullsize::handle_event()
 {
-	Record *record = window->record;
-	record->video_zoom = 1.0;
-	record->record_gui->set_translation(record->video_x, record->video_y, record->video_zoom);
 	return 1;
 }
 
@@ -916,7 +912,6 @@ void RecordMonitorThread::init_output_format()
 		output_colormodel = record->vdevice->get_best_colormodel(record->default_asset);
 		break;
 
-	case CAPTURE_BUZ:
 	case VIDEO4LINUX2JPEG:
 		jpeg_engine = new RecVideoMJPGThread(record, this,
 			mwindow->edl->session->vconfig_in->v4l2jpeg_in_fields);
@@ -943,7 +938,6 @@ void RecordMonitorThread::init_output_format()
 
 
 	case CAPTURE_DVB:
-	case VIDEO4LINUX:
 	case VIDEO4LINUX2:
 	case VIDEO4LINUX2MPEG:
 		output_colormodel = record->vdevice->get_best_colormodel(record->default_asset);
@@ -971,7 +965,6 @@ int RecordMonitorThread::stop_playback()
 //printf("RecordMonitorThread::stop_playback 1\n");
 
 	switch(mwindow->edl->session->vconfig_in->driver) {
-	case CAPTURE_BUZ:
 	case VIDEO4LINUX2JPEG:
 		if( jpeg_engine ) {
 			jpeg_engine->stop_rendering();
@@ -1042,7 +1035,7 @@ int RecordMonitorThread::render_dv()
 
 void RecordMonitorThread::render_uncompressed()
 {
-	output_frame->copy_from(input_frame);
+	output_frame->transfer_from(input_frame);
 }
 
 void RecordMonitorThread::show_output_frame()
@@ -1066,7 +1059,6 @@ void RecordMonitorThread::lock_input()
 int RecordMonitorThread::render_frame()
 {
 	switch(mwindow->edl->session->vconfig_in->driver) {
-	case CAPTURE_BUZ:
 	case VIDEO4LINUX2JPEG:
 	case CAPTURE_JPEG_WEBCAM:
 		render_jpeg();