Fix DSP load sorting with inactive plugins

[ardour.git] / gtk2_ardour / bundle_env_linux.cc

diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index e553213ec0417fb1f053e865075a797d0eec9b07..387a9aaae8528edb5f532ae342f92b380fe38891 100644 (file)
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -1,21 +1,21 @@
 /*
-    Copyright (C) 2001-2012 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2014-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015-2018 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <string>
 #include <vector>
@@ -36,6 +36,7 @@
 #include "pbd/pathexpand.h"
 #include "pbd/file_utils.h"
 
+#include "ardour_http.h"
 #include "bundle_env.h"
 
 #include "pbd/i18n.h"
@@ -66,7 +67,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
        }
 #endif
 
-#ifdef ENABLE_NLS
+#if ENABLE_NLS
        if (!ARDOUR::translations_are_enabled ()) {
                localedir = "/this/cannot/exist";
        } else {
@@ -110,32 +111,40 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
                error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
        }
 
-        /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
-           from looking outside the bundle to find the charset.alias file.
-        */
-        g_setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
+       /* this doesn't do much but setting it should prevent various parts of the GTK/GNU stack
+                from looking outside the bundle to find the charset.alias file.
+                */
+       g_setenv ("CHARSETALIASDIR", dir_path.c_str(), 1);
 
+       ArdourCurl::HttpGet::setup_certificate_paths ();
 }
 
 void
 load_custom_fonts()
 {
-       std::string ardour_mono_file;
+       FcConfig* config = FcInitLoadConfigAndFonts();
+
+       std::string font_file;
 
-       if (!find_file (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+       if (!find_file (ardour_data_search_path(), "ArdourMono.ttf", font_file)) {
                cerr << _("Cannot find ArdourMono TrueType font") << endl;
+       } else {
+               FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(font_file.c_str()));
+               if (ret == FcFalse) {
+                       cerr << _("Cannot load ArdourMono TrueType font.") << endl;
+               }
        }
 
-       FcConfig *config = FcInitLoadConfigAndFonts();
-       FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(ardour_mono_file.c_str()));
-
-       if (ret == FcFalse) {
-               cerr << _("Cannot load ArdourMono TrueType font.") << endl;
+       if (!find_file (ardour_data_search_path(), "ArdourSans.ttf", font_file)) {
+               cerr << _("Cannot find ArdourSans TrueType font") << endl;
+       } else {
+               FcBool ret = FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(font_file.c_str()));
+               if (ret == FcFalse) {
+                       cerr << _("Cannot load ArdourSans TrueType font.") << endl;
+               }
        }
 
-       ret = FcConfigSetCurrent(config);
-
-       if (ret == FcFalse) {
+       if (FcFalse == FcConfigSetCurrent(config)) {
                cerr << _("Failed to set fontconfig configuration.") << endl;
        }
 }