Paul Davis
94993816cc
move portable copyfile function into tools/autowaf.py and use it in both gtk2_ardour and taglib
2013-12-19 12:55:52 -05:00
Paul Davis
339fc9ed13
fix platform portability issues caused by use of shell cp(1) command and perl script
2013-12-05 14:44:37 -05:00
Paul Davis
8648a8a13b
fix up wscript/build issues in exportvis after merge with master
2013-12-03 11:51:25 -05:00
Paul Davis
c3c9960427
fix build
2013-11-30 11:17:42 -05:00
Paul Davis
3c98de9ce4
fix merge with master
2013-11-29 22:31:29 -05:00
Paul Davis
15cee60021
merge and resolve conflict with master
2013-11-29 22:29:25 -05:00
Paul Davis
074b0c4dca
add explicit linkage to libtimecode
2013-11-29 22:24:37 -05:00
Paul Davis
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
Paul Davis
ea1ccb869a
fix merge with master
2013-10-31 13:16:51 -04:00
Nils Philippsen
5f00d2f3a7
allow linking unbundled versions of some libraries
...
(libltc, rubberband, taglib, vamp-sdk)
2013-10-28 09:06:09 +01:00
Nils Philippsen
85fd343145
gtk2_ardour: link fftw3f directly
...
This is needed to be able to unbundle some libraries.
2013-10-28 09:06:09 +01:00
Paul Davis
f85c67501c
reverse the visibility.h files assumptions that we don't build shared libs by default
...
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.
Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
Paul Davis
683496c501
use libltc and libtimecode as static libs, and upgrade to waf 1.7
...
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not
work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour
is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change
just moves the linkage point to another location.
Also fix a bug with the libardour version tha was picked up by waf 1.7
2013-10-18 11:11:59 -04:00
John Emmas
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
Paul Davis
f3d2ca0d9a
get everything compiling with libardour built using -fvisibility=hidden
2013-10-17 12:41:28 -04:00
Paul Davis
94ef2692b8
add export control to libevoral
2013-10-17 10:52:02 -04:00
Paul Davis
e89f129e5e
add defines to gtk ardour build so that it knows that our internal libs are all shared
2013-10-17 08:47:43 -04:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
Paul Davis
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
John Emmas
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
Robin Gareus
44b359b70a
enable videotimeline on OSX
2013-10-12 23:04:37 +02:00
Paul Davis
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
Colin Fletcher
070bb7a8ab
Move system_exec from gtk2_ardour/ to libs/pbd/
2013-10-07 21:16:42 +01:00
Colin Fletcher
a3465ff5d3
Working Soundcloud export
...
Adds an 'upload' property to ExportFormatSpecification, to indicate that files
exported with that format specfication should be uploaded to Soundcloud, and
makes it editable in the export format dialogue.
Adds fields for the Soundcloud username & password to the file format selection
page, as well as an option to make the uploaded files public and open them in
the system browser.
Possible improvements not yet implemented:
- make upload happen in its own thread
- cosmetic tidying up of dialogue control layout
- remember username & password
2013-10-07 14:59:40 +01:00
Colin Fletcher
15b4ebbb07
add soundcloud export to wscript, and make it compile.
...
add soundcloud exporter to gtk2_ardour/wscript, and fix compile errors by using
std::string in place of string everywhere.
2013-10-07 12:23:00 +01:00
John Emmas
300b484cf6
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
Paul Davis
b362ff220c
major rearrangement of startup/session loading code
...
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
2013-09-23 14:41:52 -04:00
John Emmas
19bb2b33a8
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
...
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
Paul Davis
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
Paul Davis
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
Paul Davis
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
Robin Gareus
cc92c879bf
Merge branch 'master' into ccmerge
...
Conflicts:
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/video_image_frame.cc
2013-08-10 15:41:40 +02:00
Paul Davis
f0fcda2044
Merge branch 'master' into audioengine
2013-08-09 16:29:23 -04:00
Paul Davis
f44e0f33af
a few more visual tweaks and simplifications for audio/midi setup
2013-08-09 00:50:41 -04:00
Robin Gareus
897074730a
remove --no-freesound option. fixes #5640
2013-08-08 20:08:20 +02:00
Paul Davis
00ae5492f4
(reapply with fixes) Build system changes to support mingw build target
2013-07-15 13:43:17 -04:00
Paul Davis
96ea407d1a
Revert "Build system changes to support mingw build target"
...
This reverts commit 94145732f3
2013-07-15 13:21:22 -04:00
Paul Davis
94145732f3
Build system changes to support mingw build target
2013-07-15 13:16:09 -04:00
Paul Davis
580520b12f
fix conflicts caused by meterbridge merge
2013-07-11 09:11:53 -04:00
Robin Gareus
68762b9efd
break out meter&metric pattern rendering.. first step towards new mixer-meters
2013-07-10 15:27:10 +02:00
Robin Gareus
35937e5083
implement meterbridge & meter-strip
2013-07-10 15:27:02 +02:00
Robin Gareus
b0998844db
basic window infrastructure for meterbridge
2013-07-10 15:27:02 +02:00
Paul Davis
f00b3b7f11
merge with master
2013-06-13 23:00:24 -04:00
Paul Davis
2e1e5da78e
more changes to consolidate version definition into the top level wscript file
2013-06-11 11:37:52 -04:00
Paul Davis
ef6366a7cd
adjust the way version and revision info are gathered, defined and used
2013-06-11 10:58:24 -04:00
Robin Gareus
1ca430babd
separate general vs temporary(no vtl) OSX defines
2013-06-11 01:26:49 +02:00
Paul Davis
bebe2af95a
merge with master
2013-05-08 14:48:28 -04:00
Paul Davis
cadfc2aee1
various miscellany related to versions, gtk2 build and packaging
2013-05-08 13:16:50 -04:00
Paul Davis
e1b0f1bd0b
merge with master
2013-05-04 22:41:10 -04:00
Paul Davis
40944574c6
the big rework of window management. probably not complete at thsi point, but this is mostly functional
2013-05-04 22:02:05 -04:00
