projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework playback speed and speed auto sampling, change conver to transcode, change...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
fileffmpeg.C
diff --git
a/cinelerra-5.1/cinelerra/fileffmpeg.C
b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 2e812301c7a63796a980bc7a708b21efa8a18362..564306e656e82fce65b89cbe7555cde7bc72f902 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/fileffmpeg.C
@@
-476,8
+476,8
@@
FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset,
FFMPEGConfigAudio::~FFMPEGConfigAudio()
{
FFMPEGConfigAudio::~FFMPEGConfigAudio()
{
- delete ff_options_dialog;
lock_window("FFMPEGConfigAudio::~FFMPEGConfigAudio");
lock_window("FFMPEGConfigAudio::~FFMPEGConfigAudio");
+ delete ff_options_dialog;
delete preset_popup;
presets.remove_all_objects();
unlock_window();
delete preset_popup;
presets.remove_all_objects();
unlock_window();
@@
-1540,7
+1540,7
@@
int FFOptionsWindow::resize_event(int w, int h)
int y0 = units->get_y();
text->reposition_window(x0,y0, x1-x0-xs8);
panel_w = get_w()-xs10 - panel_x;
int y0 = units->get_y();
text->reposition_window(x0,y0, x1-x0-xs8);
panel_w = get_w()-xs10 - panel_x;
- panel_h = get_h()-ys10 - panel_y;
+ panel_h = get_h()-ys10 - panel_y
- BC_OKButton::calculate_h()
;
panel->reposition_window(panel_x,panel_y, panel_w, panel_h);
return 1;
}
panel->reposition_window(panel_x,panel_y, panel_w, panel_h);
return 1;
}
@@
-1649,7
+1649,9
@@
FFOptionsAudioDialog::~FFOptionsAudioDialog()
void FFOptionsAudioDialog::update_options(const char *options)
{
void FFOptionsAudioDialog::update_options(const char *options)
{
+ aud_config->lock_window("FFOptionsAudioDialog::update_options");
aud_config->audio_options->update(options);
aud_config->audio_options->update(options);
+ aud_config->unlock_window();
}
FFOptionsVideoDialog::FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config)
}
FFOptionsVideoDialog::FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config)
@@
-1664,7
+1666,9
@@
FFOptionsVideoDialog::~FFOptionsVideoDialog()
void FFOptionsVideoDialog::update_options(const char *options)
{
void FFOptionsVideoDialog::update_options(const char *options)
{
+ vid_config->lock_window("FFOptionsVideoDialog::update_options");
vid_config->video_options->update(options);
vid_config->video_options->update(options);
+ vid_config->unlock_window();
}
}