diff options
| author | Robin Gareus <robin@gareus.org> | 2013-03-28 16:58:30 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-03-28 16:58:30 +0100 |
| commit | 950643462a2d5d3046e87437b9b51e414247c7a2 (patch) | |
| tree | 3439acf37aea3a4081ca010630a8856ac0874cff | |
| parent | b47e71f8ac96e9a6e3beb76f3b7cf1001946aea8 (diff) | |
vtl: prepare audio offset on A/V import
| -rw-r--r-- | gtk2_ardour/editor.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_videotimeline.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/public_editor.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index b082a80f21..8ecd5cc07d 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1455,7 +1455,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void toggle_video_timeline_locked (); void set_video_timeline_locked (const bool); void queue_visual_videotimeline_update (); - void embed_audio_from_video (std::string); + void embed_audio_from_video (std::string, framepos_t n = 0); #endif bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 18a49fc9b6..a58a896fdd 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -90,10 +90,9 @@ Editor::toggle_video_timeline_locked () } void -Editor::embed_audio_from_video (std::string path) +Editor::embed_audio_from_video (std::string path, framepos_t n) { vector<std::string> paths; - framepos_t n = 0; /* -1: use file's timestamp - but br0ken with ffmpeg wav extract */ paths.push_back(path); #if 0 do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, n); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 788951f143..0dabc5f5e8 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -299,7 +299,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { virtual void set_xjadeo_sensitive (bool onoff) = 0; virtual int get_videotl_bar_height () const = 0; virtual void set_video_timeline_height (const int h) = 0; - virtual void embed_audio_from_video (std::string) = 0; + virtual void embed_audio_from_video (std::string, framepos_t n = 0) = 0; virtual void export_video () = 0; #endif |