X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=7d94acdc8bda3dd592e139cc09d60efe116f94c9;hp=d3685e02dc692babaa532a8e54a22ae7142d6094;hb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;hpb=190b4810ec184c74ceab3fcd6faf09a91c92c53c diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C index d3685e02..7d94acdc 100644 --- a/cinelerra-5.1/cinelerra/formattools.C +++ b/cinelerra-5.1/cinelerra/formattools.C @@ -62,13 +62,10 @@ FormatTools::FormatTools(MWindow *mwindow, format_button = 0; format_text = 0; audio_title = 0; - audio_switch = 0; video_title = 0; - video_switch = 0; channels_title = 0; channels_button = 0; multiple_files = 0; - file_entries = 0; w = window->get_w(); recording = 0; @@ -104,31 +101,24 @@ 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, - int &init_y, - int do_audio, // Include support for audio - int do_video, // Include support for video - int prompt_audio, // Include checkbox for audio - int prompt_video, - int prompt_audio_channels, - int prompt_video_compression, - const char *locked_compressor, - int recording, - int *strategy, - int brender, - int horizontal_layout) +void FormatTools::create_objects( + int &init_x, int &init_y, + int do_audio, int do_video, // Include support for audio, video + int prompt_audio, int prompt_video, // Include checkbox for audio, video + int prompt_audio_channels, + int prompt_video_compression, + const char *locked_compressor, + int recording, + int *strategy, + int brender, + int horizontal_layout) { int x = init_x; int y = init_y; int ylev = init_y; + int margin = mwindow->theme->widget_border; this->locked_compressor = locked_compressor; this->recording = recording; @@ -141,19 +131,6 @@ void FormatTools::create_objects(int &init_x, this->prompt_video_compression = prompt_video_compression; this->strategy = strategy; - - file_entries = new ArrayList; - 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 @@ -179,21 +156,20 @@ void FormatTools::create_objects(int &init_x, if(!recording) { - window->add_subwindow(path_textbox = new FormatPathText(x, y, this)); - x += path_textbox->get_w() + 5; + int px = x; + window->add_subwindow(path_textbox = new FormatPathText(px, y, this)); + px += path_textbox->get_w() + 5; path_recent = new BC_RecentList("PATH", mwindow->defaults, - path_textbox, 10, x, y, 300, 100); + path_textbox, 10, px, y, 300, 100); window->add_subwindow(path_recent); path_recent->load_items(File::formattostr(asset->format)); - x += path_recent->get_w() + 8; + px += path_recent->get_w(); window->add_subwindow(path_button = new BrowseButton( - mwindow, window, path_textbox, x, 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. w = MAX(w, 305); -// w = x + path_button->get_w() + 5; - x -= path_textbox->get_w() + 5; y += path_textbox->get_h() + 10; } else @@ -204,29 +180,28 @@ void FormatTools::create_objects(int &init_x, x = init_x; window->add_subwindow(format_title = new BC_Title(x, y, _("File Format:"))); - x += 90; - window->add_subwindow(format_text = new BC_TextBox(x, y, 180, 1, + x += format_title->get_w() + margin; + window->add_subwindow(format_text = new BC_TextBox(x, y, 160, 1, File::formattostr(asset->format))); - x += format_text->get_w(); + 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(); x += format_button->get_w() + 5; - window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 50, 1, asset->fformat)); + window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 64, 1, asset->fformat)); FFMPEG::set_asset_format(asset, asset->fformat); x += ffmpeg_type->get_w(); window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this)); format_ffmpeg->create_objects(); x = init_x; y += format_button->get_h() + 10; - if(do_audio) - { - window->add_subwindow(audio_title = new BC_Title(x, y, _("Audio:"), LARGEFONT, BC_WindowBase::get_resources()->audiovideo_color)); - x += 80; + if( do_audio ) { + window->add_subwindow(audio_title = new BC_Title(x, y, _("Audio:"), LARGEFONT, + BC_WindowBase::get_resources()->audiovideo_color)); + x += audio_title->get_w() + margin; window->add_subwindow(aparams_button = new FormatAParams(mwindow, this, x, y)); - x += aparams_button->get_w() + 10; - if(prompt_audio) - { + x += aparams_button->get_w() + margin; + if(prompt_audio) { window->add_subwindow(audio_switch = new FormatAudio(x, y, this, asset->audio_data)); } x = init_x; @@ -250,30 +225,27 @@ void FormatTools::create_objects(int &init_x, } //printf("FormatTools::create_objects 7\n"); - if(do_video) - { - if(horizontal_layout && do_audio){ + if( do_video ) { + if( horizontal_layout && do_audio ) { x += 370; y = ylev; } //printf("FormatTools::create_objects 8\n"); - window->add_subwindow(video_title = new BC_Title(x, y, _("Video:"), LARGEFONT, BC_WindowBase::get_resources()->audiovideo_color)); - x += 80; - if(prompt_video_compression) - { + window->add_subwindow(video_title = new BC_Title(x, y, _("Video:"), LARGEFONT, + BC_WindowBase::get_resources()->audiovideo_color)); + x += video_title->get_w() + margin; + if(prompt_video_compression) { window->add_subwindow(vparams_button = new FormatVParams(mwindow, this, x, y)); - x += vparams_button->get_w() + 10; + x += vparams_button->get_w() + margin; } //printf("FormatTools::create_objects 9\n"); - if(prompt_video) - { + if(prompt_video) { window->add_subwindow(video_switch = new FormatVideo(x, y, this, asset->video_data)); y += video_switch->get_h(); } - else - { + else { y += vparams_button->get_h(); } @@ -320,8 +292,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; @@ -333,8 +303,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; @@ -364,17 +332,17 @@ void FormatTools::update_format() { if( do_audio && prompt_audio && audio_switch ) { audio_switch->update(asset->audio_data); - if( !asset->audio_data ) - audio_switch->disable(); - else + if( File::renders_audio(asset) ) audio_switch->enable(); + else + audio_switch->disable(); } if( do_video && prompt_video && video_switch ) { video_switch->update(asset->video_data); - if( !asset->video_data ) - video_switch->disable(); - else + if( File::renders_video(asset) ) video_switch->enable(); + else + video_switch->disable(); } if( asset->format == FILE_FFMPEG ) { ffmpeg_type->show(); @@ -478,11 +446,8 @@ void FormatTools::update(Asset *asset, int *strategy) if(path_textbox) path_textbox->update(asset->path); - format_text->update(File::formattostr(plugindb, asset->format)); - if(do_audio && prompt_audio && audio_switch) - audio_switch->update(asset->audio_data); - if(do_video && prompt_video && video_switch) - video_switch->update(asset->video_data); + format_text->update(File::formattostr(asset->format)); + update_format(); if(strategy) { multiple_files->update(strategy); @@ -493,21 +458,22 @@ void FormatTools::update(Asset *asset, int *strategy) void FormatTools::close_format_windows() { // This is done in ~file - if(aparams_thread && aparams_thread->running()) - { - aparams_thread->file->close_window(); + if( aparams_thread ) { + if( aparams_thread->running() ) + aparams_thread->file->close_window(); aparams_thread->join(); } - if(vparams_thread && vparams_thread->running()) - { - vparams_thread->file->close_window(); + if( vparams_thread ) { + if( vparams_thread->running() ) + vparams_thread->file->close_window(); vparams_thread->join(); } } int FormatTools::get_w() { - return w; + return asset->format != FILE_FFMPEG ? w : + format_ffmpeg->get_x() + format_ffmpeg->get_w(); } void FormatTools::set_w(int w) @@ -522,11 +488,13 @@ void FormatTools::reposition_window(int &init_x, int &init_y) if(path_textbox) { - path_textbox->reposition_window(x, y); - x += path_textbox->get_w() + 5; - path_button->reposition_window(x, y); - x -= path_textbox->get_w() + 5; - y += 35; + int px = x; + path_textbox->reposition_window(px, y); + px += path_textbox->get_w() + 5; + path_recent->reposition_window(px, y); + px += path_recent->get_w() + 8; + path_button->reposition_window(px, y); + y += path_textbox->get_h() + 10; } format_title->reposition_window(x, y); @@ -547,7 +515,7 @@ void FormatTools::reposition_window(int &init_x, int &init_y) if(prompt_audio) audio_switch->reposition_window(x, y); x = init_x; - y += aparams_button->get_h() + 20; + y += aparams_button->get_h() + 10; if(prompt_audio_channels) { channels_title->reposition_window(x, y); @@ -688,9 +656,8 @@ FormatAThread::FormatAThread(FormatTools *format) FormatAThread::~FormatAThread() { + delete file; file = 0; join(); - delete file; - file = 0; } void FormatAThread::start() @@ -719,9 +686,8 @@ FormatVThread::FormatVThread(FormatTools *format) FormatVThread::~FormatVThread() { + delete file; file = 0; join(); - delete file; - file = 0; } void FormatVThread::start() @@ -753,11 +719,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; @@ -803,7 +765,7 @@ int FormatVideo::handle_event() FormatFormat::FormatFormat(int x, int y, FormatTools *format) - : FormatPopup(format->plugindb, x, y, format->use_brender) + : FormatPopup(x, y, format->do_audio, format->do_video, format->use_brender) { this->format = format; } @@ -816,17 +778,18 @@ int FormatFormat::handle_event() { BC_ListBoxItem *selection = get_selection(0, 0); if( selection ) { - int new_format = File::strtoformat(format->plugindb, get_selection(0, 0)->get_text()); + int new_format = File::strtoformat(get_selection(0, 0)->get_text()); // if(new_format != format->asset->format) { Asset *asset = format->asset; asset->format = new_format; - asset->audio_data = File::supports_audio(asset->format); - asset->video_data = File::supports_video(asset->format); + asset->audio_data = File::renders_audio(asset); + asset->video_data = File::renders_video(asset); asset->ff_audio_options[0] = 0; asset->ff_video_options[0] = 0; format->format_text->update(selection->get_text()); - format->update_extension(); + if( !format->use_brender ) + format->update_extension(); format->close_format_windows(); if (format->path_recent) format->path_recent-> load_items(File::formattostr(format->asset->format));