Change ARDOUR::init return type to bool type for success/failure

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 97726cd7ae33b3ecf6f0a30314d95f5010f5a2a4..86e838d122357f5c55b710512932a52c21dc1892 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -291,7 +291,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        /* lets get this party started */
 
        try {
-               if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+               if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
                        throw failed_constructor ();
                }
 

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 5f64c4b6a31bcae51e6d09ec3e2b15a211d11d0f..eaf6b572fd9c2bea81a7a67b4fcbc484ac7b0ad5 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -50,7 +50,15 @@ namespace ARDOUR {
        extern PBD::Signal1<void,std::string> BootMessage;
        extern PBD::Signal0<void> GUIIdle;
 
-       int init (bool with_vst, bool try_optimization, const char* localedir);
+       /**
+        * @param with_vst true to enable VST Support
+        * @param try_optimization true to enable hardware optimized routines
+        * for mixing, finding peak values etc.
+        * @param localedir Directory to look for localisation files
+        *
+        * @return true if Ardour library was successfully initialized
+        */
+       bool init (bool with_vst, bool try_optimization, const char* localedir);
        void init_post_engine ();
        int cleanup ();
        bool no_auto_connect ();

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 4c91956ffda0d1151f98b34e43dd27899578b5eb..5e3553ad8a7e678799021bac78f48521a14fc12a 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -215,7 +215,7 @@ lotsa_files_please ()
        }
 }
 
-int
+bool
 ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir)
 {
        if (!Glib::thread_supported()) {
@@ -269,7 +269,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
        Config = new RCConfiguration;
 
        if (Config->load_state ()) {
-               return -1;
+               return false;
        }
 
        Config->set_use_windows_vst (use_windows_vst);
@@ -282,13 +282,13 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
 #ifdef WINDOWS_VST_SUPPORT
        if (Config->get_use_windows_vst() && fst_init (0)) {
-               return -1;
+               return false;
        }
 #endif
 
 #ifdef LXVST_SUPPORT
        if (Config->get_use_lxvst() && vstfx_init (0)) {
-               return -1;
+               return false;
        }
 #endif
 
@@ -331,7 +331,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
        EventTypeMap::instance().new_parameter(EnvelopeAutomation);
        EventTypeMap::instance().new_parameter(MidiCCAutomation);
 
-       return 0;
+       return true;
 }
 
 void