From 0c3e840700a915fc1476cef73c591048f688f81e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 12 Mar 2013 22:00:09 +0100 Subject: videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git --- libs/ardour/ardour/session_configuration_vars.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/ardour/ardour/session_configuration_vars.h') diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index 3e2d21d107..1f8b2356d1 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -55,3 +55,7 @@ CONFIG_VARIABLE (std::string, timecode_generator_offset, "timecode-generator-off CONFIG_VARIABLE (bool, glue_new_markers_to_bars_and_beats, "glue-new-markers-to-bars-and-beats", false) CONFIG_VARIABLE (bool, midi_copy_is_fork, "midi-copy-is-fork", false) CONFIG_VARIABLE (bool, glue_new_regions_to_bars_and_beats, "glue-new-regions-to-bars-and-beats", false) +#ifdef WITH_VIDEOTIMELINE +CONFIG_VARIABLE (bool, use_video_file_fps, "use-video-file-fps", false) +CONFIG_VARIABLE (bool, videotimeline_pullup, "videotimeline-pullup", true) +#endif -- cgit v1.2.3