13
0
Commit Graph

76 Commits

Author SHA1 Message Date
15b5fce904 merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 01:31:03 +00:00
Carl Hetherington
6636a65c10 Configure option to abort when malloc is called in the process thread.
git-svn-id: svn://localhost/ardour2/branches/3.0@8548 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 21:36:38 +00:00
Carl Hetherington
e5c69387c0 Fix template install properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@8404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-01 17:43:53 +00:00
Carl Hetherington
d6cd4796b8 Fix build. Disable template installation for a bit because I forgot that waf's subst builder doesn't like spaces in filenames.
git-svn-id: svn://localhost/ardour2/branches/3.0@8402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-01 17:13:32 +00:00
Carl Hetherington
ce83dd0df1 Install templates.
git-svn-id: svn://localhost/ardour2/branches/3.0@8400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-01 16:59:38 +00:00
3f30e8093e Clean up region.h and trim include tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@8312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-20 21:22:49 +00:00
Carl Hetherington
e212c8de66 Fix some spacey tabs.
git-svn-id: svn://localhost/ardour2/branches/3.0@8299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-19 20:02:55 +00:00
4b861e6039 Rename libmusictime libtimecode (consistent with already used namespace "Timecode").
Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14 18:13:37 +00:00
f6055f2c6f Eliminate circular dependency kludge for control_protocol/smpte.o.
git-svn-id: svn://localhost/ardour2/branches/3.0@8262 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-13 20:46:07 +00:00
bb592809f1 merge gnomecanvas into ardour tree, so that we can fix our own bugs and not wait for silly gnome release schedules
git-svn-id: svn://localhost/ardour2/branches/3.0@8114 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-27 23:16:42 +00:00
Carl Hetherington
f6019bd0ed Check for windows.h on VST builds.
git-svn-id: svn://localhost/ardour2/branches/3.0@8081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-24 02:06:56 +00:00
d000c7e79d possible fix for some waf glitchiness - explicitly list directories that contain only source
git-svn-id: svn://localhost/ardour2/branches/3.0@8067 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-22 16:59:23 +00:00
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
4fce177377 OS X build fixes (for tiger), in particular removing options for OS X stuff that are not optional
git-svn-id: svn://localhost/ardour2/branches/3.0@8004 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 23:11:43 +00:00
71df3719d4 re-enable i18n as a build target for translations
git-svn-id: svn://localhost/ardour2/branches/3.0@7995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 22:46:38 +00:00
95e6a35855 put splitlines() back where it belongs
git-svn-id: svn://localhost/ardour2/branches/3.0@7945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-29 17:07:39 +00:00
Carl Hetherington
392875a2bb Further wscript tweak.
git-svn-id: svn://localhost/ardour2/branches/3.0@7940 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-29 00:11:54 +00:00
Carl Hetherington
659126bb52 Further wscript fix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7939 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-28 23:10:47 +00:00
Carl Hetherington
e88f7f6b55 Hopefully fix up build system after my previous changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@7936 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-28 17:16:17 +00:00
Carl Hetherington
9f7f0f79a3 Make build scripts python2/3 agnostic.
git-svn-id: svn://localhost/ardour2/branches/3.0@7931 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-27 23:10:27 +00:00
Carl Hetherington
269590e1bf Tidy up About dialogue. Fixes #1407.
git-svn-id: svn://localhost/ardour2/branches/3.0@7903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-17 23:44:34 +00:00
Carl Hetherington
f561a6e2a4 Link with -rdynamic to make backtrace_symbols work again.
git-svn-id: svn://localhost/ardour2/branches/3.0@7865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-02 00:04:52 +00:00
10bdce85a0 megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 16:24:22 +00:00
aaf6ea8d28 Upgrade to latest autowaf.
Tidy up configure output.


