Another similar fix for use of an uninitialized variable.

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 0edf450cd1b8003c1c98053706c211535778060d..70f3a154988480fb4f0f52dad10c3014623e38ae 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -23,25 +23,25 @@
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
-#include <pbd/textreceiver.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/pthread_utils.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
+#include "pbd/textreceiver.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/pthread_utils.h"
 
 #include <jack/jack.h>
 
-#include <ardour/version.h>
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/session_utils.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/svn_revision.h"
+#include "ardour/version.h"
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/session_utils.h"
+#include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
-#include "../svn_revision.h"
 #include "version.h"
 #include "utils.h"
 #include "ardour_ui.h"
@@ -50,6 +50,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
 using namespace ARDOUR;
@@ -117,7 +118,10 @@ fixup_bundle_environment ()
        Glib::ustring path;
        const char *cstr = getenv ("PATH");
 
-       /* ensure that we find any bundled executables (e.g. JACK) */
+       /* ensure that we find any bundled executables (e.g. JACK),
+          and find them before any instances of the same name
+          elsewhere in PATH
+       */
 
        path = dir_path;
        if (cstr) {
@@ -148,12 +152,18 @@ 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;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Plugins";
        
        setenv ("LADSPA_PATH", path.c_str(), 1);
@@ -162,8 +172,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Frameworks";
        
        setenv ("VAMP_PATH", path.c_str(), 1);
@@ -172,8 +184,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Surfaces";
        
        setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
@@ -182,8 +196,10 @@ fixup_bundle_environment ()
        if (cstr) {
                path = cstr;
                path += ':';
+       } else {
+               path = "";
        }
-       path = dir_path;
+       path += dir_path;
        path += "/../Plugins";
        
        setenv ("LV2_PATH", path.c_str(), 1);
@@ -253,7 +269,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
@@ -268,12 +283,15 @@ fixup_bundle_environment ()
 #endif
 
 static void
-sigpipe_handler (int sig)
+sigpipe_handler (int /*sig*/)
 {
        cerr << _("SIGPIPE received - JACK has probably died") << endl;
 }
 
 #ifdef VST_SUPPORT
+
+extern int gui_init (int* argc, char** argv[]);
+
 /* this is called from the entry point of a wine-compiled
    executable that is linked against gtk2_ardour built
    as a shared library.
@@ -286,16 +304,20 @@ 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 ();
 
+#ifdef VST_SUPPORT
+       /* this does some magic that is needed to make GTK and Wine's own
+          X11 client interact properly.
+       */
+       gui_init (&argc, &argv);
+#endif
+
        (void) bindtextdomain (PACKAGE, localedir);
        /* our i18n translations are all in UTF-8, so make sure
           that even if the user locale doesn't specify UTF-8,
@@ -323,8 +345,8 @@ int main (int argc, char *argv[])
        
        cout << _("Ardour/GTK ") 
             << VERSIONSTRING
-            << _("\n   (built using ")
-            << ardour_svn_revision
+            << _(" (built using ")
+            << svn_revision
 #ifdef __GNUC__
             << _(" and GCC version ") << __VERSION__ 
 #endif