enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / editor_videotimeline.cc

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 2526d7c16a3cc9190c2aea2528ca30d142986b5a..e5f5db34653ec38189c89418b748485de9d078c5 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -18,9 +18,7 @@
 
 */
 
-#include <jack/types.h>
-
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
@@ -34,11 +32,10 @@
 #include "audio_time_axis.h"
 #include "video_image_frame.h"
 #include "export_video_dialog.h"
-#include "export_video_infobox.h"
 #include "interthread_progress_window.h"
 
 #include "pbd/openuri.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -82,13 +79,10 @@ Editor::toggle_video_timeline_locked ()
 }
 
 void
-Editor::embed_audio_from_video (std::string path, framepos_t n)
+Editor::embed_audio_from_video (std::string path, framepos_t n, bool lock_position_to_video)
 {
        vector<std::string> paths;
        paths.push_back(path);
-#if 0
-       do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n);
-#else
        current_interthread_info = &import_status;
        import_status.current = 1;
        import_status.total = paths.size ();
@@ -100,35 +94,13 @@ Editor::embed_audio_from_video (std::string path, framepos_t n)
        boost::shared_ptr<ARDOUR::Track> track;
        bool ok = (import_sndfiles (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n, 1, 1, track, false) == 0);
        if (ok && track) {
-               boost::shared_ptr<ARDOUR::Playlist> pl = track->playlist();
-               pl->find_next_region(n, ARDOUR::End, 0)->set_video_locked(true);
+               if (lock_position_to_video) {
+                       boost::shared_ptr<ARDOUR::Playlist> pl = track->playlist();
+                       pl->find_next_region(n, ARDOUR::End, 0)->set_video_locked(true);
+               }
                _session->save_state ("");
        }
 
        import_status.all_done = true;
-#endif
        ::g_unlink(path.c_str());
 }
-
-void
-Editor::export_video (bool range)
-{
-       if (ARDOUR::Config->get_show_video_export_info()) {
-               ExportVideoInfobox infobox (_session);
-               Gtk::ResponseType rv = (Gtk::ResponseType) infobox.run();
-               if (infobox.show_again()) {
-                       ARDOUR::Config->set_show_video_export_info(false);
-               }
-               switch (rv) {
-                       case GTK_RESPONSE_YES:
-                               PBD::open_uri (ARDOUR::Config->get_reference_manual_url() + "/video-timeline/operations/#export");
-                               break;
-                       default:
-                               break;
-               }
-       }
-       ExportVideoDialog dialog (_session, get_selection().time, range);
-       Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
-       (void) r; // keep gcc quiet
-       dialog.hide();
-}