projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
transcode_video_dialog.cc
diff --git
a/gtk2_ardour/transcode_video_dialog.cc
b/gtk2_ardour/transcode_video_dialog.cc
index d4ad8a24ed9a2bd3acf73642aea892bf8b6ec8c6..16bfc36995c0268145c9c7aefea0cf4e8080de94 100644
(file)
--- a/
gtk2_ardour/transcode_video_dialog.cc
+++ b/
gtk2_ardour/transcode_video_dialog.cc
@@
-28,7
+28,8
@@
#include <fcntl.h>
#include <sigc++/bind.h>
#include <fcntl.h>
#include <sigc++/bind.h>
-#include <libgen.h>
+
+#include <glib/gstdio.h>
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/error.h"
#include "pbd/convert.h"
@@
-40,7
+41,6
@@
#include "ardour_ui.h"
#include "gui_thread.h"
#include "ardour_ui.h"
#include "gui_thread.h"
-#include "utils.h"
#include "opts.h"
#include "transcode_video_dialog.h"
#include "utils_videotl.h"
#include "opts.h"
#include "transcode_video_dialog.h"
#include "utils_videotl.h"
@@
-178,16
+178,18
@@
TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
options_box->pack_start (*l, false, true, 4);
video_combo.set_name ("PaddedButton");
options_box->pack_start (*l, false, true, 4);
video_combo.set_name ("PaddedButton");
- video_combo.append_text(_("Do Not Import Video"));
- video_combo.append_text(_("Reference From Current Location"));
+ video_combo.append_text(_("Reference From Current Location (Previously Transcoded Files Only)"));
if (ffok) {
video_combo.append_text(_("Import/Transcode Video to Session"));
if (ffok) {
video_combo.append_text(_("Import/Transcode Video to Session"));
- video_combo.set_active(2);
- } else {
video_combo.set_active(1);
video_combo.set_active(1);
+ } else {
+ video_combo.set_active(0);
video_combo.set_sensitive(false);
audio_combo.set_sensitive(false);
}
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);
options_box->pack_start (video_combo, false, false, 4);
@@
-226,8
+228,11
@@
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);
t->attach (*l, 0, 1, 2, 3);
audio_combo.set_name ("PaddedButton");
t->attach (audio_combo, 1, 4, 2, 3);
- audio_combo.append_text("No audio");
- if (as.size() > 0) {
+ 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"));
for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
audio_combo.append_text((*it).name);
}
for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
audio_combo.append_text((*it).name);
}
@@
-302,9
+307,9
@@
void
TranscodeVideoDialog::finished ()
{
if (aborted) {
TranscodeVideoDialog::finished ()
{
if (aborted) {
- unlink(path_entry.get_text().c_str());
+
::g_
unlink(path_entry.get_text().c_str());
if (!audiofile.empty()) {
if (!audiofile.empty()) {
- unlink(audiofile.c_str());
+
::g_
unlink(audiofile.c_str());
}
Gtk::Dialog::response(RESPONSE_CANCEL);
} else {
}
Gtk::Dialog::response(RESPONSE_CANCEL);
} else {
@@
-365,7
+370,7
@@
TranscodeVideoDialog::dialog_progress_mode ()
void
TranscodeVideoDialog::launch_transcode ()
{
void
TranscodeVideoDialog::launch_transcode ()
{
- if (video_combo.get_active_row_number() !=
2
) {
+ if (video_combo.get_active_row_number() !=
1
) {
launch_audioonly();
return;
}
launch_audioonly();
return;
}
@@
-414,8
+419,8
@@
TranscodeVideoDialog::launch_transcode ()
void
TranscodeVideoDialog::video_combo_changed ()
{
void
TranscodeVideoDialog::video_combo_changed ()
{
- int i = video_combo.get_active_row_number();
- if (i !=
2
) {
+
const
int i = video_combo.get_active_row_number();
+ if (i !=
1
) {
scale_combo.set_sensitive(false);
aspect_checkbox.set_sensitive(false);
height_spinner.set_sensitive(false);
scale_combo.set_sensitive(false);
aspect_checkbox.set_sensitive(false);
height_spinner.set_sensitive(false);
@@
-428,12
+433,19
@@
TranscodeVideoDialog::video_combo_changed ()
bitrate_checkbox.set_sensitive(true);
bitrate_spinner.set_sensitive(true);
}
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 ()
{
}
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
}
void