smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

[P4/git history rebuild] changes caused by missing Ardour commits related to video transcoding. These will need to be reinstated in some future mega merge. Plus usual Stock:: replacement with strings

Browse source
This commit is contained in:
Valeriy Kamyshniy 2014-05-27 21:47:17 -04:00 • committed by Paul Davis
parent ff9f18edb5
commit 90d6b7e500
1 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
gtk2_ardour/transcode_video_dialog.cc
View file

@ -179,18 +179,16 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
options_box->pack_start (*l, false, true, 4);
video_combo.set_name ("PaddedButton");
video_combo.append_text(_("Reference From Current Location (Previously Transcoded Files Only)"));
video_combo.append_text(_("Do Not Import Video"));
video_combo.append_text(_("Reference From Current Location"));
if (ffok) {
video_combo.append_text(_("Import/Transcode Video to Session"));
video_combo.set_active(1);
video_combo.set_active(2);
} else {
video_combo.set_active(0);
video_combo.set_active(1);
video_combo.set_sensitive(false);
audio_combo.set_sensitive(false);
}
if (as.size() > 0) {
video_combo.append_text(_("Do Not Import Video (Audio Import Only)"));
}
options_box->pack_start (video_combo, false, false, 4);
@ -229,11 +227,8 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
t->attach (*l, 0, 1, 2, 3);
audio_combo.set_name ("PaddedButton");
t->attach (audio_combo, 1, 4, 2, 3);
if (as.size() == 0) {
audio_combo.append_text(_("No Audio Track Present"));
audio_combo.set_sensitive(false);
} else {
audio_combo.append_text(_("Do Not Extract Audio"));
audio_combo.append_text("No audio");
if (as.size() > 0) {
for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
audio_combo.append_text((*it).name);
}
@ -269,7 +264,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
update_bitrate();
cancel_button = add_button (Stock::CANCEL, RESPONSE_CANCEL);
cancel_button = add_button ("CANCEL", RESPONSE_CANCEL);
get_action_area()->pack_start (transcode_button, false, false);
show_all_children ();
progress_box->hide();
@ -371,7 +366,7 @@ TranscodeVideoDialog::dialog_progress_mode ()
void
TranscodeVideoDialog::launch_transcode ()
{
if (video_combo.get_active_row_number() != 1) {
if (video_combo.get_active_row_number() != 2) {
launch_audioonly();
return;
}
@ -420,8 +415,8 @@ TranscodeVideoDialog::launch_transcode ()
void
TranscodeVideoDialog::video_combo_changed ()
{
const int i = video_combo.get_active_row_number();
if (i != 1) {
int i = video_combo.get_active_row_number();
if (i != 2) {
scale_combo.set_sensitive(false);
aspect_checkbox.set_sensitive(false);
height_spinner.set_sensitive(false);
@ -434,19 +429,12 @@ TranscodeVideoDialog::video_combo_changed ()
bitrate_checkbox.set_sensitive(true);
bitrate_spinner.set_sensitive(true);
}
if (i == 2 && audio_combo.get_active_row_number() == 0) {
audio_combo.set_active(1);
}
}
void
TranscodeVideoDialog::audio_combo_changed ()
{
if (video_combo.get_active_row_number() == 2
&& audio_combo.get_active_row_number() == 0)
{
audio_combo.set_active(1);
}
;
}
void
@ -504,8 +492,8 @@ TranscodeVideoDialog::open_browse_dialog ()
Gtk::FileChooserDialog dialog(_("Save Transcoded Video File"), Gtk::FILE_CHOOSER_ACTION_SAVE);
dialog.set_filename (path_entry.get_text());
dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
dialog.add_button("CANCEL", Gtk::RESPONSE_CANCEL);
dialog.add_button("OK", Gtk::RESPONSE_OK);
int result = dialog.run();