smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity
17577 commits 102 branches 145 tags 312 MiB
Commit graph

892 commits

Author SHA1 Message Date
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
2fab8182cc add -fvisibility=hidden to libgtkmm2ext, and make things work 2013-10-17 14:36:41 -04:00
Paul Davis
2eabeebdc5 add -fvisibility=hidden to libpbd, and make things work 2013-10-17 13:51:02 -04:00
Paul Davis
f3d2ca0d9a get everything compiling with libardour built using -fvisibility=hidden 2013-10-17 12:41:28 -04:00
Paul Davis
24d2b5ec92 add export visibility macros across libardour 2013-10-17 10:02:11 -04:00
Paul Davis
c5115c9a3c add export visibility control to libpbd (works thus far on linux/gcc) 2013-10-16 23:30:28 -04:00
Paul Davis
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
John Emmas
97c68cc2b1 Merge branch 'windows' into windows+cc 
Conflicts (hopefully resolved):
	libs/pbd/stacktrace.cc
 2013-10-15 17:38:08 +01:00
Paul Davis
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00
Paul Davis
8a76441b0f re-fix typo in PBD::demangle() for systems without execinfo.h 2013-10-15 10:52:29 -04:00
Paul Davis
a29b83c124 fix namespace issue with demangle on systems without execinfo.h 2013-10-15 10:41:42 -04:00
Paul Davis
89738cc3c2 fix typo in PBD::demangle() for systems without execinfo.h 2013-10-15 10:33:03 -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
John Emmas
4fac237fdc 'PBD::demangle()' - Minor modification to keep MSVC happy 2013-10-14 17:40:15 +01:00
Paul Davis
b5f36f5788 fix up parsing of send gain MIDI bindings so that they actually work 2013-10-10 16:16:59 -04:00
Colin Fletcher
e1562961c0 Add command-line parsing constructor to SystemExec 
Add a new constructor to SystemExec which takes a complete command-line
and a map of substitutions for %<char>, and parses the command line,
taking account of some simple escape sequences and quoting.
 2013-10-10 19:50:21 +01: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
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
3aee160b19 provide PBD::demangle() even on platforms without HAVE_EXECINFO 2013-10-04 12:22:00 -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
Tim Mayberry
8ddd12a60d Rename SearchPath class Searchpath 
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
 2013-09-06 14:31:11 +10:00
John Emmas
060c56cc3f Minor tweaks to MSVC build (hopefully of little consequence) 2013-08-26 17:50:17 +01:00
Paul Davis
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
Paul Davis
04bf9d1e95 fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils 
threads created with this code can now just return a value as they normally would, and the
infrastructure will ensure cleanup. there is no longer any reason to call pthread_exit_pbd()
and so that has been removed.
 2013-08-15 11:44:47 -04:00
Paul Davis
e6521bb043 Merge branch 'master' into cairocanvas 2013-08-14 13:11:34 -04:00
Tim Mayberry
63745512bc Call setup_libpbd_enums in PBD::init for portability 2013-08-13 20:15:47 +10:00
Tim Mayberry
1db894f886 Call Gio::init from PBD::init instead of ARDOUR::init 
PBD needs Gio for PBD::copy_file and perhaps others
 2013-08-13 20:15:47 +10:00
Tim Mayberry
29193c76cc Add PBD::init and PBD::cleanup 
A bit of refactoring to move initialization of libpbd into libpbd
rather than rely on "client" code(ui,libardour,tests etc) to do it
 2013-08-13 20:15:47 +10:00
Michael Fisher
71e2fbbcff Resolve duplicate symbol 'cocoa_open_uri' on OSX builds. 
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
 2013-08-08 15:26:19 -04:00
Michael Fisher
9afb71eb5a Stop compiler warning about NSURL 2013-08-08 15:26:18 -04:00
Michael Fisher
bfbc55a673 Proper OSX/CLANG/CXX11 support in stl_delete.h 
- replaces fix in 066df0d218
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++
 2013-08-08 15:26:17 -04:00
Robin Gareus
59a3b797d7 fix compiler warnings. 2013-08-08 15:26:16 -04:00
Michael R. Fisher
ea08feec48 Temporary OSX/Clang/C++11 workaround 
- Adds a directive that includes <vector> upon specific conditions
- WIP
 2013-08-08 15:23:10 -04:00
Paul Davis
daad42dd6c Revert "Remove non-portable and unnused header includes" 
This reverts commit 7ef79d3f4b.
 2013-08-08 15:23:08 -04:00
Paul Davis
cebd189239 Remove non-portable and unnused header includes 2013-08-08 15:23:08 -04:00
Paul Davis
8c28b3ad07 add new files from test changes by timbyr 2013-08-08 15:23:08 -04:00
Paul Davis
20311ed2f3 Use test_search_path to find test data in xpath test 2013-08-08 15:23:08 -04:00
Paul Davis
cdaa32d2c6 Add test_search_path function in PBD testsuite 2013-08-08 15:23:08 -04:00
John Emmas
490311bc08 'libs/ardour' - Main body of changes required for building with MSVC 2013-08-04 15:36:07 +01:00
John Emmas
fa59391f6a 'libs/ardour' - Use 'const_iterator' where appropriate (required to be buildable with MSVC) 2013-08-04 15:06:10 +01:00
Paul Davis
aaabaf5d3c Merge branch 'master' into windows 2013-08-02 12:51:24 -04:00
Michael Fisher
71c26e2820 Resolve duplicate symbol 'cocoa_open_uri' on OSX builds. 
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
 2013-08-02 12:01:47 -04:00
Michael Fisher
d882b03f7d Stop compiler warning about NSURL 2013-08-02 08:59:32 -05:00
Paul Davis
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
John Emmas
98c6ca5abc Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-07-31 15:09:50 +01:00
Michael Fisher
a8456b3766 Proper OSX/CLANG/CXX11 support in stl_delete.h 
- replaces fix in 066df0d218
- Check if _LIBCPP_VECTOR is defined for vector_delete.
  This is defined in libc++'s headers which Apple is using
  instead of libstdc++
 2013-07-29 14:43:11 -05:00
Robin Gareus
cd28d62b26 fix compiler warnings. 2013-07-28 20:32:52 +02:00
John Emmas
338f53e69a Further changes to msvc/pbd (mostly to add support for getopt and getopt_long) 2013-07-24 17:46:25 +01:00