Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 5dd3695dc9036b9fdb0209c49b873b61b60e3cc2..b4f5a36521d49dd138f7f36db0bfb77d5b44b52d 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -49,7 +49,6 @@
 #include <gtkmm2ext/utils.h>
 
 #include "version.h"
-#include "utils.h"
 #include "ardour_ui.h"
 #include "opts.h"
 #include "enums.h"
@@ -57,10 +56,14 @@
 
 #include "i18n.h"
 
-#ifdef COMPILER_MSVC
+#ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
 #endif
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -126,6 +129,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n
        return false; /* do not call again */
 }
 
+#ifndef PLATFORM_WINDOWS
 static void
 sigpipe_handler (int /*signal*/)
 {
@@ -140,6 +144,7 @@ sigpipe_handler (int /*signal*/)
                done_the_backend_thing =  true;
        }
 }
+#endif
 
 #if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
 /*
@@ -164,12 +169,6 @@ int ardour_main (int argc, char *argv[])
 int main (int argc, char *argv[])
 #endif
 {
-#ifdef COMPILER_MSVC
-       // Essential!!  Make sure that any files used by Ardour
-       //              will be created or opened in BINARY mode!
-       _fmode = O_BINARY;
-#endif
-
        fixup_bundle_environment (argc, argv, &localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */