Commit Graph

637 Commits

Author SHA1 Message Date
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
4d59eedd68 Fix posix_memalign check.
git-svn-id: svn://localhost/ardour2/branches/3.0@5718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-02 14:46:10 +00:00
bcc929a5b6 waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-08 22:36:32 +00:00
c948806811 bzr revision support (thomas v.)
git-svn-id: svn://localhost/ardour2/branches/3.0@5417 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-23 12:04:46 +00:00
3b7230552d make i18n build work ; add mackie dir back to build ; token work on amp for MIDI; don't try to subgroup route groups with MIDI (for now)
git-svn-id: svn://localhost/ardour2/branches/3.0@5412 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-22 13:51:16 +00:00
95cdde240d push optimization flags into CXXFLAGS as well as CCFLAGS, and add LARGEFILE64_SOURCE for C++
git-svn-id: svn://localhost/ardour2/branches/3.0@5394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-20 11:52:25 +00:00
b89a786b3e hopefully fix the build, and actually use the options
git-svn-id: svn://localhost/ardour2/branches/3.0@5372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 22:25:32 +00:00
7884727e78 massive changes to waf build scripts so that nearly everything "should" be working now except for i18n (OSC is not quite right) ; some preliminary work on post-main-out handling, incomplete; a couple of fixes from -Wall and valgrind
git-svn-id: svn://localhost/ardour2/branches/3.0@5371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 22:12:21 +00:00
88beef2e93 merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode
git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-13 00:26:28 +00:00
e6eb059576 the big Route structure refactor. !!!! THIS WILL ***NOT LOAD*** PRIOR 3.0 or 2.X SESSIONS !!!! BREAKAGE IS EXPECTED !!!! IF YOU HAVE AND NEED A WORKING 3.0 DO **NOT** UPDATE. !!!! otherwise, update and enjoy the steadily emerging joys of this major reworking of ardour internals
git-svn-id: svn://localhost/ardour2/branches/3.0@5137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-09 20:21:19 +00:00
d3d1e2c286 Strip trailing whitespace from waf scripts.
git-svn-id: svn://localhost/ardour2/branches/3.0@5045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 22:10:15 +00:00
0d36301907 3 notable patches from lincoln (a) non-layered track mode (NOTE: this is broken for loop recording right now) (b) trim region to previous/next region (c) region push/pull trimming. work on these 3 features should be assumed to be still slightly ongoing (eg. default bindings and more). great stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@4994 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-04-20 21:02:46 +00:00
c54fe0e7cd Print more configuration summary stuff (sound libs).
git-svn-id: svn://localhost/ardour2/branches/3.0@4700 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-27 02:32:53 +00:00
60b0022d75 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@4696 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-27 00:49:24 +00:00
4485edffae Another attempt at FLAC workaround.
git-svn-id: svn://localhost/ardour2/branches/3.0@4684 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 18:59:15 +00:00
9e3b571189 Attempt to strip stupid FLAC include.
git-svn-id: svn://localhost/ardour2/branches/3.0@4683 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 18:37:41 +00:00
db68fcfca6 \n\n
git-svn-id: svn://localhost/ardour2/branches/3.0@4682 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:44:47 +00:00
aaa55870bb Don't lie about syslibs until it actually works...
git-svn-id: svn://localhost/ardour2/branches/3.0@4681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:42:54 +00:00
911519a269 Stub (non-functional) options and configuration summary.
git-svn-id: svn://localhost/ardour2/branches/3.0@4679 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 17:16:22 +00:00
76f242cb80 Version file building stuff.
Ardour should now compile from a fresh svn checkout using only waf.


git-svn-id: svn://localhost/ardour2/branches/3.0@4671 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 02:24:16 +00:00
593ffe8033 Build VAmp plugins.
git-svn-id: svn://localhost/ardour2/branches/3.0@4670 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 01:34:03 +00:00
1d516ac95a Waf building of rubberband.
Use rubberband over soundtouch with waf for the time being.


git-svn-id: svn://localhost/ardour2/branches/3.0@4669 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 01:22:20 +00:00
3bc71af0ca Clean up checks.
git-svn-id: svn://localhost/ardour2/branches/3.0@4667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-26 00:05:51 +00:00
0c0e689d3c Waf building of gtk2_ardour.
git-svn-id: svn://localhost/ardour2/branches/3.0@4662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 23:21:49 +00:00
310d68b953 Waf building of libardour (yay!).
git-svn-id: svn://localhost/ardour2/branches/3.0@4661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 21:48:32 +00:00
5fe3401814 Waf building of taglib and vamp-sdk.
git-svn-id: svn://localhost/ardour2/branches/3.0@4660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 19:36:16 +00:00
b8b6042e35 Add top level wscript.
git-svn-id: svn://localhost/ardour2/branches/3.0@4657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:59:45 +00:00