X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=4f6580d4fa21628ed578a7059e2f343ebf932462;hb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;hp=ef1a0b3b6032a55f2f4da75a5c21a799fffd4ae7;hpb=420671be045c7fcc1624d68395cb833a5cc2de31;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index ef1a0b3b..4f6580d4 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -68,7 +68,6 @@ FormatTools::FormatTools(MWindow *mwindow,
 	channels_title = 0;
 	channels_button = 0;
 	multiple_files = 0;
-	file_entries = 0;
 	w = window->get_w();
 
 	recording = 0;
@@ -104,12 +103,6 @@ SET_TRACE
 	if(vparams_thread) delete vparams_thread;
 SET_TRACE
 	if(channels_tumbler) delete channels_tumbler;
-SET_TRACE
-	if(file_entries)
-	{
-		file_entries->remove_all_objects();
-		delete file_entries;
-	}
 }
 
 void FormatTools::create_objects(int &init_x,
@@ -141,19 +134,6 @@ void FormatTools::create_objects(int &init_x,
 	this->prompt_video_compression = prompt_video_compression;
 	this->strategy = strategy;
 
-
-	file_entries = new ArrayList<BC_ListBoxItem*>;
-	FileSystem fs;
-	char string[BCTEXTLEN];
-// Load current directory
-	fs.update(getcwd(string, BCTEXTLEN));
-	for(int i = 0; i < fs.total_files(); i++)
-	{
-		file_entries->append(
-			new BC_ListBoxItem(
-				fs.get_entry(i)->get_name()));
-	}
-
 //printf("FormatTools::create_objects 1\n");
 
 // Modify strategy depending on render farm
@@ -186,9 +166,9 @@ void FormatTools::create_objects(int &init_x,
 					path_textbox, 10, px, y, 300, 100);
 		window->add_subwindow(path_recent);
 		path_recent->load_items(File::formattostr(asset->format));
-		px += path_recent->get_w() + 8;
+		px += path_recent->get_w();
 		window->add_subwindow(path_button = new BrowseButton(
-			mwindow, window, path_textbox, px, y, asset->path,
+			mwindow->theme, window, path_textbox, px, y, asset->path,
 			_("Output to file"), _("Select a file to write to:"), 0));
 
 // Set w for user.
@@ -319,8 +299,6 @@ void FormatTools::update_driver(int driver)
 
 		case CAPTURE_IEC61883:
 		case CAPTURE_FIREWIRE:
-		case CAPTURE_LML:
-		case CAPTURE_BUZ:
 		case VIDEO4LINUX2JPEG:
 		case CAPTURE_JPEG_WEBCAM:
 			asset->format = FILE_FFMPEG;
@@ -332,8 +310,6 @@ void FormatTools::update_driver(int driver)
 				locked_compressor = (char*)CODEC_TAG_DVSD;
 				break;
 
-			case CAPTURE_BUZ:
-			case CAPTURE_LML:
 			case VIDEO4LINUX2JPEG:
 				locked_compressor = (char*)CODEC_TAG_MJPEG;
 				break;
@@ -753,11 +729,7 @@ FormatPathText::~FormatPathText()
 }
 int FormatPathText::handle_event()
 {
-// Suggestions
-	calculate_suggestions(format->file_entries);
-
-
-
+	calculate_suggestions();
 	strcpy(format->asset->path, get_text());
 	format->handle_event();
 	return 1;