Merge branch 'master' into windows

[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 5a29d129ae9779917bfd3ccbfb14652b08c70ed7..3963bb6cd3f2c59b613cb7de45b38de4f38dcdbf 100644 (file)
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <cstdio>
 #include <string>
 #include <sstream>
@@ -30,7 +28,8 @@
 #include <fcntl.h>
 
 #include <sigc++/bind.h>
-#include <libgen.h>
+
+#include <glib/gstdio.h>
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
@@ -52,6 +51,7 @@ using namespace Gtk;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        : ArdourDialog (_("Transcode/Import Video File "))
@@ -68,7 +68,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        , bitrate_adjustment (2000, 500, 10000, 10, 100, 0)
        , bitrate_spinner (bitrate_adjustment)
 #if 1 /* tentative debug mode */
-       , debug_checkbox (_("Debug Mode: Print ffmpeg Command and Output to stdout."))
+       , debug_checkbox (_("Debug Mode: Print ffmpeg command and output to stdout."))
 #endif
 {
        set_session (s);
@@ -79,7 +79,6 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        aborted = false;
 
        set_name ("TranscodeVideoDialog");
-       set_position (Gtk::WIN_POS_MOUSE);
        set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
@@ -91,7 +90,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
        int w = 0, h = 0;
        m_aspect = 4.0/3.0;
-       AudioStreams as; as.clear();
+       TranscodeFfmpeg::FFAudioStreams as; as.clear();
 
        path_hbox->pack_start (path_label, false, false, 3);
        path_hbox->pack_start (path_entry, true, true, 3);
@@ -112,7 +111,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 
        bool ffok = false;
        if (!transcoder->ffexec_ok()) {
-               l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log widow for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+               l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
                l->set_line_wrap();
                options_box->pack_start (*l, false, true, 4);
                aspect_checkbox.set_sensitive(false);
@@ -230,7 +229,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
        t->attach (audio_combo, 1, 4, 2, 3);
        audio_combo.append_text("No audio");
        if (as.size() > 0) {
-               for (AudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
+               for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
                        audio_combo.append_text((*it).name);
                }
        }
@@ -304,9 +303,9 @@ void
 TranscodeVideoDialog::finished ()
 {
        if (aborted) {
-               unlink(path_entry.get_text().c_str());
+               ::g_unlink(path_entry.get_text().c_str());
                if (!audiofile.empty()) {
-                       unlink(audiofile.c_str());
+                       ::g_unlink(audiofile.c_str());
                }
                Gtk::Dialog::response(RESPONSE_CANCEL);
        } else {
@@ -391,7 +390,7 @@ TranscodeVideoDialog::launch_transcode ()
        if (scale_combo.get_active_row_number() == 0 ) {
                scale_width =0;
        } else {
-         scale_width = atoi(scale_combo.get_active_text().c_str());
+         scale_width = atoi(scale_combo.get_active_text());
        }
        if (!aspect_checkbox.get_active()) {
                scale_height = 0;
@@ -446,7 +445,7 @@ TranscodeVideoDialog::scale_combo_changed ()
                if (scale_combo.get_active_row_number() == 0 ) {
                        h = transcoder->get_height();
                } else {
-                       h = floor(atof(scale_combo.get_active_text().c_str()) / m_aspect);
+                       h = floor(atof(scale_combo.get_active_text()) / m_aspect);
                }
                height_spinner.set_value(h);
        }
@@ -480,7 +479,7 @@ TranscodeVideoDialog::update_bitrate ()
        if (scale_combo.get_active_row_number() == 0 ) {
                br *= transcoder->get_width();
        } else {
-               br *= atof(scale_combo.get_active_text().c_str());
+               br *= atof(scale_combo.get_active_text());
        }
        if (br != 0) {
                bitrate_spinner.set_value(floor(br/10000.0)*10);
@@ -512,5 +511,3 @@ TranscodeVideoDialog::import_option() {
        int i = video_combo.get_active_row_number();
        return static_cast<VtlTranscodeOption>(i);
 }
-
-#endif /* WITH_VIDEOTIMELINE */