diff options
| author | Robin Gareus <robin@gareus.org> | 2013-03-28 13:41:36 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-03-28 13:42:51 +0100 |
| commit | a1429ed39f142ccf8cde558891cbe59ca97a9922 (patch) | |
| tree | 12489269635ea4a6f17e4061e86ef8c709e152d3 /gtk2_ardour/video_timeline.cc | |
| parent | e18b95b4f4c7a92be3146837835ecf0f8f3c9ba8 (diff) | |
vtl: simple/localhost mode.
Hide most of the setup complexity that is irrelevant when
running the video-server on the same host as Ardour.
Add an abstraction layer to the config which will become
important later when /building in/ the video-server.
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index f751866ba7..e214341d20 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -61,8 +61,8 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int in video_aspect_ratio = 4.0/3.0; open_video_monitor_dialog = 0; Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context()); - video_server_url = Config->get_video_server_url(); - server_docroot = Config->get_video_server_docroot(); + video_server_url = video_get_server_url(Config); + server_docroot = video_get_docroot(Config); video_filename = ""; local_file = true; video_file_fps = 25.0; @@ -616,9 +616,12 @@ void VideoTimeLine::parameter_changed (std::string const & p) { if (p == "video-server-url") { - set_video_server_url (Config->get_video_server_url ()); + set_video_server_url (video_get_server_url(Config)); } else if (p == "video-server-docroot") { - set_video_server_docroot (Config->get_video_server_docroot ()); + set_video_server_docroot (video_get_docroot(Config)); + } else if (p == "video-advanced-setup") { + set_video_server_url (video_get_server_url(Config)); + set_video_server_docroot (video_get_docroot(Config)); } if (p == "use-video-file-fps" || p == "videotimeline-pullup" ) { /* session->config parameter */ VtlUpdate(); |