diff options
author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /libs/ardour/ardour/rc_configuration_vars.h | |
parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'libs/ardour/ardour/rc_configuration_vars.h')
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index f1a7e9c428..f19f8fe808 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -216,10 +216,9 @@ CONFIG_VARIABLE (std::string, reference_manual_url, "reference-manual-url", "htt CONFIG_VARIABLE (std::string, updates_url, "updates-url", "http://ardour.org/whatsnew.html") CONFIG_VARIABLE (std::string, donate_url, "donate-url", "http://ardour.org/donate") -#ifdef WITH_VIDEOTIMELINE +/* video timeline configuration */ CONFIG_VARIABLE (bool, video_advanced_setup, "video-advanced-setup", false) CONFIG_VARIABLE (std::string, video_server_url, "video-server-url", "http://localhost:1554") CONFIG_VARIABLE (std::string, video_server_docroot, "video-server-docroot", "/") CONFIG_VARIABLE (bool, show_video_export_info, "show-video-export-info", true) CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", false) -#endif |