Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_videotimeline.cc

diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index a58a896fdd6f0341e4bfb0af82fc1da3b851959f..e1adb6c8b6faa35f9d30e71ef18bdb63810b6890 100644 (file)
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -17,22 +17,23 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
 
 #include <jack/types.h>
 
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioregion.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
-#include "simplerect.h"
-#include "canvas_impl.h"
+#include "canvas/rectangle.h"
 #include "editing.h"
 #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 "i18n.h"
 
@@ -46,7 +47,7 @@ Editor::set_video_timeline_height (const int h)
   videotl_bar_height = h;
        const double nh = (videotl_bar_height * timebar_height - ((ARDOUR::Profile->get_sae())?1.0:0.0));
        videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height);
-       videotl_bar->property_y2().set_value(nh);
+       videotl_bar->set_y1(nh);
        ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height);
        update_ruler_visibility();
 }
@@ -95,11 +96,27 @@ Editor::embed_audio_from_video (std::string path, framepos_t n)
        vector<std::string> paths;
        paths.push_back(path);
 #if 0
-       do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, n);
-#else
        do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, n);
-       unlink(path.c_str());
+#else
+       current_interthread_info = &import_status;
+       import_status.current = 1;
+       import_status.total = paths.size ();
+       import_status.all_done = false;
+
+       ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import"));
+       ipw.show ();
+
+       boost::shared_ptr<ARDOUR::Track> track;
+       bool ok = (import_sndfiles (paths, 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);
+               _session->save_state ("");
+       }
+
+       import_status.all_done = true;
 #endif
+       unlink(path.c_str());
 }
 
 void
@@ -121,5 +138,3 @@ Editor::export_video ()
        }
 #endif
 }
-
-#endif /* WITH_VIDEOTIMELINE */