From 3fdcba185980896366cc0d3d14f6dfd6bbaf1d0a Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Sun, 6 Dec 2009 04:35:48 +0000 Subject: Merged revisions 6293,6296-6306,6308 via svnmerge from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes ........ r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines fix if-statement in build script ........ r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines rearrange GTKOSX and darwin dependencies - moved some GTKOSX include paths to generic darwin - made GTKOSX dependent on being on darwin anyways ........ r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines move coreaudio and audiounit handling to darwin section ........ r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines use True/False instead of 1/0 fix another if-statement where it should be an elif-statement ........ r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines fixes to get libardour building - can't cast away volatile, so copy _transport_frame before emitting it. - const_reverse_iterator::operator!=() isn't defined in this version of gcc. - removed annoying HERE WE ARE CAAudioFile.h #warning. - removed unnecessary include of sndfile.h in session.h. - we don't want to set -march=i686 on the mac, so indent this if-statement so it's only run on linux. - DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG ........ r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS ........ r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines clean up configure flags - removed useless --aubio and --syslibs flags. The syslibs value is ignored as we don't bring our own libraries with us anymoreand we use aubio automatically if it's available - added ways to turn off fpu_optimization and NLS - fixed compiling on the mac without fpu_optimization ........ r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX - fixed compile of CoreAudioSource - re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence ........ r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines fixed compiler warnings about classes with virtual member functions, but no virtual destructor. - Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but private: Metering(), which is more idiomatic. ........ r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines TOP_MENUBAR isn't used when building ardour.menus. Removed. ........ r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines fix some AudioUnit compile errors - update AudioUnit to use ChanCount - fix some namespacing issues in audio_unit.h ........ r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines make --extra-warn useful ........ r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines fix compiling/linking with --coreaudio - rearrange ardour_ui.h header in editor.cc to avoid conflict - midi++ depends on OSX as well as COREAUDIO - fixed including frameworks - tweaked --extra-warn again. it's kinda redundent with --strict - improved indentation in wscript - use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI. #if isn't interchangable with #ifdef and won't work if HAVE_COREMIDI is defined with no value. ........ git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.cc | 8 +++++++- gtk2_ardour/editor_component.h | 1 + gtk2_ardour/interactive-item.h | 2 ++ gtk2_ardour/option_editor.h | 2 ++ gtk2_ardour/wscript | 2 +- 5 files changed, 13 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index eef401562a..c21393247c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -28,6 +28,13 @@ #include #include +#include "ardour_ui.h" +/* + * ardour_ui.h include was moved to the top of the list + * due to a conflicting definition of 'Style' between + * Apple's MacTypes.h and BarController. + */ + #include #include @@ -69,7 +76,6 @@ #include "control_protocol/control_protocol.h" -#include "ardour_ui.h" #include "editor.h" #include "keyboard.h" #include "marker.h" diff --git a/gtk2_ardour/editor_component.h b/gtk2_ardour/editor_component.h index e5ec1259dc..5c1ae8be2a 100644 --- a/gtk2_ardour/editor_component.h +++ b/gtk2_ardour/editor_component.h @@ -33,6 +33,7 @@ class EditorComponent { public: EditorComponent (Editor *); + virtual ~EditorComponent() {} virtual void connect_to_session (ARDOUR::Session *); diff --git a/gtk2_ardour/interactive-item.h b/gtk2_ardour/interactive-item.h index a37b3be3dc..0efe2fea69 100644 --- a/gtk2_ardour/interactive-item.h +++ b/gtk2_ardour/interactive-item.h @@ -34,6 +34,8 @@ namespace Canvas { */ class InteractiveItem { public: + virtual ~InteractiveItem() {} + virtual bool on_event(GdkEvent* ev) = 0; }; diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index b584338471..ec68a5d8d9 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -53,6 +53,8 @@ class OptionEditorPage; class OptionEditorComponent { public: + virtual ~OptionEditorComponent() {} + /** Called when a configuration parameter's value has changed. * @param p parameter name */ diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 9c1b8ae3bf..2807511937 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -371,7 +371,7 @@ def build(bld): # Menus menus_argv = [] if bld.env['GTKOSX']: - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DTOP_MENUBAR' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] obj = bld.new_task_gen('command-output') -- cgit v1.2.3