smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-27 17:07:40 +01:00
Code Issues Projects Releases Wiki Activity

don't show nag screen if export was stopped or if SAE (for now)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4212 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-11-18 19:17:16 +00:00
parent 9b373cd257
commit 85dedba045
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/export_dialog.cc
View file

@ -1010,11 +1010,18 @@ ExportDialog::do_export ()
progress_connection.disconnect ();
end_dialog ();
NagScreen* ns = NagScreen::maybe_nag (_("export"));
/* if not stopped early and not SAE, ask for money, maybe */
if (ns) {
ns->nag ();
delete ns;
cerr << "At end, spec.stop == " << spec.stop << endl;
if (!spec.stop && !Profile->get_sae()) {
NagScreen* ns = NagScreen::maybe_nag (_("export"));
if (ns) {
ns->nag ();
delete ns;
}
}
}

1
gtk2_ardour/main.cc
View file

@ -228,7 +228,6 @@ fixup_bundle_environment ()
path += "/../Resources/gdk-pixbuf.loaders";
setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1);
cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl;
if (getenv ("ARDOUR_WITH_JACK")) {
// JACK driver dir

13
libs/ardour/session_export.cc
View file

@ -453,10 +453,21 @@ Session::stop_audio_export (AudioExportSpecification& spec)
{
/* don't stop freewheeling but do stop paying attention to it for now */
/* save the value of stop so that the UI
can see if it requested a stop.
*/
bool old_stop = spec.stop;
spec.freewheel_connection.disconnect ();
spec.clear (); /* resets running/stop etc */
Exported (spec.path, name());
spec.stop = old_stop;
if (!spec.stop) {
Exported (spec.path, name());
}
return 0;
}