13
0
Commit Graph

219 Commits

Author SHA1 Message Date
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
5568026387 'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead 2013-10-14 17:00:28 +01: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
746b020d9f more tweaks to bundles, search paths and packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 14:23:49 +00:00
03605a3a06 tweaks to dir path names for bundles
git-svn-id: svn://localhost/ardour2/branches/3.0@12336 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 12:51:38 +00:00
74c6ad4e15 define ARDOUR_{MIDIMAPS,MCP}_PATH for bundles and for ./ardev and its cousins, so that we can find MIDI and Mackie support files
git-svn-id: svn://localhost/ardour2/branches/3.0@12211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08 15:25:57 +00:00
ffa2c2cf40 moron
git-svn-id: svn://localhost/ardour2/branches/3.0@12193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-05 18:14:50 +00:00
c5a0be5a46 try setting FONTCONFIG_PATH to make fontconfig look in the right place for linux bundles
git-svn-id: svn://localhost/ardour2/branches/3.0@12192 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-05 18:12:54 +00:00
54923a3884 slightly improved (wink) version of fontconfig bundled fix
git-svn-id: svn://localhost/ardour2/branches/3.0@12191 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-05 15:36:28 +00:00
6bd097cc35 fix up unexpected situation with fontconfig in our packages
git-svn-id: svn://localhost/ardour2/branches/3.0@12190 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-05 14:16:13 +00:00
Carl Hetherington
783f31816c Happy New Year
git-svn-id: svn://localhost/ardour2/branches/3.0@11151 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03 21:13:05 +00:00
30f75c446e tweak export path name
git-svn-id: svn://localhost/ardour2/branches/3.0@10889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 20:14:56 +00:00
7a5a5da953 probably fix failure to find export formats in packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 20:05:50 +00:00
Carl Hetherington
d9a3c6b89f Rename windows VST stuff with a Windows prefix.
git-svn-id: svn://localhost/ardour2/branches/3.0@10738 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 17:42:29 +00:00
0e2173d2ae Add default OK button to "JACK exited" dialog.
Remove odd pointless Gtk::ButtonsType casts.

Related to ticket 4364.  As of this commit all uses of MessageDialog are
verified to have buttons (we use BUTTONS_NONE occasionally, but in all
cases we add buttons later).


