X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftranscode_video_dialog.h;h=835b32d82c5da8c74f779e0a090ed7ce13eb2484;hb=651fc9f68e93cc01c2db692fd5531b7ddeac4563;hp=9d334cf0d23e83867bbbff5645c457f3e8b85703;hpb=0c3e840700a915fc1476cef73c591048f688f81e;p=ardour.git diff --git a/gtk2_ardour/transcode_video_dialog.h b/gtk2_ardour/transcode_video_dialog.h index 9d334cf0d2..835b32d82c 100644 --- a/gtk2_ardour/transcode_video_dialog.h +++ b/gtk2_ardour/transcode_video_dialog.h @@ -17,8 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef WITH_VIDEOTIMELINE - #ifndef __gtk_ardour_transcode_video_dialog_h__ #define __gtk_ardour_transcode_video_dialog_h__ @@ -32,6 +30,12 @@ #include "transcode_ffmpeg.h" +enum VtlTranscodeOption { + VTL_IMPORT_REFERENCE = 0, + VTL_IMPORT_TRANSCODED = 1, + VTL_IMPORT_NO_VIDEO = 2 +}; + /** @class TranscodeVideoDialog * @brief dialog-box and controller for importing video-files */ @@ -43,6 +47,7 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL std::string get_filename () { return path_entry.get_text(); } std::string get_audiofile () { return audiofile; } + VtlTranscodeOption import_option (); private: void on_show (); @@ -50,18 +55,16 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL void abort_clicked (); void scale_combo_changed (); void audio_combo_changed (); + void video_combo_changed (); void aspect_checkbox_toggled (); void bitrate_checkbox_toggled (); void update_bitrate (); void launch_audioonly (); void launch_transcode (); void launch_extract (); - void prepare_copy (); - void launch_copy (); void dialog_progress_mode (); bool aborted; bool pending_audio_extract; - bool pending_copy_file; std::string audiofile; std::string infn; double m_aspect; @@ -76,8 +79,6 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL Gtk::Entry path_entry; Gtk::Button browse_button; Gtk::Button transcode_button; - Gtk::Button copy_button; - Gtk::Button audio_button; Gtk::VBox* vbox; Gtk::Button *cancel_button; @@ -87,6 +88,7 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL Gtk::Label progress_label; Gtk::ProgressBar pbar; + Gtk::ComboBoxText video_combo; Gtk::ComboBoxText scale_combo; Gtk::CheckButton aspect_checkbox; Gtk::Adjustment height_adjustment; @@ -102,5 +104,3 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL }; #endif /* __gtk_ardour_transcode_video_dialog_h__ */ - -#endif /* WITH_VIDEOTIMELINE */