FFMPEGConfigAudio *window = new FFMPEGConfigAudio(parent_window, asset);
format_window = window;
window->create_objects();
- window->run_window();
+ if( !window->run_window() )
+ strcpy(asset->ff_audio_options, window->audio_options->get_text());
delete window;
}
else if(video_options) {
FFMPEGConfigVideo *window = new FFMPEGConfigVideo(parent_window, asset);
format_window = window;
window->create_objects();
- window->run_window();
+ if( !window->run_window() )
+ strcpy(asset->ff_video_options, window->video_options->get_text());
delete window;
}
}
FFMPEG::load_options(option_path, asset->ff_audio_options,
sizeof(asset->ff_audio_options));
}
+
audio_options = new FFAudioOptions(this, x, y, get_w()-x-20, 10,
sizeof(asset->ff_audio_options)-1, asset->ff_audio_options);
audio_options->create_objects();
add_subwindow(new BC_OKButton(this));
+ add_subwindow(new BC_CancelButton(this));
show_window(1);
bitrate->handle_event();
int FFMPEGConfigAudio::close_event()
{
- set_done(0);
+ set_done(1);
return 1;
}
-void FFMPEGConfigAudio::update_options()
-{
- audio_options->update(asset->ff_audio_options);
-}
-
FFAudioOptions::FFAudioOptions(FFMPEGConfigAudio *audio_popup,
int x, int y, int w, int rows, int size, char *text)
: BC_ScrollTextBox(audio_popup, x, y, w, rows, text, size)
video_options = new FFVideoOptions(this, x, y, get_w()-x-20, 10,
sizeof(asset->ff_video_options)-1, asset->ff_video_options);
video_options->create_objects();
-
add_subwindow(new BC_OKButton(this));
+ add_subwindow(new BC_CancelButton(this));
+
show_window(1);
if( asset->ff_video_bitrate )
quality->disable();
int FFMPEGConfigVideo::close_event()
{
- set_done(0);
+ set_done(1);
return 1;
}
-void FFMPEGConfigVideo::update_options()
-{
- video_options->update(asset->ff_video_options);
-}
-
FFVideoOptions::FFVideoOptions(FFMPEGConfigVideo *video_popup,
int x, int y, int w, int rows, int size, char *text)
: BC_ScrollTextBox(video_popup, x, y, w, rows, text, size)
FFOptionsWindow::FFOptionsWindow(FFOptionsDialog *dialog)
- : BC_Window(PROGRAM_NAME ": Options", 60, 30, 640, 400)
+ : BC_Window(_(PROGRAM_NAME ": Options"), 60, 30, 640, 400)
{
this->dialog = dialog;
this->selected = 0;
void FFOptionsWindow::create_objects()
{
BC_Title *title;
- int x = 10, y = 10;
- add_subwindow(title = new BC_Title(x, y, dialog->codec_name));
- y += title->get_h() + 10;
- int x0 = x, y0 = y;
- add_subwindow(title = new BC_Title(x0, y0, _("Type: ")));
- x0 += title->get_w() + 8;
- add_subwindow(type = new BC_Title(x0, y0, (char *)""));
- x0 = x + 150;
- add_subwindow(title = new BC_Title(x0, y0, _("Range: ")));
- x0 += title->get_w() + 8;
- add_subwindow(range = new BC_Title(x0, y0, (char *)""));
- x0 = x;
- y += title->get_h() + 10;
- add_subwindow(units = new FFOptionsUnits(this, x0, y, 120));
- x0 += units->get_w() + 8;
+ int x0 = 10, y0 = 10;
+ int x = x0, y = y0;
+ add_subwindow(title = new BC_Title(x, y, _("Format: ")));
+ x += title->get_w();
+ add_subwindow(new BC_Title(x, y, dialog->format_name));
+ x = x0 + 150;
+ add_subwindow(title = new BC_Title(x, y, _("Codec: ")));
+ x += title->get_w();
+ add_subwindow(new BC_Title(x, y, dialog->codec_name));
+
+ x = x0; y += title->get_h() + 10; y0 = y;
+ add_subwindow(title = new BC_Title(x, y, _("Type: ")));
+ x += title->get_w() + 8;
+ add_subwindow(type = new BC_Title(x, y, (char *)""));
+ x = x0 + 150;
+ add_subwindow(title = new BC_Title(x, y, _("Range: ")));
+ x += title->get_w() + 8;
+ add_subwindow(range = new BC_Title(x, y, (char *)""));
+
+ x = x0; y += title->get_h() + 10;
+ add_subwindow(units = new FFOptionsUnits(this, x, y, 120));
+ x += units->get_w() + 8;
int x1 = get_w() - BC_GenericButton::calculate_w(this, _("Apply")) - 8;
- add_subwindow(text = new FFOptionsText(this, x0, y, x1-x0 - 8));
+ add_subwindow(text = new FFOptionsText(this, x, y, x1-x - 8));
add_subwindow(apply = new FFOptionsApply(this, x1, y));
y += units->get_h() + 10;
add_subwindow(kind = new FFOptionsKind(this, x1, y0, apply->get_w()));
const char *kind_text = _("Kind:");
x1 -= BC_Title::calculate_w(this, kind_text) + 8;
add_subwindow(kind_title = new BC_Title(x1, y0, kind_text));
+ y0 = y;
- panel_x = x; panel_y = y;
+ panel_x = x0; panel_y = y0;
panel_w = get_w()-10 - panel_x;
panel_h = get_h()-10 - panel_y - BC_OKButton::calculate_h();
panel = new FFOptions_OptPanel(this, panel_x, panel_y, panel_w, panel_h);
this->options_window = 0;
this->codec_name = 0;
this->codec = 0;
- this->ff_options = 0;
- this->ff_len = 0;
this->ff_opts = 0;
+ this->ff_len = 0;
}
FFOptionsDialog::~FFOptionsDialog()
delete [] codec_name;
}
-void FFOptionsDialog::load_options()
+void FFOptionsDialog::load_options(const char *bp, int len)
{
char line[BCTEXTLEN];
char key[BCSTRLEN], val[BCTEXTLEN];
- char *bp = ff_options, *dp = bp + ff_len-1;
+ const char *dp = bp + len-1;
int no = 0;
while( bp < dp && *bp != 0 ) {
++no;
}
}
-void FFOptionsDialog::store_options()
+void FFOptionsDialog::store_options(char *cp, int len)
{
- char *cp = ff_options, *ep = cp + ff_len-1;
+ char *ep = cp + len-1;
AVDictionaryEntry *elem = 0;
while( (elem=av_dict_get(ff_opts, "", elem, AV_DICT_IGNORE_SUFFIX)) != 0 ) {
if( elem->key[0] == '#' ) {
*cp = 0;
}
-void FFOptionsDialog::start(const char *codec_name, AVCodec *codec, char *options, int len)
+void FFOptionsDialog::start(const char *format_name, const char *codec_name,
+ AVCodec *codec, const char *options, int len)
{
if( options_window ) {
options_window->lock_window("FFOptionsDialog::start");
return;
}
+ this->format_name = cstrdup(format_name);
this->codec_name = cstrdup(codec_name);
this->codec = codec;
this->ff_opts = 0;
- this->ff_options = options;
this->ff_len = len;
- load_options();
+ load_options(options, len);
BC_DialogThread::start();
}
void FFOptionsDialog::handle_done_event(int result)
{
if( !result ) {
- store_options();
- update_options();
+ char options[ff_len];
+ store_options(options, ff_len);
+ update_options(options);
}
options_window = 0;
+ delete [] format_name; format_name = 0;
delete [] codec_name; codec_name = 0;
av_dict_free(&ff_opts);
}
close_window();
}
-void FFOptionsAudioDialog::update_options()
+void FFOptionsAudioDialog::update_options(const char *options)
{
- aud_config->update_options();
+ aud_config->audio_options->update(options);
}
FFOptionsVideoDialog::FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config)
close_window();
}
-void FFOptionsVideoDialog::update_options()
+void FFOptionsVideoDialog::update_options(const char *options)
{
- vid_config->update_options();
+ vid_config->video_options->update(options);
}
int FFOptionsViewAudio::handle_event()
{
- AVCodec *codec = 0;
+ char audio_format[BCSTRLEN]; audio_format[0] = 0;
char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
+ AVCodec *codec = 0;
Asset *asset = aud_config->asset;
const char *name = asset->acodec;
- if( !FFMPEG::get_codec(audio_codec, "audio", name) )
+ if( !FFMPEG::get_format(audio_format, "audio", name) &&
+ !FFMPEG::get_codec(audio_codec, "audio", name) )
codec = avcodec_find_encoder_by_name(audio_codec);
if( !codec ) {
eprintf(_("no codec named: %s: %s"), name, audio_codec);
return 1;
}
- aud_config->ff_options_dialog->start(audio_codec, codec,
- asset->ff_audio_options, sizeof(asset->ff_audio_options));
+ aud_config->ff_options_dialog->start(audio_format, audio_codec, codec,
+ asset->ff_audio_options, sizeof(asset->ff_audio_options));
return 1;
}
int FFOptionsViewVideo::handle_event()
{
- AVCodec *codec = 0;
+ char video_format[BCSTRLEN]; video_format[0] = 0;
char video_codec[BCSTRLEN]; video_codec[0] = 0;
+ AVCodec *codec = 0;
Asset *asset = vid_config->asset;
const char *name = asset->vcodec;
- if( !FFMPEG::get_codec(video_codec, "video", name) )
+ if( !FFMPEG::get_format(video_format, "video", name) &&
+ !FFMPEG::get_codec(video_codec, "video", name) )
codec = avcodec_find_encoder_by_name(video_codec);
if( !codec ) {
eprintf(_("no codec named: %s: %s"), name, video_codec);
return 1;
}
- vid_config->ff_options_dialog->start(video_codec, codec,
- asset->ff_video_options, sizeof(asset->ff_video_options));
+ vid_config->ff_options_dialog->start(video_format, video_codec, codec,
+ asset->ff_video_options, sizeof(asset->ff_video_options));
return 1;
}
projects / goodguy / history.git / blobdiff