Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / export_video_dialog.h

diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h
index f1c996de3038d713619da64e23bb5180d15e99de..93fe7fb5c2072df2ae031cd6e01f82e3f873b115 100644 (file)
--- a/gtk2_ardour/export_video_dialog.h
+++ b/gtk2_ardour/export_video_dialog.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __gtk_ardour_export_video_dialog_h__
 #define __gtk_ardour_export_video_dialog_h__
 
@@ -30,6 +28,7 @@
 #include "ardour/template_utils.h"
 #include "ardour_dialog.h"
 
+#include "time_selection.h"
 #include "transcode_ffmpeg.h"
 
 /** @class ExportVideoDialog
@@ -42,19 +41,28 @@
 class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 {
   public:
-       ExportVideoDialog (PublicEditor&, ARDOUR::Session*);
+       ExportVideoDialog ();
        ~ExportVideoDialog ();
 
        std::string get_exported_filename () { return outfn_path_entry.get_text(); }
 
+       void apply_state(TimeSelection &tme, bool range);
+
+       XMLNode& get_state ();
+       void set_state (const XMLNode &);
+
   private:
-       PublicEditor& editor;
+       TimeSelection export_range;
 
        void on_show ();
        void abort_clicked ();
        void launch_export ();
        void encode_pass (int);
        void change_file_extension (std::string);
+       void width_value_changed ();
+       void height_value_changed ();
+
+       void set_original_file_information ();
 
        void open_outfn_dialog ();
        void open_invid_dialog ();
@@ -64,8 +72,10 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
        void aspect_checkbox_toggled ();
        void fps_checkbox_toggled ();
 
-       bool aborted;
-       bool twopass;
+       bool _aborted;
+       bool _twopass;
+       bool _firstpass;
+       bool _normalize;
 
        void finished ();
        void update_progress (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
@@ -73,10 +83,14 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
        boost::shared_ptr<ARDOUR::ExportStatus> status;
        sigc::connection audio_progress_connection;
        gint audio_progress_display ();
-       float previous_progress;
+       float _previous_progress;
+
+       TranscodeFfmpeg *_transcoder;
+       std::string _insnd;
 
-       TranscodeFfmpeg *transcoder;
-       std::string insnd;
+       float _video_source_aspect_ratio;
+       bool _suspend_signals;
+       bool _suspend_dirty;
 
        Gtk::Label        outfn_path_label;
        Gtk::Entry        outfn_path_entry;
@@ -102,6 +116,7 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
        Gtk::ComboBoxText preset_combo;
 
        Gtk::CheckButton  scale_checkbox;
+       Gtk::CheckButton  scale_aspect;
        Gtk::Adjustment   width_adjustment;
        Gtk::SpinButton   width_spinner;
        Gtk::Adjustment   height_adjustment;
@@ -123,5 +138,3 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 };
 
 #endif /* __gtk_ardour_export_video_dialog_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */