Merge branch 'patches' of https://github.com/jdekozak/ardour

[ardour.git] / gtk2_ardour / add_video_dialog.h

diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h
index 12409895eefa73052cd2e8ed64dca43934804896..1d91383c85c67dbe10c96051ee0ab3f73cb2693f 100644 (file)
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_add_video_dialog_h__
 #define __gtk_ardour_add_video_dialog_h__
 
@@ -33,8 +31,7 @@
 
 enum VtlImportOption {
  VTL_IMPORT_NONE = 0,
- VTL_IMPORT_COPY = 1,
- VTL_IMPORT_TRANSCODE = 2,
+ VTL_IMPORT_TRANSCODE = 1,
 };
 
 class AddVideoDialog : public ArdourDialog
@@ -52,6 +49,7 @@ class AddVideoDialog : public ArdourDialog
        void on_show ();
        bool page_switch();
        void set_action_ok(bool yn);
+       void clear_preview_image();
 
        /* preview pane related */
        void request_preview(std::string vpath);
@@ -61,7 +59,8 @@ class AddVideoDialog : public ArdourDialog
        Gtk::HScale seek_slider;
        Glib::RefPtr<Gdk::Pixbuf> imgbuf;
        std::string preview_path;
-       Gtk::Label pi_duration;
+       Gtk::Label pi_tcin;
+       Gtk::Label pi_tcout;
        Gtk::Label pi_aspect;
        Gtk::Label pi_fps;
 
@@ -74,7 +73,6 @@ class AddVideoDialog : public ArdourDialog
 
        Gtk::CheckButton  xjadeo_checkbox;
        Gtk::CheckButton  set_session_fps_checkbox;
-       Gtk::ComboBoxText import_combo;
        Gtk::Notebook notebook;
        Gtk::Button *ok_button;
 
@@ -109,5 +107,3 @@ class AddVideoDialog : public ArdourDialog
 };
 
 #endif /* __gtk_ardour_add_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */