LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Paul Davis 2010-02-05 17:20:07 +00:00
parent 0bdaf456f1
commit 860aef8e6e
7 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -21,7 +21,7 @@ import SCons.Node.FS
SConsignFile() SConsignFile()
EnsureSConsVersion(0, 96) EnsureSConsVersion(0, 96)
ardour_version = '2.8.7' ardour_version = '2.8.8'
subst_dict = { } subst_dict = { }

12
gtk2_ardour/ardour_ui.cc
View File

@ -724,6 +724,18 @@ ARDOUR_UI::check_memory_locking ()
#endif // !__APPLE__ #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 void
ARDOUR_UI::finish() ARDOUR_UI::finish()

5
gtk2_ardour/ardour_ui.h
View File

@ -777,6 +777,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
void platform_specific (); void platform_specific ();
void platform_setup (); void platform_setup ();
void fontconfig_dialog (); 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__ */ #endif /* __ardour_gui_h__ */

2
gtk2_ardour/ardour_ui_ed.cc
View File

@ -873,7 +873,7 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
app->set_menu_bar (*menu_bar); 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)); app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
} }

2
gtk2_ardour/tempo_lines.h
View File

@ -27,7 +27,7 @@
#include "simpleline.h" #include "simpleline.h"
typedef boost::fast_pool_allocator< typedef boost::fast_pool_allocator<
std::pair<double, ArdourCanvas::SimpleLine>, std::pair<double, ArdourCanvas::SimpleLine*>,
boost::default_user_allocator_new_delete, boost::default_user_allocator_new_delete,
boost::details::pool::null_mutex, boost::details::pool::null_mutex,
8192> 8192>

2
gtk2_ardour/utils.cc
View File

@ -485,7 +485,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
bool special_handling_of_unmodified_accelerators = false; bool special_handling_of_unmodified_accelerators = false;
bool allow_activating = true; bool allow_activating = true;
#undef DEBUG_ACCELERATOR_HANDLING #define DEBUG_ACCELERATOR_HANDLING
#ifdef DEBUG_ACCELERATOR_HANDLING #ifdef DEBUG_ACCELERATOR_HANDLING
//bool debug = (getenv ("ARDOUR_DEBUG_ACCELERATOR_HANDLING") != 0); //bool debug = (getenv ("ARDOUR_DEBUG_ACCELERATOR_HANDLING") != 0);
bool debug=true; bool debug=true;

2
libs/ardour/audioengine.cc
View File

@ -200,7 +200,7 @@ AudioEngine::stop (bool forever)
Stopped(); /* EMIT SIGNAL */ Stopped(); /* EMIT SIGNAL */
} }
} }
return _running ? -1 : 0; return _running ? -1 : 0;
} }