Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

25 files changed, 66 insertions, 33 deletions

diff --git a/gtk2_ardour/export_video_infobox.cc b/gtk2_ardour/export_video_infobox.cc
index fbe28bd821..a3e356decc 100644
--- a/gtk2_ardour/export_video_infobox.cc
+++ b/gtk2_ardour/export_video_infobox.cc
@@ -18,6 +18,9 @@
 
 */
 #include "ardour/session.h"
+#ifdef interface
+#undef interface
+#endif
 #include "export_video_infobox.h"
 #include "i18n.h"
 
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 27fa9f5d42..2492d1a348 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -242,7 +242,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
 	/* adjust to properly locate the tip */
 
-	mark = new Polygon (*group);
+	mark = new ArdourCanvas::Polygon (*group);
 	mark->property_points() = *points;
 	set_color_rgba (rgba);
 	mark->property_width_pixels() = 1;
diff --git a/gtk2_ardour/midi_channel_selector.cc b/gtk2_ardour/midi_channel_selector.cc
index 2f5ca729a6..b51584aef5 100644
--- a/gtk2_ardour/midi_channel_selector.cc
+++ b/gtk2_ardour/midi_channel_selector.cc
@@ -516,7 +516,7 @@ MidiChannelSelectorWindow::set_playback_selected_channels (uint16_t mask)
 	case ForceChannel:
 		/* only set the lowest set channel in the mask as active */
 		for (uint16_t i = 0; i < 16; i++) {
-			playback_buttons[i]->set_active (i == (ffs (mask) - 1));
+			playback_buttons[i]->set_active (i == (PBD::ffs (mask) - 1));
 		}
 		break;
 	}
@@ -539,7 +539,7 @@ MidiChannelSelectorWindow::set_capture_selected_channels (uint16_t mask)
 	case ForceChannel:
 		/* only set the lowest set channel in the mask as active */
 		for (uint16_t i = 0; i < 16; i++) {
-			capture_buttons[i]->set_active (i == (ffs (mask) - 1));
+			capture_buttons[i]->set_active (i == (PBD::ffs (mask) - 1));
 		}
 		break;
 	}
@@ -595,7 +595,7 @@ MidiChannelSelectorWindow::playback_mode_changed ()
 	case ForceChannel:
 		if (last_drawn_playback_mode == AllChannels || last_drawn_playback_mode == FilterChannels) {
 			playback_buttons.clear ();
-			first_channel = ffs (track->get_playback_channel_mask()) - 1;
+			first_channel = PBD::ffs (track->get_playback_channel_mask()) - 1;
 		}
 		for (vector<Widget*>::iterator i = playback_mask_controls.begin(); i != playback_mask_controls.end(); ++i) {
 			(*i)->set_sensitive (false);
@@ -693,7 +693,7 @@ MidiChannelSelectorWindow::capture_mode_changed ()
 	case ForceChannel:
 		if (last_drawn_capture_mode == AllChannels || last_drawn_capture_mode == FilterChannels) {
 			capture_buttons.clear ();
-			first_channel = ffs (track->get_capture_channel_mask()) - 1;
+			first_channel = PBD::ffs (track->get_capture_channel_mask()) - 1;
 		}
 		for (vector<Widget*>::iterator i = capture_mask_controls.begin(); i != capture_mask_controls.end(); ++i) {
 			(*i)->set_sensitive (false);
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 3da5f11f10..93649dbebe 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -738,7 +738,7 @@ MidiTimeAxisView::add_single_channel_controller_item(Menu_Helpers::MenuList& ctl
 				}
 			}
 
-			Gtk::CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&ctl_items.back());
+			Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&ctl_items.back());
 			_controller_menu_map[fully_qualified_param] = cmi;
 			cmi->set_active (visible);
 
@@ -794,7 +794,7 @@ MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_
 				}
 			}
 
-			Gtk::CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
+			Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&chn_items.back());
 			_controller_menu_map[fully_qualified_param] = cmi;
 			cmi->set_active (visible);
 		}
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 9499c6c184..15b9f40919 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -32,6 +32,10 @@
 
 #include "i18n.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 using namespace PBD;
 
 TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
