X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_video_dialog.h;h=3d5ff540305d9e40db49d672dad6a2ed0fe93406;hb=0796ccfb652dd31ea1d94526e0e6d92863a972b0;hp=12409895eefa73052cd2e8ed64dca43934804896;hpb=0c3e840700a915fc1476cef73c591048f688f81e;p=ardour.git

diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h
index 12409895ee..3d5ff54030 100644
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@@ -17,13 +17,15 @@
     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__
 
 #include <string>
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <gtkmm.h>
 
 #include "ardour/types.h"
@@ -33,8 +35,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 +53,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 +63,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,10 +77,13 @@ 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;
 
+	Gtk::VBox server_index_box;
+	Gtk::VBox file_chooser_box;
+	Gtk::HBox browser_container;
+
 	/* Harvid Browser related */
 	class HarvidColumns : public Gtk::TreeModel::ColumnRecord
 	{
@@ -106,8 +112,9 @@ class AddVideoDialog : public ArdourDialog
 	HarvidColumns harvid_list_columns;
 	Glib::RefPtr<Gtk::ListStore> harvid_list;
 	Gtk::TreeView harvid_list_view;
+
+	bool show_advanced;
+	bool loaded_docroot;
 };
 
 #endif /* __gtk_ardour_add_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */