13
0
Commit Graph

169 Commits

Author SHA1 Message Date
d135c4dc3a fix merge conflicts with master 2013-10-23 08:47:57 -04:00
17cd6b4044 fix locale path in OS X bundles 2013-10-22 11:08:31 -04:00
f191bdf6a0 replace rather than append to SUIL_MODULE_DIR
should fix http://tracker.ardour.org/view.php?id=5679
2013-10-19 18:16:34 +02:00
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
c727d18b80 delete the UI from main() to get full cleanup 2013-10-07 20:28:20 -04:00
20fa19e69e more excision of "JACK" from labels, menu items, etc.
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
2013-09-17 22:25:21 -04:00
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
6bcdf4f0f1 fix merge issues with master 2013-08-14 13:10:59 -04:00
7a431f892e Move curve test file handling in main() until after ARDOUR::init is called
This means it doesn't need to call PBD::ID::init directly, which it now
shouldn't be doing
2013-08-13 20:15:47 +10:00
611058bf58 Remove call to PBD::ID::init as it is now done via ARDOUR::init 2013-08-13 20:15:47 +10:00
de4b24b162 Move initialization of libardour from ARDOUR_UI class into main() 2013-08-13 20:15:47 +10:00
fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
3d95822716 more miscellaneous changes for audioengine, all of this is still far from actually compiling 2013-07-24 08:36:04 -04:00
e4ab2ffbfb Don't install signal handler for SIGPIPE in windows 2013-07-11 22:34:59 -04:00
09e471545b remove direct of realpath(2), replace with canonical_path() which is a no-op on windows 2013-07-11 14:57:16 -04:00
27eecdc88b Use g_setenv and g_getenv for portability 2013-07-11 11:37:25 -04:00
2b745cab64 set PATH (used for harvid+ffmpeg) 2013-06-10 22:24:19 +02:00
Julien de Kozak
eb7a85b8f9 Set the revision mechanism independent from the VCS name 2013-03-18 20:13:05 +01:00
30938c1dcf attempted further rationalization of clock font issues (especially fr OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 14:01:48 +00:00
ba73a77c63 switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a)
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 16:41:45 +00:00
5907f3eb03 potential fix, part two, for Tiger-based font issues. this also switches things so that building on Lion or Mountain Lion sets MAC_OS_VERSION_MIN_REQUIRED to 1070, to avoid legacy stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@14179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 03:39:58 +00:00
dff782989b fix OS X compilation (i hope)
git-svn-id: svn://localhost/ardour2/branches/3.0@14142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-05 04:33:38 +00:00
959eec5cc2 load custom mono font on OS X too
git-svn-id: svn://localhost/ardour2/branches/3.0@14140 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-05 03:45:44 +00:00
2865bcddd5 disable custom font loading on OSX
git-svn-id: svn://localhost/ardour2/branches/3.0@14093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-23 01:55:06 +00:00
db52e09032 OSX font loading
git-svn-id: svn://localhost/ardour2/branches/3.0@14090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-22 15:48:44 +00:00
8a78d86546 fix GTK_PATH for linux bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@14086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-21 22:41:32 +00:00
9bbed5925d add MIDNAM (patchfiles) to child list so that they get installed
git-svn-id: svn://localhost/ardour2/branches/3.0@14057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-13 19:38:47 +00:00
241a9edd3e replace final(?) incidences of program name (ardour, Ardour) with PROGRAM_NAME (thanks to edgar for tracking them all down)
git-svn-id: svn://localhost/ardour2/branches/3.0@14050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-05 18:18:35 +00:00
38374e7aa5 OSX CoreText font loading, updated ArdourMono font-family name
git-svn-id: svn://localhost/ardour2/branches/3.0@14042 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-31 07:41:37 +00:00
d1c9bc0e72 don't bother trying to set FONTCONFIG_FILE on linux if /etc/fonts stuff doesn't exist - we don't include any data to make this useful
git-svn-id: svn://localhost/ardour2/branches/3.0@14035 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-30 12:55:59 +00:00
8cce8a6d0e proper fontconfig error handling
git-svn-id: svn://localhost/ardour2/branches/3.0@14028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-29 15:59:22 +00:00
eb369215ae Custom Monospace font for clocks and such (no dot in zero).
ArdourMono is a renamed version of
https://www.google.com/webfonts/specimen/Droid+Sans+Mono
distributed under Apache License, version 2.0.
Since the name Droid(R) is registered by Google Inc it was
renamed to ArdourMono - otherwise the .tff is unchanged (build 112)

git-svn-id: svn://localhost/ardour2/branches/3.0@14026 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-29 15:25:30 +00:00
4dd01105e1 remove setting of GTK_LOCALEDIR from bundle setup
git-svn-id: svn://localhost/ardour2/branches/3.0@14009 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-27 03:43:05 +00:00
bc2523c249 new logic for enabling translation in bundled releases of ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@13980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 18:44:16 +00:00
a8bf2e9402 more i18n fixes, this time removing a hack that broke i18n in bundles, and also only initializing NLS stuff if ENABLE_NLS is in effect. note that if translations are disabled by the user, we set the localedir used to look for message catalogs to a dir that is assumed to not exist (/this/cannot/exist) which should block all translation from happening.
git-svn-id: svn://localhost/ardour2/branches/3.0@13975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 16:09:10 +00:00
0058b2d866 more i18n debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@13971 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 15:18:16 +00:00
7a4ab98f89 guard initial bindtextdomain() etc. with ENABLE_NLS for debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@13968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 03:29:28 +00:00
2a2b48ef66 start passing around the (possibly-bundle-modified) localedir so that we call bindtextdomain() correctly, and thus (hopefully) find message catalogs correctly inside a bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@13965 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 23:14:00 +00:00
98834c0532 remove a bunch of cerr output and/or convert to use error<<
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
fe7d01847b string fix
git-svn-id: svn://localhost/ardour2/branches/3.0@12912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-24 12:49:53 +00:00
105caf23da Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
d4a4dc20ab fix compilation on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-18 22:57:16 +00:00
a11d9d4e5a define CHARSETALIASDIR (again) to stop various bits of the GNU stack from loading a charset.alias file that we did not provide; slightly rearrange logic of fixup_bundle() so that we can do more stuff even if we can't write to the user ardour conf dir (as in 2.X)
git-svn-id: svn://localhost/ardour2/branches/3.0@12771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-18 21:33:55 +00:00
5d10ef90b8 fixup previous commit for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 15:33:56 +00:00
1de10f1229 more cleanups and standardization of fixup_bundle_environment() functions
git-svn-id: svn://localhost/ardour2/branches/3.0@12490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 14:58:39 +00:00
28e3bc3ac7 MCP: metering changes from rodrigo, makes metering work correctly on the MC Pro (also checked on the nucleus)
git-svn-id: svn://localhost/ardour2/branches/3.0@12489 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 14:32:27 +00:00
d825f20a32 explicit checks for all components of the LV2 stack
git-svn-id: svn://localhost/ardour2/branches/3.0@12465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-28 13:51:26 +00:00
59d3cc258b tweaks to packaging to make SUIL (and thus LV2 UI's) work
git-svn-id: svn://localhost/ardour2/branches/3.0@12413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 01:43:58 +00:00
6ee23029a3 packaging tweaks for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12345 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 20:17:33 +00:00