git-svn-id: svn://localhost/ardour2/branches/3.0@7752 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-07 20:48:54 +00:00
Carl Hetherington
2a69334d68 Tidy up config text and add PHONE_HOME and JACK_SESSION. Fixes #3422.
git-svn-id: svn://localhost/ardour2/branches/3.0@7701 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-28 12:55:36 +00:00
54d00408c3 forward port 2.X changes up to and including rev 6842
git-svn-id: svn://localhost/ardour2/branches/3.0@7637 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 02:48:24 +00:00
Carl Hetherington
66ea8edc6e Fix windows key shortcuts on Linux.
git-svn-id: svn://localhost/ardour2/branches/3.0@7632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-15 12:37:44 +00:00
Carl Hetherington
cd141a9d57 Explicitly check for and link libcurl and the dl* functions; allows linking with gold.
git-svn-id: svn://localhost/ardour2/branches/3.0@7567 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-08 02:20:45 +00:00
6109f05c38 first pass a "phone home" facility for version tracking and update notification
git-svn-id: svn://localhost/ardour2/branches/3.0@7549 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-05 19:39:49 +00:00
eb37119975 check for gcc 4.5 and prohibit compilation with optimization if found
git-svn-id: svn://localhost/ardour2/branches/3.0@7219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-03 15:32:37 +00:00
e58f6752af fix visible version number to use the one defined in the top level wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@7127 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-20 15:34:23 +00:00
0cb4160ce7 3.0 version of patch for #2997 from carl, fix handling stat of large files
git-svn-id: svn://localhost/ardour2/branches/3.0@7043 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 15:21:04 +00:00
7ed95f7c37 (FULL) not-yet-complete JACK session management patch (TODO: get program name, vary snapshot name, arrange quit when necessary)
git-svn-id: svn://localhost/ardour2/branches/3.0@6841 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 18:54:33 +00:00
Carl Hetherington
499303c2bc Make boost signals2.hpp header mandatory during configuration.
git-svn-id: svn://localhost/ardour2/branches/3.0@6838 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-02 15:54:04 +00:00
f85161c5d0 "Ardour" -> PROGRAM_NAME change for libardour and setup for gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@6757 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-13 19:22:34 +00:00
Hans Baier
0c6c45fc68 * add waf option to enable compilation of unit tests
* libs/ardour: make filenames of unit tests compy with the convention

git-svn-id: svn://localhost/ardour2/branches/3.0@6583 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-29 05:17:44 +00:00
6ddcd8f0b9 add a way to see (most of) the waf config used to build ardour at run time (from the about dialog). buttons still need reordering there
git-svn-id: svn://localhost/ardour2/branches/3.0@6439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-04 02:04:05 +00:00
Carl Hetherington
b37dbcea75 Chris reports that boost 1.39 is sufficient.
git-svn-id: svn://localhost/ardour2/branches/3.0@6404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-28 01:44:21 +00:00
Carl Hetherington
a2ec28fd26 Check for boost/signals2.hpp and an appropriate version of the boost library. Closes #2963.
git-svn-id: svn://localhost/ardour2/branches/3.0@6403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-28 01:13:19 +00:00
Sakari Bergen
dde0848a98 Re-integrate export-optimization branch.
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).


git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 14:46:23 +00:00
738387f9a4 remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-20 16:50:41 +00:00
Taybin Rutkin
3fdcba1859 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
2009-12-06 04:35:48 +00:00
4a3d7877f6 cross-thread handling of SessionEvent allocation/deallocation, with widespread consequences
git-svn-id: svn://localhost/ardour2/branches/3.0@6283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 19:24:09 +00:00
b0e41486f3 debug flag for session destruction and waf option for boost SP debug
git-svn-id: svn://localhost/ardour2/branches/3.0@6171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-25 14:34:17 +00:00
498dfebcca 90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-09 20:05:18 +00:00
e5258d4ed1 Fix angle bracket project-local include paths.
git-svn-id: svn://localhost/ardour2/branches/3.0@5975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-30 00:21:40 +00:00
49a6e300c3 Move Mac configuration stuff to wscript where it belongs.
Please do not break autowaf:

*** ARDOUR SPECIFIC CONFIGURATION/BUILDING CODE BELONGS IN A WSCRIPT,
*** NOT AUTOWAF.PY


git-svn-id: svn://localhost/ardour2/branches/3.0@5891 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 16:31:54 +00:00
214a31bb98 Fix various MIDI control and installation issues:
* Install ardour3_ui_default.conf to system config dir

 * Set -DDATA_DIR etc. defines to proper absolute paths

 * Set default MIDI control port name to "control"
   (it was "control" some places, "default" other, so the generic MIDI
   control surface didn't work.  The real problem here is probably that
   the name is hardcoded in the surface code, ick)

 * Install surfaces to correct system directory

 * Generate and install ardour_system.rc

User POV:

 * Installed versions not run from the source directory discover configuration
   files and surfaces, and generally work

 * Building and/or starting a fresh copy of ardour3 with no pre-existing
   configuration will run an ardour with a single MIDI "control" port, which
   you can plug a surface into and control MMC and controllers and such
   (after turning on the generic MIDI surface, which IMO should be loaded
    by default anyway, especially since it's no longer in a menu)


git-svn-id: svn://localhost/ardour2/branches/3.0@5833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 23:43:19 +00:00
aefcce1c99 ogg/flac support bits and pieces; fix up MIDI note dragging and front-edge trims; BROKEN IN PERCUSSIVE MODE FOR NOW
git-svn-id: svn://localhost/ardour2/branches/3.0@5745 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-06 22:07:10 +00:00
Carl Hetherington
57d05c4c31 Build clearlooks-newer for OSX
git-svn-id: svn://localhost/ardour2/branches/3.0@5727 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-05 02:43:30 +00:00