diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/export_video_dialog.h | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/export_video_dialog.h')
| -rw-r--r-- | gtk2_ardour/export_video_dialog.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h index 2594c2073b..7e3cf442a7 100644 --- a/gtk2_ardour/export_video_dialog.h +++ b/gtk2_ardour/export_video_dialog.h @@ -28,6 +28,7 @@ #include "ardour/template_utils.h" #include "ardour_dialog.h" +#include "time_selection.h" #include "transcode_ffmpeg.h" /** @class ExportVideoDialog @@ -40,13 +41,13 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList { public: - ExportVideoDialog (PublicEditor&, ARDOUR::Session*); + ExportVideoDialog (ARDOUR::Session*, TimeSelection &tme); ~ExportVideoDialog (); std::string get_exported_filename () { return outfn_path_entry.get_text(); } private: - PublicEditor& editor; + TimeSelection &export_range; void on_show (); void abort_clicked (); |