diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
| commit | bc89fe0147c04b67141936d109c00dfd4d69cc4b (patch) | |
| tree | 544ff450c40fe1f43853a8420228a26f27f1eafb /gtk2_ardour/main.cc | |
| parent | 30daaebaa2d90d6b0e8673143ccc3cacd7bd1753 (diff) | |
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index aecbc1f634..c7724cff63 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -151,6 +151,10 @@ fixup_bundle_environment () setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1); setenv ("ARDOUR_DATA_PATH", path.c_str(), 1); + path = dir_path; + path += "/../Resources"; + setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1); + cstr = getenv ("LADSPA_PATH"); if (cstr) { path = cstr; @@ -264,7 +268,6 @@ fixup_bundle_environment () path += "/../Resources/gdk-pixbuf.loaders"; setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1); - cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl; if (getenv ("ARDOUR_WITH_JACK")) { // JACK driver dir @@ -297,12 +300,9 @@ int main (int argc, char *argv[]) { vector<Glib::ustring> null_file_list; - cerr << "here we go\n"; - #ifdef __APPLE__ fixup_bundle_environment (); #endif - cerr << "just did it\n"; Glib::thread_init(); gtk_set_locale (); |