13
0

vtl: prepare audio offset on A/V import

This commit is contained in:
Robin Gareus 2013-03-28 16:58:30 +01:00
parent b47e71f8ac
commit 950643462a
3 changed files with 3 additions and 4 deletions

View File

@ -1455,7 +1455,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void toggle_video_timeline_locked (); void toggle_video_timeline_locked ();
void set_video_timeline_locked (const bool); void set_video_timeline_locked (const bool);
void queue_visual_videotimeline_update (); void queue_visual_videotimeline_update ();
void embed_audio_from_video (std::string); void embed_audio_from_video (std::string, framepos_t n = 0);
#endif #endif
bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*);

View File

@ -90,10 +90,9 @@ Editor::toggle_video_timeline_locked ()
} }
void void
Editor::embed_audio_from_video (std::string path) Editor::embed_audio_from_video (std::string path, framepos_t n)
{ {
vector<std::string> paths; vector<std::string> paths;
framepos_t n = 0; /* -1: use file's timestamp - but br0ken with ffmpeg wav extract */
paths.push_back(path); paths.push_back(path);
#if 0 #if 0
do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, n); do_embed (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, n);

View File

@ -299,7 +299,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
virtual void set_xjadeo_sensitive (bool onoff) = 0; virtual void set_xjadeo_sensitive (bool onoff) = 0;
virtual int get_videotl_bar_height () const = 0; virtual int get_videotl_bar_height () const = 0;
virtual void set_video_timeline_height (const int h) = 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; virtual void export_video () = 0;
#endif #endif