correct size used by tempo line allocator; fix crash when exit is initiated by menu "quit" on OS X; bump to 2.8.8
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6636 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
0bdaf456f1
commit
860aef8e6e
|
@ -21,7 +21,7 @@ import SCons.Node.FS
|
|||
SConsignFile()
|
||||
EnsureSConsVersion(0, 96)
|
||||
|
||||
ardour_version = '2.8.7'
|
||||
ardour_version = '2.8.8'
|
||||
|
||||
subst_dict = { }
|
||||
|
||||
|
|
|
@ -724,6 +724,18 @@ ARDOUR_UI::check_memory_locking ()
|
|||
#endif // !__APPLE__
|
||||
}
|
||||
|
||||
void
|
||||
ARDOUR_UI::queue_finish ()
|
||||
{
|
||||
Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::idle_finish));
|
||||
}
|
||||
|
||||
bool
|
||||
ARDOUR_UI::idle_finish ()
|
||||
{
|
||||
finish ();
|
||||
return false; /* do not call again */
|
||||
}
|
||||
|
||||
void
|
||||
ARDOUR_UI::finish()
|
||||
|
|
|
@ -777,6 +777,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
|
|||
void platform_specific ();
|
||||
void platform_setup ();
|
||||
void fontconfig_dialog ();
|
||||
|
||||
/* these are used only in response to a platform-specific "ShouldQuit" signal
|
||||
*/
|
||||
bool idle_finish ();
|
||||
void queue_finish ();
|
||||
};
|
||||
|
||||
#endif /* __ardour_gui_h__ */
|
||||
|
|
|
@ -873,7 +873,7 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
|
|||
|
||||
app->set_menu_bar (*menu_bar);
|
||||
|
||||
app->ShouldQuit.connect (sigc::mem_fun (*this, &UI::quit));
|
||||
app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
|
||||
app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "simpleline.h"
|
||||
|
||||
typedef boost::fast_pool_allocator<
|
||||
std::pair<double, ArdourCanvas::SimpleLine>,
|
||||
std::pair<double, ArdourCanvas::SimpleLine*>,
|
||||
boost::default_user_allocator_new_delete,
|
||||
boost::details::pool::null_mutex,
|
||||
8192>
|
||||
|
|
|
@ -485,7 +485,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
|
|||
bool special_handling_of_unmodified_accelerators = false;
|
||||
bool allow_activating = true;
|
||||
|
||||
#undef DEBUG_ACCELERATOR_HANDLING
|
||||
#define DEBUG_ACCELERATOR_HANDLING
|
||||
#ifdef DEBUG_ACCELERATOR_HANDLING
|
||||
//bool debug = (getenv ("ARDOUR_DEBUG_ACCELERATOR_HANDLING") != 0);
|
||||
bool debug=true;
|
||||
|
|
|
@ -200,7 +200,7 @@ AudioEngine::stop (bool forever)
|
|||
Stopped(); /* EMIT SIGNAL */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return _running ? -1 : 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue