X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frecordgui.C;h=9cc56e02cebef82a375146cdce4b704dd90acc7a;hb=255afe5bf50d8e2d10075c0b8ab0f88efbe91570;hp=1e95c61251eeb46482d863ad3da417e860da9838;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/recordgui.C b/cinelerra-5.1/cinelerra/recordgui.C
index 1e95c612..9cc56e02 100644
--- a/cinelerra-5.1/cinelerra/recordgui.C
+++ b/cinelerra-5.1/cinelerra/recordgui.C
@@ -1,7 +1,7 @@
 
 /*
  * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2008-2017 Adam Williams <broadcast at earthling dot net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -116,8 +116,8 @@ RecordGUI::RecordGUI(MWindow *mwindow, Record *record)
 
 RecordGUI::~RecordGUI()
 {
-TRACE("RecordGUI::~RecordGUI 1");
 	delete status_thread;
+	delete record_transport;
 	delete batch_source;
 	delete batch_mode;
 	delete batch_flash;
@@ -126,7 +126,6 @@ TRACE("RecordGUI::~RecordGUI 1");
 	delete batch_start;
 	delete batch_duration;
 	delete load_mode;
-TRACE("RecordGUI::~RecordGUI 2");
 }
 
 
@@ -265,7 +264,7 @@ void RecordGUI::create_objects()
 	x = x3 + x2 + x1 + 40;
 
 	add_subwindow(new BC_Title(x, y,
-		File::formattostr(mwindow->plugindb, asset->format),
+		File::formattostr(asset->format),
 		MEDIUMFONT,
 		mwindow->theme->recordgui_fixed_color));
 	y += pad;
@@ -656,7 +655,7 @@ int RecordGUIDropFrames::handle_event()
 
 int RecordGUIDropFrames::keypress_event()
 {
-	if(get_keypress() == 'd') {
+	if( get_keypress() == caption[0] ) {
 		set_value(get_value() ? 0 : 1);
 		handle_event();
 		return 1;
@@ -680,7 +679,7 @@ int RecordGUIFillFrames::handle_event()
 
 int RecordGUIFillFrames::keypress_event()
 {
-	if(get_keypress() == 'f') {
+	if( get_keypress() == caption[0] ) {
 		set_value(get_value() ? 0 : 1);
 		handle_event();
 		return 1;
@@ -704,7 +703,7 @@ int RecordGUIPowerOff::handle_event()
 
 int RecordGUIPowerOff::keypress_event()
 {
-	if(get_keypress() == 'p') {
+	if( get_keypress() == caption[0] ) {
 		set_value(get_value() ? 0 : 1);
 		handle_event();
 		return 1;
@@ -730,7 +729,7 @@ int RecordGUICommCheck::handle_event()
 
 int RecordGUICommCheck::keypress_event()
 {
-	if(get_keypress() == 'c') {
+	if( get_keypress() == caption[0] ) {
 		set_value(get_value() ? 0 : 1);
 		gui->record->update_skimming(get_value());
 		handle_event();
@@ -1005,7 +1004,7 @@ int RecordGUILabel::handle_event()
 
 int RecordGUILabel::keypress_event()
 {
-	if(get_keypress() == 'l') {
+	if( get_keypress() == *get_text() ) {
 		handle_event();
 		return 1;
 	}
@@ -1384,6 +1383,7 @@ RecordStatusThread::~RecordStatusThread()
 		input_lock->unlock();
 	}
 	Thread::join();
+	delete input_lock;
 }
 
 void RecordStatusThread::reset_video()
@@ -1612,5 +1612,3 @@ int RecordGUIResetTranslation::handle_event()
 	return 1;
 }
 
-
-