diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
| commit | 5399425f534e2d96d07cf29f427bfa0f39d904b7 (patch) | |
| tree | b2134c0b8e624b9df89904b942909ea3a688c563 /libs/ardour/ardour/export_format_manager.h | |
| parent | 529a31bde7d17cade6c942e11e098f2c37d984a3 (diff) | |
| parent | c464feb6aa96226856305531fedb8fba2e06689e (diff) | |
Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/export_handler.h
libs/ardour/system_exec.cc
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc
Diffstat (limited to 'libs/ardour/ardour/export_format_manager.h')
| -rw-r--r-- | libs/ardour/ardour/export_format_manager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h index 9a95111509..dad7d84b72 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -100,6 +100,8 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList void select_with_cue (bool); void select_with_toc (bool); + void select_upload (bool); + void set_command (std::string); void select_src_quality (ExportFormatBase::SRCQuality value); void select_trim_beginning (bool value); void select_silence_beginning (AnyTime const & time); |