X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=ee040f3c313f151cb1fd26e926396f792b2b61fb;hp=2bf178ab8927d3b670e61defb7a502df38dade41;hb=refs%2Fheads%2Fmaster;hpb=cbe947d378de6eaa11f38ec58b4f71c5c47f72bc

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 2bf178ab..ee040f3c 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2010-2013 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * 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
@@ -129,21 +130,27 @@ void FormatTools::create_objects(
 	this->prompt_video_compression = prompt_video_compression;
 	this->file_per_label = file_per_label;
 
+
+	if(asset->format == FILE_UNKNOWN)
+		asset->format = FILE_FFMPEG;
 //printf("FormatTools::create_objects 1\n");
 
 	if(!recording)
 	{
 		int px = x;
 		window->add_subwindow(path_textbox = new FormatPathText(px, y, this));
+		path_textbox->context_help_set_keyword("File Format section");
 		px += path_textbox->get_w() + 5;
 		path_recent = new BC_RecentList("PATH", mwindow->defaults,
 					path_textbox, 10, px, y, xS(300), yS(100));
 		window->add_subwindow(path_recent);
 		path_recent->load_items(File::formattostr(asset->format));
+		path_recent->context_help_set_keyword("File Format section");
 		px += path_recent->get_w();
 		window->add_subwindow(path_button = new BrowseButton(
 			mwindow->theme, window, path_textbox, px, y, asset->path,
 			_("Output to file"), _("Select a file to write to:"), 0));
+		path_button->context_help_set_keyword("File Format section");
 
 // Set w for user.
 		w = MAX(w, xS(305));
@@ -157,29 +164,37 @@ void FormatTools::create_objects(
 
 	x = init_x;
 	window->add_subwindow(format_title = new BC_Title(x, y, _("File Format:")));
+	format_title->context_help_set_keyword("File Format section");
 	x += format_title->get_w() + margin;
 	window->add_subwindow(format_text = new BC_TextBox(x, y, xS(160), 1,
 		File::formattostr(asset->format)));
+	format_text->context_help_set_keyword("File Format section");
 	x += format_text->get_w() + margin;
 //printf("FormatTools::create_objects %d %p\n", __LINE__, window);
 	window->add_subwindow(format_button = new FormatFormat(x, y, this));
 	format_button->create_objects();
+	format_button->context_help_set_keyword("File Format section");
 	x += format_button->get_w() + 5;
 	window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, xS(70), 1, asset->fformat));
 	FFMPEG::set_asset_format(asset, mwindow->edl, asset->fformat);
+	ffmpeg_type->context_help_set_keyword("File Format section");
 	x += ffmpeg_type->get_w();
 	window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this));
 	format_ffmpeg->create_objects();
+	format_ffmpeg->context_help_set_keyword("File Format section");
 	x = init_x;
 	y += format_button->get_h() + ys10;
 	if( do_audio ) {
 		window->add_subwindow(audio_title = new BC_Title(x, y, _("Audio:"), LARGEFONT,
 			BC_WindowBase::get_resources()->audiovideo_color));
+		audio_title->context_help_set_keyword("File Format section");
 		x += audio_title->get_w() + margin;
 		window->add_subwindow(aparams_button = new FormatAParams(mwindow, this, x, y));
+		aparams_button->context_help_set_keyword("File Format section");
 		x += aparams_button->get_w() + margin;
 		if(prompt_audio) {
 			window->add_subwindow(audio_switch = new FormatAudio(x, y, this, asset->audio_data));
+			audio_switch->context_help_set_keyword("File Format section");
 		}
 		x = init_x;
 		ylev = y;
@@ -199,15 +214,18 @@ void FormatTools::create_objects(
 //printf("FormatTools::create_objects 8\n");
 		window->add_subwindow(video_title = new BC_Title(x, y, _("Video:"), LARGEFONT,
 			BC_WindowBase::get_resources()->audiovideo_color));
+		video_title->context_help_set_keyword("File Format section");
 		x += video_title->get_w() + margin;
 		if(prompt_video_compression) {
 			window->add_subwindow(vparams_button = new FormatVParams(mwindow, this, x, y));
+			vparams_button->context_help_set_keyword("File Format section");
 			x += vparams_button->get_w() + margin;
 		}
 
 //printf("FormatTools::create_objects 9\n");
 		if(prompt_video) {
 			window->add_subwindow(video_switch = new FormatVideo(x, y, this, asset->video_data));
+			video_switch->context_help_set_keyword("File Format section");
 			y += video_switch->get_h();
 		}
 		else {
@@ -225,6 +243,7 @@ void FormatTools::create_objects(
 	if( file_per_label ) {
 		labeled_files = new FormatFilePerLabel(this, x, y, file_per_label);
 		window->add_subwindow(labeled_files);
+		labeled_files->context_help_set_keyword("File Format section");
 		y += labeled_files->get_h() + ys10;
 	}
 
@@ -388,7 +407,8 @@ void FormatTools::update_extension()
 			char *ptr1 = ptr;
 // change "qt" to "mov" since ffmpeg does not know qt
 			extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
-				!strcmp(asset->fformat, "qt") ? "mov" : asset->fformat ;
+				!strcmp(asset->fformat, "qt" ) ||
+				!strcmp(asset->fformat, "pro" ) ? "mov" : asset->fformat ;
 			while(*extension_ptr != 0 && *extension_ptr != '/')
 				*ptr1++ = *extension_ptr++;
 			*ptr1 = 0;
@@ -465,6 +485,10 @@ void FormatTools::reposition_window(int &init_x, int &init_y)
 	format_text->reposition_window(x, y);
 	x += format_text->get_w();
 	format_button->reposition_window(x, y);
+	x += format_button->get_w() + 5;
+	ffmpeg_type->reposition_window(x, y);
+	x += ffmpeg_type->get_w();
+	format_ffmpeg->reposition_window(x, y);
 
 	x = init_x;
 	y += format_button->get_h() + ys10;
@@ -743,6 +767,7 @@ int FormatFormat::handle_event()
 			asset->video_data = File::renders_video(asset);
 			asset->ff_audio_options[0] = 0;
 			asset->ff_video_options[0] = 0;
+			asset->ff_format_options[0] = 0;
 			format->format_text->update(selection->get_text());
 			if( !format->use_brender )
 				format->update_extension();
@@ -773,8 +798,10 @@ int FormatFFMPEG::handle_event()
 	if( selection ) {
 		const char *text = get_selection(0, 0)->get_text();
 		format->ffmpeg_type->update(text);
+// forces options load defaults
 		format->asset->ff_audio_options[0] = 0;
 		format->asset->ff_video_options[0] = 0;
+		format->asset->ff_format_options[0] = 0;
 		FFMPEG::set_asset_format(format->asset, format->mwindow->edl, text);
 		format->update_extension();
 		format->close_format_windows();