diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/directory_names.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/region.h | 12 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_configuration_vars.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_directory.h | 8 |
5 files changed, 35 insertions, 0 deletions
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h index e91ece266a..1f9c48eba3 100644 --- a/libs/ardour/ardour/directory_names.h +++ b/libs/ardour/ardour/directory_names.h @@ -27,6 +27,9 @@ extern const char* const old_sound_dir_name; extern const char* const sound_dir_name; extern const char* const midi_dir_name; extern const char* const midi_patch_dir_name; +#ifdef WITH_VIDEOTIMELINE +extern const char* const video_dir_name; +#endif extern const char* const dead_dir_name; extern const char* const interchange_dir_name; extern const char* const peak_dir_name; diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 711e6fb1af..2dc13a3660 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -214,3 +214,11 @@ CONFIG_VARIABLE (std::string, linux_pingback_url, "linux-pingback-url", "http:// CONFIG_VARIABLE (std::string, tutorial_manual_url, "tutorial-manual-url", "http://ardour.org/flossmanual") CONFIG_VARIABLE (std::string, reference_manual_url, "reference-manual-url", "http://manual.ardour.org/") CONFIG_VARIABLE (std::string, updates_url, "updates-url", "http://ardour.org/whatsnew.html") + +#ifdef WITH_VIDEOTIMELINE +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, video_monitor_setup_dialog, "video-monitor-setup-dialog", false) +CONFIG_VARIABLE (bool, show_video_export_info, "show-video-export-info", true) +CONFIG_VARIABLE (bool, show_video_server_dialog, "show-video-server-dialog", true) +#endif diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index bc8e7383f2..eaa23cc8f6 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -45,6 +45,9 @@ namespace Properties { extern PBD::PropertyDescriptor<bool> muted; extern PBD::PropertyDescriptor<bool> opaque; extern PBD::PropertyDescriptor<bool> locked; +#ifdef WITH_VIDEOTIMELINE + extern PBD::PropertyDescriptor<bool> video_locked; +#endif extern PBD::PropertyDescriptor<bool> automatic; extern PBD::PropertyDescriptor<bool> whole_file; extern PBD::PropertyDescriptor<bool> import; @@ -163,6 +166,9 @@ class Region bool opaque () const { return _opaque; } bool locked () const { return _locked; } bool position_locked () const { return _position_locked; } +#ifdef WITH_VIDEOTIMELINE + bool video_locked () const { return _video_locked; } +#endif bool valid_transients () const { return _valid_transients; } bool automatic () const { return _automatic; } bool whole_file () const { return _whole_file; } @@ -240,6 +246,9 @@ class Region void set_automatic (bool yn); void set_opaque (bool yn); void set_locked (bool yn); +#ifdef WITH_VIDEOTIMELINE + void set_video_locked (bool yn); +#endif void set_position_locked (bool yn); int apply (Filter &, Progress* progress = 0); @@ -392,6 +401,9 @@ class Region PBD::Property<bool> _muted; PBD::Property<bool> _opaque; PBD::Property<bool> _locked; +#ifdef WITH_VIDEOTIMELINE + PBD::Property<bool> _video_locked; +#endif PBD::Property<bool> _automatic; PBD::Property<bool> _whole_file; PBD::Property<bool> _import; 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 diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h index 9f4410ce69..72bc731a01 100644 --- a/libs/ardour/ardour/session_directory.h +++ b/libs/ardour/ardour/session_directory.h @@ -85,6 +85,14 @@ public: */ const std::string peak_path () const; +#ifdef WITH_VIDEOTIMELINE + /** + * @return The absolute path to the directory in which all + * video files are stored for a session. + */ + const std::string video_path () const; +#endif + /** * @return The absolute path to the directory that source * files are moved to when they are no longer part of the |