git-svn-id: svn://localhost/ardour2/branches/3.0@10686 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-18 20:22:49 +00:00
2c2f7a2fcc clean up settings of various bundle paths
git-svn-id: svn://localhost/ardour2/branches/3.0@10593 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 21:24:09 +00:00
96806925b6 fix bundled paths for OS X bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@10446 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:13:17 +00:00
62e730b57a Fix broken whitespace (no functional changes).
git-svn-id: svn://localhost/ardour2/branches/3.0@9288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-04 22:46:48 +00:00
b3faa154b8 copy pre-defined export presets & formats into the correct location in the bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@9264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-02 14:17:44 +00:00
7d30cc243f cleanup repeated pattern for setting in-bundle search paths and add ARDOUR_EXPORT_FORMATS_PATH to that list
git-svn-id: svn://localhost/ardour2/branches/3.0@9262 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-02 14:10:48 +00:00
d89b808af2 get MIDI binding maps dir name correct (ugh)
git-svn-id: svn://localhost/ardour2/branches/3.0@9210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-25 22:15:10 +00:00
8d203215e7 define MIDI map location in bundle via envvar
git-svn-id: svn://localhost/ardour2/branches/3.0@9205 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-25 21:21:40 +00:00
d8a302d647 (linux too!) set ARDOUR_SURFACES_PATH for a bundle, just like ARDOUR_PANNER_PATH
git-svn-id: svn://localhost/ardour2/branches/3.0@9192 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 14:53:20 +00:00
40e2a6b16b set ARDOUR_SURFACES_PATH for a bundle, just like ARDOUR_PANNER_PATH
git-svn-id: svn://localhost/ardour2/branches/3.0@9191 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 14:36:29 +00:00
Carl Hetherington
22870bdc49 Happy new year.
git-svn-id: svn://localhost/ardour2/branches/3.0@8899 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-18 00:24:27 +00:00
ed48b97900 provide runtime control over how much boost "live" debugging info is provided
git-svn-id: svn://localhost/ardour2/branches/3.0@8821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-10 17:44:33 +00:00
1bef5c6d5d do not set LV2_PATH for a bundled build
git-svn-id: svn://localhost/ardour2/branches/3.0@8681 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-02 19:49:47 +00:00
842be9287c unset GTK_RC_FILES to prevent the system from messing with a bundled install
git-svn-id: svn://localhost/ardour2/branches/3.0@8677 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-02 16:25:16 +00:00
8a82309d8a bundle needs to set panner path
git-svn-id: svn://localhost/ardour2/branches/3.0@8668 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 22:24:40 +00:00
ce7dcfe320 remove debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@8667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 22:03:50 +00:00
2b839bd13b compile fix
git-svn-id: svn://localhost/ardour2/branches/3.0@8660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 19:55:08 +00:00
91e6c1b176 run bundle fixup code for all platforms
git-svn-id: svn://localhost/ardour2/branches/3.0@8658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 19:53:15 +00:00
dd3b268b72 show the bundle root
git-svn-id: svn://localhost/ardour2/branches/3.0@8656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 19:36:19 +00:00
603d07a80b forward port EPA changes from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@8473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-07 16:25:57 +00:00
10ead326e4 backport from 2.X: arm (and thus save) global environment before messing it with it in bundled version
git-svn-id: svn://localhost/ardour2/branches/3.0@8455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-06 00:42:01 +00:00
e99087a273 add EPA stuff from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@8337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-23 04:17:45 +00:00
ffe783e308 nothing uses ARDOUR_DATA_PATH so remove it
git-svn-id: svn://localhost/ardour2/branches/3.0@8222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-08 21:00:58 +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
2a00515a78 missing() on call
git-svn-id: svn://localhost/ardour2/branches/3.0@7997 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 22:49:04 +00:00
3903bc0cb2 merge linux bundle fixup code from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@7961 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-04 02:40:07 +00:00
6a93c41201 round one of work on finalizing #3098, involving per-field updating functions for each field in the region list. also "start" renamed to "position" for consistency with other parts of ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7813 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-20 15:12:44 +00:00
da8eec7a83 remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
b2bf4eee3d 2.X commits up to and including 7519
git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-20 22:36:35 +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
f5c4c8a293 forward port 2.X changes up to and including rev 6767
git-svn-id: svn://localhost/ardour2/branches/3.0@7636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 00:28:20 +00:00
Carl Hetherington
8367132a85 Fix a panner crash when reducing a route's output count down to 2. Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@7560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-07 23:30:37 +00:00
6ef5d85ae1 changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 15:33:04 +00:00
44f4b84551 finalize PROGRAM_NAME change for ardour3
git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-15 02:31:27 +00:00
8687895abb remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 15:02:15 +00:00
b8b55ef003 OSC is now driven by an event loop; fix up lifetime mgmt of Glib::Source to workaround bug in Glib
git-svn-id: svn://localhost/ardour2/branches/3.0@6329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 18:37:06 +00:00
c38e02285f major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI and AbstractUI; solo & mute are both temporarily broken; OSC control up next; may segfault during exit
git-svn-id: svn://localhost/ardour2/branches/3.0@6328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 03:05:14 +00:00
c71f419920 Make ARDOUR::init safer.
git-svn-id: svn://localhost/ardour2/branches/3.0@5950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-27 18:00:45 +00:00
d51ce9ea71 Fix spacey tab.
git-svn-id: svn://localhost/ardour2/branches/3.0@5948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-27 17:47:02 +00:00