#include <sigc++/signal.h>
-#include "pbd/filesystem.h"
-
#include "ardour/audioregion.h"
#include "ardour/export_status.h"
#include "ardour/export_handler.h"
#include "export_dialog.h"
#include "gui_thread.h"
+#include "nag.h"
#include "i18n.h"
/* Warnings */
preset_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::sync_with_manager));
- timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
- channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
- file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
+ timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
+ channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
+ file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
status->Aborting.connect (abort_connection, invalidator (*this), boost::bind (&ExportDialog::notify_errors, this), gui_context());
- update_warnings ();
+ update_warnings_and_example_filename ();
}
void
/* Progress indicators */
- progress_widget.pack_start (progress_label, false, false, 6);
progress_widget.pack_start (progress_bar, false, false, 6);
- progress_widget.pack_start (normalizing_widget, false, false, 0);
- normalizing_widget.pack_start (normalizing_label, false, false, 6);
- normalizing_widget.pack_start (normalizing_bar, false, false, 6);
-
/* Buttons */
cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL);
- // Realtime export is disabled for now, as it will most probably not work
- //rt_export_button = add_button (_("Realtime Export"), RESPONSE_RT);
- //fast_export_button = add_button (_("Fast Export"), RESPONSE_FAST);
- fast_export_button = add_button (_("Export"), RESPONSE_FAST);
+ export_button = add_button (_("Export"), RESPONSE_FAST);
set_default_response (RESPONSE_FAST);
list_files_button.set_name ("PaddedButton");
cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
- //rt_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_rt));
- fast_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_fw));
+ export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::do_export));
/* Done! */
progress_widget.hide_all();
}
+void
+ExportDialog::expanded_changed ()
+{
+ set_resizable(advanced->get_expanded());
+}
+
void
ExportDialog::init_gui ()
{
preset_align->set_padding (0, 12, 0, 0);
get_vbox()->pack_start (*preset_align, false, false, 0);
- Gtk::VBox* advanced_vbox = Gtk::manage (new Gtk::VBox());
- advanced_vbox->set_spacing (12);
- advanced_vbox->set_border_width (12);
+ Gtk::VPaned * advanced_paned = Gtk::manage (new Gtk::VPaned());
+
+ Gtk::VBox* timespan_vbox = Gtk::manage (new Gtk::VBox());
+ timespan_vbox->set_spacing (12);
+ timespan_vbox->set_border_width (12);
Gtk::Alignment * timespan_align = Gtk::manage (new Gtk::Alignment());
timespan_label = Gtk::manage (new Gtk::Label (_("Time Span"), Gtk::ALIGN_LEFT));
timespan_align->add (*timespan_selector);
- timespan_align->set_padding (0, 12, 18, 0);
- advanced_vbox->pack_start (*timespan_label, false, false, 0);
- advanced_vbox->pack_start (*timespan_align, true, true, 0);
+ timespan_align->set_padding (0, 0, 18, 0);
+ timespan_vbox->pack_start (*timespan_label, false, false, 0);
+ timespan_vbox->pack_start (*timespan_align, true, true, 0);
+ advanced_paned->pack1(*timespan_vbox, true, false);
+
+ Gtk::VBox* channels_vbox = Gtk::manage (new Gtk::VBox());
+ channels_vbox->set_spacing (12);
+ channels_vbox->set_border_width (12);
Gtk::Alignment * channels_align = Gtk::manage (new Gtk::Alignment());
channels_label = Gtk::manage (new Gtk::Label (_("Channels"), Gtk::ALIGN_LEFT));
channels_align->add (*channel_selector);
channels_align->set_padding (0, 12, 18, 0);
- advanced_vbox->pack_start (*channels_label, false, false, 0);
- advanced_vbox->pack_start (*channels_align, false, false, 0);
+ channels_vbox->pack_start (*channels_label, false, false, 0);
+ channels_vbox->pack_start (*channels_align, true, true, 0);
+ advanced_paned->pack2(*channels_vbox, channel_selector_is_expandable(), false);
get_vbox()->pack_start (*file_notebook, false, false, 0);
get_vbox()->pack_start (warning_widget, false, false, 0);
get_vbox()->pack_start (progress_widget, false, false, 0);
- Gtk::Expander* advanced = Gtk::manage (new Gtk::Expander (_("Advanced options")));
- advanced->add (*advanced_vbox);
+ advanced = Gtk::manage (new Gtk::Expander (_("Time span and channel options")));
+ advanced->property_expanded().signal_changed().connect(
+ sigc::mem_fun(*this, &ExportDialog::expanded_changed));
+ advanced->add (*advanced_paned);
+
+ if (channel_selector_is_expandable()) {
+ advanced_sizegroup = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_VERTICAL);
+ advanced_sizegroup->add_widget(*timespan_selector);
+ advanced_sizegroup->add_widget(*channel_selector);
+ }
get_vbox()->pack_start (*advanced, true, true);
channel_selector->sync_with_manager();
file_notebook->sync_with_manager ();
- update_warnings ();
+ update_warnings_and_example_filename ();
}
void
-ExportDialog::update_warnings ()
+ExportDialog::update_warnings_and_example_filename ()
{
/* Reset state */
list_files_hbox.hide ();
list_files_string = "";
- fast_export_button->set_sensitive (true);
- //rt_export_button->set_sensitive (true);
+ export_button->set_sensitive (true);
/* Add new warnings */
list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n";
}
}
+
+ /* Update example filename */
+
+ file_notebook->update_example_filenames();
}
void
}
void
-ExportDialog::export_rt ()
+ExportDialog::do_export ()
{
profile_manager->prepare_for_export ();
- handler->do_export (true);
- show_progress ();
-}
-
-void
-ExportDialog::export_fw ()
-{
- profile_manager->prepare_for_export ();
- handler->do_export (false);
+ handler->do_export ();
show_progress ();
}
status->running = true;
cancel_button->set_label (_("Stop Export"));
- //rt_export_button->set_sensitive (false);
- fast_export_button->set_sensitive (false);
+ export_button->set_sensitive (false);
progress_bar.set_fraction (0.0);
warning_widget.hide_all();
progress_widget.show ();
progress_widget.show_all_children ();
- normalizing_widget.hide();
progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100);
gtk_main_iteration ();
}
if (!status->aborted()) {
+
+ NagScreen* ns = NagScreen::maybe_nag (_("export"));
+
+ if (ns) {
+ ns->nag ();
+ delete ns;
+ }
+
status->finish ();
}
}
gint
ExportDialog::progress_timeout ()
{
+ std::string status_text;
+ float progress = 0.0;
if (status->normalizing) {
- normalizing_widget.show();
- normalizing_label.set_text (string_compose (_("Normalizing timespan %1 of %2"),
- status->timespan, status->total_timespans));
- normalizing_bar.set_fraction (status->progress);
+ status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
+ status->timespan, status->total_timespans, status->timespan_name);
+ progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
} else {
- normalizing_bar.set_fraction (0);
- normalizing_label.set_text ("");
+ status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
+ status->timespan, status->total_timespans, status->timespan_name);
+ progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+ }
+ progress_bar.set_text (status_text);
- progress_label.set_text (string_compose (_("Exporting timespan %1 of %2"),
- status->timespan, status->total_timespans));
- progress_bar.set_fraction (status->progress);
+ if (progress < previous_progress) {
+ // Work around gtk bug
+ progress_bar.hide();
+ progress_bar.show();
}
+ previous_progress = progress;
+ progress_bar.set_fraction (progress);
return TRUE;
}
void
ExportDialog::add_error (string const & text)
{
- fast_export_button->set_sensitive (false);
- //rt_export_button->set_sensitive (false);
+ export_button->set_sensitive (false);
if (warn_string.empty()) {
warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>";
channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager));
file_notebook.reset (new ExportFileNotebook ());
}
-
projects / ardour.git / blobdiff