@@ -122,7 +126,7 @@ TranscodeFfmpeg::probe ()
 	 * SystemExec::Terminated is emitted and ffcmd set to NULL */
 	int timeout = 300; // 1.5 sec
 	while (ffcmd && --timeout > 0) {
-		usleep(5000);
+		Glib::usleep(5000);
 	}
 	if (timeout == 0 || ffoutput.empty()) {
 		return false;
@@ -503,7 +507,11 @@ TranscodeFfmpeg::cancel ()
 {
 	if (!ffcmd || !ffcmd->is_running()) { return;}
 	ffcmd->write_to_stdin("q");
+#ifdef WIN32
+	Sleep(1000);
+#else
 	sleep (1);
+#endif
 	if (ffcmd) {
 	  ffcmd->terminate();
 	}
diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index 504fc3d2eb..1496893e82 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -253,6 +253,7 @@ video_query_info (
 			, filepath.c_str());
 	char *res = curl_http_get(url, NULL);
 	int pid=0;
+#ifndef COMPILER_MINGW
 	if (res) {
 		char *pch, *pst;
 		int version;
@@ -285,6 +286,7 @@ video_query_info (
 		}
 	  free(res);
 	}
+#endif
 	if (pid!=5) {
 		return false;
 	}
diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index 3c39dea77b..310f3a68d3 100644
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -197,7 +197,7 @@ http_get_thread (void *arg) {
 	char *res = NULL;
 	do {
 		res=curl_http_get(url, &status);
-		if (status == 503) usleep(5000); // try-again
+		if (status == 503) Glib::usleep(5000); // try-again
 	} while (status == 503 && --timeout > 0);
 
 	if (status != 200 || !res) {
@@ -246,7 +246,7 @@ VideoImageFrame::http_download_done (char *data){
 
 	exposeimg();
 	/* don't request frames too quickly, wait after user has zoomed */
-	usleep(40000);
+	Glib::usleep(40000);
 
 	if (queued_request) {
 		http_get_again(want_video_frame_number);
diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 2c265365fa..ae4d5faacc 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -94,7 +94,7 @@ VideoMonitor::query_full_state (bool wait)
 	process->write_to_stdin("get osdcfg\n");
 	int timeout = 40;
 	if (wait && knownstate !=127 && --timeout) {
-		usleep(50000);
+		Glib::usleep(50000);
 		sched_yield();
 	}
 }
@@ -113,7 +113,7 @@ VideoMonitor::quit ()
 	 */
 	int timeout = 40;
 	while (is_started() && --timeout) {
-		usleep(50000);
+		Glib::usleep(50000);
 		sched_yield();
 	}
 	if (timeout <= 0) {
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 8838409ccf..468bcc5c8d 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -29,10 +29,18 @@
 #include "ardour/template_utils.h"
 #include "ardour/session.h"
 
+#ifdef interface
+#undef interface
+#endif
+
 #include "video_server_dialog.h"
 #include "utils_videotl.h"
 #include "i18n.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 using namespace Gtk;
 using namespace std;
 using namespace PBD;
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
index 64176232f0..a758ad78f4 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -27,6 +27,10 @@
 #include <setjmp.h>
 #include <pthread.h>
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <glibmm/thread.h>
 
 #include <gtkmm/widget.h>
diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 3f1f1cf670..5784ec9428 100644
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -23,7 +23,7 @@
 #include <cerrno>
 #include <cstdlib>
 
-#include <boost/regex.h>
+#include <regex.h>
 
 #include <glibmm/miscutils.h>
 
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 1b2948c50a..335d14ee87 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -35,10 +35,12 @@ def sub_config_and_use(conf, name, has_objects = True):
 def configure(conf):
     autowaf.set_recursive()
     autowaf.configure(conf)
-
+    
     for i in children:
         sub_config_and_use(conf, i)
 
+    if (conf.env['build_target'] == 'mingw'): return
+
     #autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
     #if Options.options.tranzport and conf.is_defined('HAVE_USB'):
     #    conf.define('BUILD_TRANZPORT', 1)
@@ -63,6 +65,7 @@ def configure(conf):
 
 def build(bld):
     bld.recurse('control_protocol')
+    if (bld.env['build_target'] == 'mingw'): return
     if bld.is_defined ('BUILD_MACKIE'):
         bld.recurse('mackie')
     if bld.is_defined ('HAVE_LO'):
diff --git a/libs/vamp-plugins/SpectralCentroid.cpp b/libs/vamp-plugins/SpectralCentroid.cpp
index f1493bf282..f93fdcaa32 100644
--- a/libs/vamp-plugins/SpectralCentroid.cpp
+++ b/libs/vamp-plugins/SpectralCentroid.cpp
@@ -44,7 +44,7 @@
 #define isnan(val) (bool)_isnan((double)val)
 #else
 using std::isnan;
-using std:isinf;
+using std::isinf;
 #endif
 
 #include "SpectralCentroid.h"
diff --git a/tools/windows_packaging/clean.sh b/tools/windows_packaging/clean.sh
index 95776124aa..95776124aa 100644..100755
--- a/tools/windows_packaging/clean.sh
+++ b/tools/windows_packaging/clean.sh
diff --git a/tools/windows_packaging/configure-debug.sh b/tools/windows_packaging/configure-debug.sh
index bcee29deba..bcee29deba 100644..100755
--- a/tools/windows_packaging/configure-debug.sh
+++ b/tools/windows_packaging/configure-debug.sh
diff --git a/tools/windows_packaging/configure-release.sh b/tools/windows_packaging/configure-release.sh
index 2e943e00fe..2e943e00fe 100644..100755
--- a/tools/windows_packaging/configure-release.sh
+++ b/tools/windows_packaging/configure-release.sh
diff --git a/tools/windows_packaging/cptovm.sh b/tools/windows_packaging/cptovm.sh
index 62e6fd6a27..62e6fd6a27 100644..100755
--- a/tools/windows_packaging/cptovm.sh
+++ b/tools/windows_packaging/cptovm.sh
diff --git a/tools/windows_packaging/make-installer.sh b/tools/windows_packaging/make-installer.sh
index 621f271a61..621f271a61 100644..100755
--- a/tools/windows_packaging/make-installer.sh
+++ b/tools/windows_packaging/make-installer.sh
diff --git a/tools/windows_packaging/mingw-env.sh b/tools/windows_packaging/mingw-env.sh
index 37a575885f..616f89af5e 100644..100755
--- a/tools/windows_packaging/mingw-env.sh
+++ b/tools/windows_packaging/mingw-env.sh
@@ -26,8 +26,9 @@ BUILD_DIR=$BASE/build
 BUILD_CACHE_FILE=$BUILD_DIR/c4che/_cache.py
 TOOLS_DIR=$BASE/tools/windows_packaging
 
+. ../define_versions.sh
+
 APPNAME=`grep -m 1 '^APPNAME' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
-VERSION=`grep -m 1 '^VERSION' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
 
 # These are only relevant after a build
 if test -f $BUILD_CACHE_FILE
@@ -35,9 +36,9 @@ then
 	# Figure out the Build Type
 	if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
 		DEBUG=1
-		PACKAGE_DIR="$APPNAME-$VERSION-win32-dbg"
+		PACKAGE_DIR="$APPNAME-${version}-win32-dbg"
 	else
-		PACKAGE_DIR="$APPNAME-$VERSION-win32"
+		PACKAGE_DIR="$APPNAME-${version}-win32"
 	fi
 
 	if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
@@ -48,4 +49,4 @@ then
 fi
 
 # put this somewhere better...
-VIRT_IMAGE_PATH=$HOME/virt-images/winxp.raw
+VIRT_IMAGE_PATH=$HOME/Data/virt-images/winxp.raw
diff --git a/tools/windows_packaging/package.sh b/tools/windows_packaging/package.sh
index 1270bc0cc5..92f55e8906 100644..100755
--- a/tools/windows_packaging/package.sh
+++ b/tools/windows_packaging/package.sh
@@ -60,6 +60,7 @@ jackserver-0.dll
 libart_lgpl_2-2.dll
 libatk-1.0-0.dll
 libatkmm-1.6-1.dll
+libbz2-1.dll
 libcairo-2.dll
 libcairo-gobject-2.dll
 libcairomm-1.0-1.dll
@@ -90,6 +91,7 @@ libgobject-2.0-0.dll
 libgthread-2.0-0.dll
 libgtkmm-2.4-1.dll
 libgtk-win32-2.0-0.dll
+libharfbuzz-0.dll
 libiconv-2.dll
 iconv.dll
 libFLAC-8.dll
@@ -99,6 +101,7 @@ libvorbisenc-2.dll
 libffi-6.dll
 libidn-11.dll
 libintl-8.dll
+liblo-7.dll
 libpango-1.0-0.dll
 libpangocairo-1.0-0.dll
 libpangoft2-1.0-0.dll
diff --git a/tools/windows_packaging/print-env.sh b/tools/windows_packaging/print-env.sh
index d6f63a2e5b..d6f63a2e5b 100644..100755
--- a/tools/windows_packaging/print-env.sh
+++ b/tools/windows_packaging/print-env.sh
diff --git a/tools/windows_packaging/run-wine.sh b/tools/windows_packaging/run-wine.sh
index 86415206cc..86415206cc 100644..100755
--- a/tools/windows_packaging/run-wine.sh
+++ b/tools/windows_packaging/run-wine.sh
diff --git a/tools/windows_packaging/startvm.sh b/tools/windows_packaging/startvm.sh
index 6d36bd8cb7..de65be9b5d 100644..100755
--- a/tools/windows_packaging/startvm.sh
+++ b/tools/windows_packaging/startvm.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
+. mingw-env.sh
 
-qemu-kvm -smp 2 -m 1536 -hda $HOME/virt-images/winxp.raw -net nic -net user -vga std -soundhw all
+qemu-kvm -smp 2 -m 1536 -hda $VIRT_IMAGE_PATH -net nic -net user -vga std -soundhw all
diff --git a/tools/windows_packaging/waf.sh b/tools/windows_packaging/waf.sh
index 5b581ba85e..5b581ba85e 100644..100755
--- a/tools/windows_packaging/waf.sh
+++ b/tools/windows_packaging/waf.sh
diff --git a/wscript b/wscript
index 3088319def..d4d0cc2be4 100644
--- a/wscript
+++ b/wscript
@@ -46,15 +46,6 @@ i18n_children = [
         'libs/gtkmm2ext',
 ]
 
-if sys.platform == 'linux2':
-    children += [ 'tools/sanity_check' ]
-    lxvst_default = True
-elif sys.platform == 'darwin':
-    children += [ 'libs/appleutility' ]
-    lxvst_default = False
-else:
-    lxvst_default = False
-
 # Version stuff
 
 def fetch_gcc_version (CC):
@@ -253,7 +244,7 @@ def set_compiler_flags (conf,opt):
         print("However, this is tricky and not recommended for beginners.")
         sys.exit (-1)
 
-    if opt.lxvst:
+    if conf.env['LXVST_SUPPORT'] == True:
         if conf.env['build_target'] == 'x86_64':
             conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT")
         else:
@@ -425,7 +416,7 @@ def options(opt):
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
     opt.add_option('--no-lv2', action='store_false', dest='lv2',
                     help='Do not compile with support for LV2')
-    opt.add_option('--lxvst', action='store_true', default=False, dest='lxvst',
+    opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
                     help='Compile with support for linuxVST plugins')
     opt.add_option('--nls', action='store_true', default=True, dest='nls',
                     help='Enable i18n (native language support) (default)')
@@ -618,6 +609,10 @@ def configure(conf):
 
     if Options.options.dist_target == 'mingw':
         Options.options.fpu_optimization = False
+        conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS')
+        conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW')
+        conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS')
+        conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW')
         conf.env.append_value('LIB', 'pthreadGC2')
         # needed for at least libsmf
         conf.check_cc(function_name='htonl', header_name='winsock2.h', lib='ws2_32')
@@ -670,8 +665,13 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include)
         autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True)
     if opts.lxvst:
-        conf.define('LXVST_SUPPORT', 1)
-        conf.env['LXVST_SUPPORT'] = True
+        if sys.platform == 'darwin':
+            conf.env['LXVST_SUPPORT'] = False
+        elif Options.options.dist_target == 'mingw':
+            conf.env['LXVST_SUPPORT'] = False
+	else:
+	    conf.define('LXVST_SUPPORT', 1)
+	    conf.env['LXVST_SUPPORT'] = True
     if bool(conf.env['JACK_SESSION']):
         conf.define('HAVE_JACK_SESSION', 1)
     conf.define('WINDOWS_KEY', opts.windows_key)