X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frecord.C;h=473e10c32c1a4b185ddb898242e5b761ea96fc11;hb=cb73d14fe59acbe8eba0a62f4af26a23072201fa;hp=1c9f6ecd1376e80e6b14c54effa3f427ea982ce9;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/record.C b/cinelerra-5.1/cinelerra/record.C
index 1c9f6ecd..473e10c3 100644
--- a/cinelerra-5.1/cinelerra/record.C
+++ b/cinelerra-5.1/cinelerra/record.C
@@ -163,7 +163,7 @@ Record::Record(MWindow *mwindow, RecordMenuItem *menu_item)
 Record::~Record()
 {
 	mwindow->gui->record = 0;
-	stop();  join();
+	stop();
 	delete blink_status;
 	delete cutads_status;
 	stop_skimming();
@@ -230,6 +230,8 @@ int Record::load_defaults()
 	video_zoom = defaults->get("RECORD_VIDEO_Z", (float)1);
 	picture->load_defaults();
 	reverse_interlace = defaults->get("REVERSE_INTERLACE", 0);
+	do_cursor = defaults->get("RECORD_CURSOR", 0);
+	do_big_cursor = defaults->get("RECORD_BIG_CURSOR", 0);
 	for( int i=0; i<MAXCHANNELS; ++i ) {
 		sprintf(string, "RECORD_DCOFFSET_%d", i);
 		dc_offset[i] = defaults->get(string, 0);
@@ -266,6 +268,8 @@ int Record::save_defaults()
 	defaults->update("RECORD_VIDEO_Z", video_zoom);
 	picture->save_defaults();
 	defaults->update("REVERSE_INTERLACE", reverse_interlace);
+	defaults->update("RECORD_CURSOR", do_cursor);
+	defaults->update("RECORD_BIG_CURSOR", do_big_cursor);
 	for( int i=0; i<MAXCHANNELS; ++i ) {
 		sprintf(string, "RECORD_DCOFFSET_%d", i);
 		defaults->update(string, dc_offset[i]);
@@ -369,7 +373,7 @@ void Record::run()
 		if( channel )
 			video_stream = channel->video_stream;
 	}
-	stop();
+	stop(0);
 	edl->Garbage::remove_user();
 
 	if( mwindow->gui->remote_control->deactivate() )
@@ -402,8 +406,9 @@ void Record::run()
 // For pasting, clear the active region
 			if(load_mode == LOADMODE_PASTE)
 				mwindow->clear(0);
-
-			mwindow->paste_edls(&new_edls, load_mode, 0, -1,
+			int loadmode = load_mode == LOADMODE_RESOURCESONLY ?
+				LOADMODE_ASSETSONLY : load_mode;
+			mwindow->paste_edls(&new_edls, loadmode, 0, -1,
 				SESSION->labels_follow_edits,
 				SESSION->plugins_follow_edits,
 				SESSION->autos_follow_edits,
@@ -433,9 +438,13 @@ void Record::run()
 	default_asset->Garbage::remove_user();
 }
 
-void Record::stop()
+void Record::stop(int wait)
 {
 	stop_operation();
+	if( record_gui )
+		record_gui->set_done(1);
+	if( wait )
+		join();
 	window_lock->lock("Record::stop");
 	delete record_thread;   record_thread = 0;
 	delete record_monitor;  record_monitor = 0;
@@ -588,7 +597,6 @@ void Record::start()
 		window_lock->unlock();
 	}
 	else {
-		stop();  join();
 		init_lock->reset();
 		Thread::start();
 	}
@@ -694,8 +702,7 @@ const char* Record::current_mode()
 
 double Record::current_display_position()
 {
-//printf("Record::current_display_position "
-//  _LD " " _LD "\n", total_samples, total_frames)
+//printf("Record::current_display_position "%jd %jd\n", total_samples, total_frames);
 	double result = -1.;
 	Asset *asset = default_asset;
 	if( writing_file ) {
@@ -992,6 +999,7 @@ void Record::open_video_input()
 		master_channel->copy_usage(vdevice->channel);
 		picture->copy_usage(vdevice->picture);
 		vdevice->set_field_order(reverse_interlace);
+		vdevice->set_do_cursor(do_cursor, do_big_cursor);
 		vdevice->set_adevice(adevice);
 		if( adevice ) adevice->set_vdevice(vdevice);
 		set_dev_channel(get_current_channel());
@@ -1092,8 +1100,8 @@ void Record::start_writing_file()
 	if( !writing_file ) {
 		written_frames = 0;
 		written_samples = 0;
-		do_video = File::supports_video(default_asset->format);
-		do_audio = File::supports_audio(default_asset->format);
+		do_video = File::renders_video(default_asset);
+		do_audio = File::renders_audio(default_asset);
 		if( single_frame ) do_audio = 0;
 		if( !do_video && single_frame )
 			single_frame = 0;
@@ -1204,11 +1212,15 @@ void Record::set_power_off(int value)
 	record_gui->power_off->update(value);
 }
 
-int Record::set_video_picture()
+void Record::set_video_picture()
 {
 	if( default_asset->video_data && vdevice )
 		vdevice->set_picture(picture);
-	return 0;
+}
+
+void Record::set_do_cursor()
+{
+	vdevice->set_do_cursor(do_cursor, do_big_cursor);
 }
 
 void Record::set_translation(int x, int y)
@@ -2037,7 +2049,7 @@ run()
 		usleep(500000);
 		disable_cancel();
 		color ^= YELLOW ^ BLUE;
-		if( timer.get_difference() > 10*60*1000 ) { // 10 minites
+		if( timer.get_difference() > 10*60*1000 ) { // 10 minutes
 			record->stop_commercial_capture(0);
 			done = 1;
 		}