projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
full (?) set of changes required to make MonitorSection an "always-there" component...
[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 7e3cf442a777b8c823a49453cb9571cb45475e15..12c75ec1419401d35fcf6b8883e2027687476d6c 100644
(file)
--- a/
gtk2_ardour/export_video_dialog.h
+++ b/
gtk2_ardour/export_video_dialog.h
@@
-22,7
+22,13
@@
#include <string>
#include <string>
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/progressbar.h>
#include "ardour/types.h"
#include "ardour/template_utils.h"
#include "ardour/types.h"
#include "ardour/template_utils.h"
@@
-40,20
+46,33
@@
*/
class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
{
*/
class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
{
-
public:
- ExportVideoDialog (
ARDOUR::Session*, TimeSelection &tme
);
+public:
+ ExportVideoDialog ();
~ExportVideoDialog ();
std::string get_exported_filename () { return outfn_path_entry.get_text(); }
~ExportVideoDialog ();
std::string get_exported_filename () { return outfn_path_entry.get_text(); }
- private:
- TimeSelection &export_range;
+ void apply_state(TimeSelection &tme, bool range);
+
+ XMLNode& get_state ();
+ void set_state (const XMLNode &);
+
+ void on_response (int response_id) {
+ Gtk::Dialog::on_response (response_id);
+ }
+
+private:
+ TimeSelection export_range;
void on_show ();
void abort_clicked ();
void launch_export ();
void encode_pass (int);
void change_file_extension (std::string);
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 ();
void open_outfn_dialog ();
void open_invid_dialog ();
@@
-63,21
+82,25
@@
class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
void aspect_checkbox_toggled ();
void fps_checkbox_toggled ();
void aspect_checkbox_toggled ();
void fps_checkbox_toggled ();
- bool aborted;
- bool twopass;
- bool firstpass;
- bool normalize;
+ bool
_
aborted;
+ bool
_
twopass;
+ bool
_
firstpass;
+ bool
_
normalize;
void finished ();
void finished ();
- void update_progress (ARDOUR::
framecnt_t, ARDOUR::fram
ecnt_t);
+ void update_progress (ARDOUR::
samplecnt_t, ARDOUR::sampl
ecnt_t);
boost::shared_ptr<ARDOUR::ExportStatus> status;
sigc::connection audio_progress_connection;
gint audio_progress_display ();
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;
Gtk::Label outfn_path_label;
Gtk::Entry outfn_path_entry;
@@
-103,6
+126,7
@@
class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
Gtk::ComboBoxText preset_combo;
Gtk::CheckButton scale_checkbox;
Gtk::ComboBoxText preset_combo;
Gtk::CheckButton scale_checkbox;
+ Gtk::CheckButton scale_aspect;
Gtk::Adjustment width_adjustment;
Gtk::SpinButton width_spinner;
Gtk::Adjustment height_adjustment;
Gtk::Adjustment width_adjustment;
Gtk::SpinButton width_spinner;
Gtk::Adjustment height_adjustment;