X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=MSVCardour3%2FArdour3.vcproj;h=3cb59e9b26c3fd0d6fc5ee3073633229fa9c3180;hb=95129a48c48f864044b92e021042868171189c95;hp=2e64451156d0dd385a612b123d9fc14fd33acad4;hpb=146072ec6173273f56f7f6b698c338c81a1505d2;p=ardour.git

diff --git a/MSVCardour3/Ardour3.vcproj b/MSVCardour3/Ardour3.vcproj
index 2e64451156..3cb59e9b26 100644
--- a/MSVCardour3/Ardour3.vcproj
+++ b/MSVCardour3/Ardour3.vcproj
@@ -25,7 +25,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Prepare configuration file(s)"
-				CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
+				CommandLine="cd ..&#x0D;&#x0A;del gtk2_ardour\ardour.keys&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;perl tools/fmt-bindings --platform=&quot;windows&quot; --winkey=&quot;Win&quot; --accelmap  gtk2_ardour/ardour.keys.in &gt; gtk2_ardour/ardour.keys&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -43,8 +43,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/FI$(TargetSxsFolder)\targetsxs.h"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\timecode;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
-				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;LIBCANVAS_STATIC;CANVAS_DEBUG;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_H;WIN32;_WIN32;_WINDOWS;_MBCS;_DEBUG;DEBUG=&quot;Debug&quot;;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;CLEARLOOKS_CONF_LOCATION=&quot;\&quot;\\etc\\engines\\libclearlooks.la\&quot;&quot;;FONTS_CONF_LOCATION=&quot;\&quot;\\etc\\fontconfig\\fonts.conf\&quot;&quot;;PANGO_CONF_LOCATION=&quot;\&quot;\\etc\\pango\\pango.modules\&quot;&quot;;PIXBUFLOADERS_CONF_LOCATION=&quot;\&quot;\\etc\\gtk-2.0\\gdk-pixbuf.loaders\&quot;&quot;;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TIMECODE=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;CURRENT_SESSION_FILE_VERSION=3002;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
+				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\temporal;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\waveview;..\libs\widgets;&quot;..\libs\zita-resampler&quot;;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
+				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;LIBCANVAS_STATIC;LIBWAVEVIEW_STATIC;CANVAS_DEBUG;WAVEVIEW_DEBUG;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_H;WIN32;_WIN32;_WINDOWS;_MBCS;_DEBUG;DEBUG=&quot;Debug&quot;;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;CLEARLOOKS_CONF_LOCATION=&quot;\&quot;\\etc\\engines\\libclearlooks.la\&quot;&quot;;FONTS_CONF_LOCATION=&quot;\&quot;\\etc\\fontconfig\\fonts.conf\&quot;&quot;;PANGO_CONF_LOCATION=&quot;\&quot;\\etc\\pango\\pango.modules\&quot;&quot;;PIXBUFLOADERS_CONF_LOCATION=&quot;\&quot;\\etc\\gtk-2.0\\gdk-pixbuf.loaders\&quot;&quot;;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TEMPORAL=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
 				StructMemberAlignment="0"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconvD.lib zlib1D.lib boost-regex32D.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix)D.lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix)D.lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix)D.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)D.lib $(DllPrefix)giomm32$(GlibmmDllSuffix)D.lib $(DllPrefix)cairomm32$(CairommDllSuffix)D.lib $(DllPrefix)pangomm32$(PangommDllSuffix)D.lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix)D.lib $(DllPrefix)pangoft232$(PangoDllSuffix)D.lib $(DllPrefix)pangowin32$(PangoDllSuffix)D.lib $(DllPrefix)pangocairo32$(PangoDllSuffix)D.lib $(DllPrefix)cairo32$(CairoDllSuffix)D.lib $(DllPrefix)atk32$(AtkDllSuffix)D.lib $(DllPrefix)gthread32$(GlibDllSuffix)D.lib $(DllPrefix)gobject32$(GlibDllSuffix)D.lib $(DllPrefix)gmodule32$(GlibDllSuffix)D.lib $(DllPrefix)glib32$(GlibDllSuffix)D.lib $(DllPrefix)gio32$(GlibDllSuffix)D.lib $(DllPrefix)gtk32$(GtkDllSuffix)D.lib $(DllPrefix)gdk32$(GtkDllSuffix)D.lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix)D.lib $(DllPrefix)sigc++32-2.0D.lib $(DllPrefix)curlD.lib $(DllPrefix)fontconfigD.lib freetype32-2D.lib raptor2D.lib lrdfD.lib libloD.lib $(DllPrefix)ardour32D.lib $(DllPrefix)ardour_cp32D.lib $(DllPrefix)audiographer32D.lib $(DllPrefix)lua32D.lib $(DllPrefix)pbd32D.lib $(DllPrefix)midi++32D.lib $(DllPrefix)evoral32D.lib $(DllPrefix)ptformat32-0D.lib $(DllPrefix)gtkmm2ext32D.lib $(DllPrefix)ltcD.lib $(DllPrefix)timecode32D.lib cairocanvasD.lib rubberbandD.lib $(DllPrefix)sndfile-1D.lib $(DllPrefix)samplerate-0D.lib vampsdkD.lib vamphostsdkD.lib panner_1in2out32D.lib panner_2in2out32D.lib panner_vbap32D.lib $(DllPrefix)lilv32-0D.lib $(DllPrefix)suil32-0D.lib $(DllPrefix)serd32-0D.lib $(DllPrefix)sord32-0D.lib $(DllPrefix)sratom32-0D.lib libart_lgpl_2D.lib libjackD.lib libxml2D.lib intlD.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
+				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconvD.lib zlib1D.lib boost-regex32D.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix)D.lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix)D.lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix)D.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)D.lib $(DllPrefix)giomm32$(GlibmmDllSuffix)D.lib $(DllPrefix)cairomm32$(CairommDllSuffix)D.lib $(DllPrefix)pangomm32$(PangommDllSuffix)D.lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix)D.lib $(DllPrefix)pangoft232$(PangoDllSuffix)D.lib $(DllPrefix)pangowin32$(PangoDllSuffix)D.lib $(DllPrefix)pangocairo32$(PangoDllSuffix)D.lib $(DllPrefix)cairo32$(CairoDllSuffix)D.lib $(DllPrefix)atk32$(AtkDllSuffix)D.lib $(DllPrefix)gthread32$(GlibDllSuffix)D.lib $(DllPrefix)gobject32$(GlibDllSuffix)D.lib $(DllPrefix)gmodule32$(GlibDllSuffix)D.lib $(DllPrefix)glib32$(GlibDllSuffix)D.lib $(DllPrefix)gio32$(GlibDllSuffix)D.lib $(DllPrefix)gtk32$(GtkDllSuffix)D.lib $(DllPrefix)gdk32$(GtkDllSuffix)D.lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix)D.lib $(DllPrefix)sigc++32-2.0D.lib $(DllPrefix)curlD.lib $(DllPrefix)fontconfigD.lib freetype32-2D.lib raptor2D.lib lrdfD.lib libloD.lib $(DllPrefix)ardour32D.lib $(DllPrefix)ardour_cp32D.lib $(DllPrefix)audiographer32D.lib $(DllPrefix)lua32D.lib $(DllPrefix)pbd32D.lib $(DllPrefix)midi++32D.lib $(DllPrefix)evoral32D.lib $(DllPrefix)ptformat32-0D.lib $(DllPrefix)gtkmm2ext32D.lib $(DllPrefix)ltcD.lib $(DllPrefix)temporal32D.lib $(DllPrefix)widgets32D.lib waveviewD.lib cairocanvasD.lib rubberbandD.lib $(DllPrefix)sndfile-1D.lib $(DllPrefix)samplerate-0D.lib vampsdkD.lib vamphostsdkD.lib panner_1in2out32D.lib panner_2in2out32D.lib panner_vbap32D.lib $(DllPrefix)lilv32-0D.lib $(DllPrefix)suil32-0D.lib $(DllPrefix)serd32-0D.lib $(DllPrefix)sord32-0D.lib $(DllPrefix)sratom32-0D.lib libart_lgpl_2D.lib libjackD.lib libxml2D.lib intlD.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
 				OutputFile="$(Debug32TestSuiteFolder)\$(ProjectName)D.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
@@ -98,7 +98,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
+				CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;ardour.keys&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Debug32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Prepare configuration file(s)"
-				CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
+				CommandLine="cd ..&#x0D;&#x0A;del gtk2_ardour\ardour.keys&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;perl tools/fmt-bindings --platform=&quot;windows&quot; --winkey=&quot;Win&quot; --accelmap  gtk2_ardour/ardour.keys.in &gt; gtk2_ardour/ardour.keys&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -131,8 +131,8 @@
 				AdditionalOptions="/FI$(TargetSxsFolder)\targetsxs.h"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\timecode;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
-				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;LIBCANVAS_STATIC;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_H;WIN32;_WIN32;_WINDOWS;_MBCS;NDEBUG;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TIMECODE=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;CURRENT_SESSION_FILE_VERSION=3002;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
+				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\temporal;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\waveview;..\libs\widgets;&quot;..\libs\zita-resampler&quot;;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
+				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;LIBCANVAS_STATIC;LIBWAVEVIEW_STATIC;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_H;WIN32;_WIN32;_WINDOWS;_MBCS;NDEBUG;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TEMPORAL=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
@@ -149,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconv.lib zlib1.lib boost-regex32.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix).lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix).lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix).lib $(DllPrefix)glibmm32$(GlibmmDllSuffix).lib $(DllPrefix)giomm32$(GlibmmDllSuffix).lib $(DllPrefix)cairomm32$(CairommDllSuffix).lib $(DllPrefix)pangomm32$(PangommDllSuffix).lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix).lib $(DllPrefix)pangoft232$(PangoDllSuffix).lib $(DllPrefix)pangowin32$(PangoDllSuffix).lib $(DllPrefix)pangocairo32$(PangoDllSuffix).lib $(DllPrefix)cairo32$(CairoDllSuffix).lib $(DllPrefix)atk32$(AtkDllSuffix).lib $(DllPrefix)gthread32$(GlibDllSuffix).lib $(DllPrefix)gobject32$(GlibDllSuffix).lib $(DllPrefix)gmodule32$(GlibDllSuffix).lib $(DllPrefix)glib32$(GlibDllSuffix).lib $(DllPrefix)gio32$(GlibDllSuffix).lib $(DllPrefix)gtk32$(GtkDllSuffix).lib $(DllPrefix)gdk32$(GtkDllSuffix).lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix).lib $(DllPrefix)sigc++32-2.0.lib $(DllPrefix)curl.lib $(DllPrefix)fontconfig.lib freetype32-2.lib raptor2.lib lrdf.lib liblo.lib $(DllPrefix)ardour32.lib $(DllPrefix)ardour_cp32.lib $(DllPrefix)audiographer32.lib $(DllPrefix)lua32.lib $(DllPrefix)pbd32.lib $(DllPrefix)midi++32.lib $(DllPrefix)evoral32.lib $(DllPrefix)ptformat32-0.lib $(DllPrefix)gtkmm2ext32.lib $(DllPrefix)ltc.lib $(DllPrefix)timecode32.lib cairocanvas.lib rubberband.lib $(DllPrefix)sndfile-1.lib $(DllPrefix)samplerate-0.lib vampsdk.lib vamphostsdk.lib panner_1in2out32.lib panner_2in2out32.lib panner_vbap32.lib $(DllPrefix)lilv32-0.lib $(DllPrefix)suil32-0.lib $(DllPrefix)serd32-0.lib $(DllPrefix)sord32-0.lib $(DllPrefix)sratom32-0.lib libart_lgpl_2.lib libjack.lib libxml2.lib intl.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
+				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconv.lib zlib1.lib boost-regex32.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix).lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix).lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix).lib $(DllPrefix)glibmm32$(GlibmmDllSuffix).lib $(DllPrefix)giomm32$(GlibmmDllSuffix).lib $(DllPrefix)cairomm32$(CairommDllSuffix).lib $(DllPrefix)pangomm32$(PangommDllSuffix).lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix).lib $(DllPrefix)pangoft232$(PangoDllSuffix).lib $(DllPrefix)pangowin32$(PangoDllSuffix).lib $(DllPrefix)pangocairo32$(PangoDllSuffix).lib $(DllPrefix)cairo32$(CairoDllSuffix).lib $(DllPrefix)atk32$(AtkDllSuffix).lib $(DllPrefix)gthread32$(GlibDllSuffix).lib $(DllPrefix)gobject32$(GlibDllSuffix).lib $(DllPrefix)gmodule32$(GlibDllSuffix).lib $(DllPrefix)glib32$(GlibDllSuffix).lib $(DllPrefix)gio32$(GlibDllSuffix).lib $(DllPrefix)gtk32$(GtkDllSuffix).lib $(DllPrefix)gdk32$(GtkDllSuffix).lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix).lib $(DllPrefix)sigc++32-2.0.lib $(DllPrefix)curl.lib $(DllPrefix)fontconfig.lib freetype32-2.lib raptor2.lib lrdf.lib liblo.lib $(DllPrefix)ardour32.lib $(DllPrefix)ardour_cp32.lib $(DllPrefix)audiographer32.lib $(DllPrefix)lua32.lib $(DllPrefix)pbd32.lib $(DllPrefix)midi++32.lib $(DllPrefix)evoral32.lib $(DllPrefix)ptformat32-0.lib $(DllPrefix)gtkmm2ext32.lib $(DllPrefix)ltc.lib $(DllPrefix)temporal32.lib $(DllPrefix)widgets32.lib waveview.lib cairocanvas.lib rubberband.lib $(DllPrefix)sndfile-1.lib $(DllPrefix)samplerate-0.lib vampsdk.lib vamphostsdk.lib panner_1in2out32.lib panner_2in2out32.lib panner_vbap32.lib $(DllPrefix)lilv32-0.lib $(DllPrefix)suil32-0.lib $(DllPrefix)serd32-0.lib $(DllPrefix)sord32-0.lib $(DllPrefix)sratom32-0.lib libart_lgpl_2.lib libjack.lib libxml2.lib intl.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
 				OutputFile="$(Release32TestSuiteFolder)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
@@ -182,7 +182,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy /Y &quot;$(Release32TestSuiteFolder)\$(ProjectName).exe&quot; &quot;$(Release32TargetFolder)\$(ProjectName).exe&quot;&#x0D;&#x0A;cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(PackagerFolderLocal)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
+				CommandLine="copy /Y &quot;$(Release32TestSuiteFolder)\$(ProjectName).exe&quot; &quot;$(Release32TargetFolder)\$(ProjectName).exe&quot;&#x0D;&#x0A;cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;ardour.keys&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(PackagerFolderLocal)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -196,7 +196,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Prepare configuration file(s)"
-				CommandLine="cd ..&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;"
+				CommandLine="cd ..&#x0D;&#x0A;del gtk2_ardour\ardour.keys&#x0D;&#x0A;perl msvc32-fixup.pl&#x0D;&#x0A;perl tools/fmt-bindings --platform=&quot;windows&quot; --winkey=&quot;Win&quot; --accelmap  gtk2_ardour/ardour.keys.in &gt; gtk2_ardour/ardour.keys&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -214,8 +214,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/FI$(TargetSxsFolder)\targetsxs.h"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\timecode;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
-				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;CANVAS_DEBUG;LIBCANVAS_STATIC;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_HWIN32;_WIN32;_WINDOWS;_MBCS;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;CLEARLOOKS_CONF_LOCATION=&quot;\&quot;\\etc\\engines\\libclearlooks.la\&quot;&quot;;PANGO_CONF_LOCATION=&quot;\&quot;\\etc\\pango\\pango.modules\&quot;&quot;;PIXBUFLOADERS_CONF_LOCATION=&quot;\&quot;\\etc\\gtk-2.0\\gdk-pixbuf.loaders\&quot;&quot;;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TIMECODE=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;CURRENT_SESSION_FILE_VERSION=3002;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
+				AdditionalIncludeDirectories="&quot;F:\+GTK-SOURCES\jackdmp\src\common\jack&quot;;&quot;F:\+GTK-SOURCES\jackdmp\src\windows&quot;;..\libs;..\libs\pbd\msvc;..\libs\surfaces\control_protocol;..\libs\ardour;..\libs\canvas;..\libs\gtkmm2ext;..\libs\pbd;&quot;..\libs\midi++2&quot;;..\libs\evoral;..\libs\libltc;..\libs\temporal;&quot;..\libs\vamp-sdk&quot;;..\libs\audiographer;..\libs\rubberband;..\libs\waveview;..\libs\widgets;&quot;..\libs\zita-resampler&quot;;..\libs\fst;&quot;$(GenericIncludeFolder)\ardourext&quot;;&quot;$(GenericIncludeFolder)\freetype2&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0&quot;;&quot;$(GenericIncludeFolder)\gtk-2.0\gdk&quot;;&quot;$(GenericIncludeFolder)\atk-2.0&quot;;&quot;$(GenericIncludeFolder)\cairo&quot;;&quot;$(GenericIncludeFolder)\pango-1.0&quot;;&quot;$(GenericIncludeFolder)\libart-2.0&quot;;&quot;$(GenericIncludeFolder)\libsndfile&quot;;&quot;$(GenericIncludeFolder)\lrdf&quot;;&quot;$(GenericIncludeFolder)\raptor&quot;;&quot;$(GenericLibraryFolder)\glib-2.0\include&quot;;&quot;$(GenericIncludeFolder)\lilv-0&quot;;&quot;$(GenericIncludeFolder)\suil-0&quot;;..\libs\lua"
+				PreprocessorDefinitions="VERSIONSTRING=&quot;\&quot;3.1.1\&quot;&quot;;PLATFORM_WINDOWS;COMPILER_MSVC;PTHREAD_WIN32;UINTSDEFINED=1;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;CANVAS_COMPATIBILITY;CANVAS_DEBUG;WAVEVIEW_DEBUG;LIBCANVAS_STATIC;LIBWAVEVIEW_STATIC;RUBBERBAND_IS_IN_WIN_STATIC_LIB;LUA_BUILD_AS_DLL;USE_CAIRO_IMAGE_SURFACE;NOMINMAX;NO_POSIX_MEMALIGN;INCLUDE_ARDOUR_MISCELLANEOUS=1;BOOST_REGEX_DYN_LINK;BOOST_REGEX_NO_LIB;BOOST_CHRONO_NO_LIB;BOOST_SYSTEM_NO_LIB;BOOST_THREAD_NO_LIB;BOOST_DATE_TIME_NO_LIB;GNU_WIN32;HAVE_CONFIG_HWIN32;_WIN32;_WINDOWS;_MBCS;ARCH_X86;USE_XMMINTRIN;BUILD_SSE_OPTIMIZATIONS;ENABLE_NLS=1;CLEARLOOKS_CONF_LOCATION=&quot;\&quot;\\etc\\engines\\libclearlooks.la\&quot;&quot;;PANGO_CONF_LOCATION=&quot;\&quot;\\etc\\pango\\pango.modules\&quot;&quot;;PIXBUFLOADERS_CONF_LOCATION=&quot;\&quot;\\etc\\gtk-2.0\\gdk-pixbuf.loaders\&quot;&quot;;PROGRAM_NAME=&quot;\&quot;Mixbus\&quot;&quot;;PROGRAM_VERSION=&quot;\&quot;3\&quot;&quot;;PACKAGE=&quot;\&quot;gtk2_ardour\&quot;&quot;;_REENTRANT;_USE_MATH_DEFINES;_LARGEFILE_SOURCE;_LARGEFILE64_SOURCE;LIBC_DISABLE_DEPRECATED;BOOST_SYSTEM_NO_DEPRECATED;__STDC_LIMIT_MACROS;__STDC_FORMAT_MACROS;INTERNAL_SHARED_LIBS=1;JACK_SESSION=1;HAVE_GLIB=1;HAVE_GTHREAD=1;HAVE_SNDFILE=1;HAVE_GIOMM=1;HAVE_CURL=1;HAVE_LO=1;HAVE_MODE_T=1;PHONE_HOME=1;FREESOUND=1;LV2_EXTENDED=1;WINDOWS_KEY=\&quot;Mod4&gt;&lt;Super\&quot;;IS_OSX=0;HAVE_XML=1;HAVE_UUID=1;HAVE_LIBS_PBD=1;HAVE_JACK=1;HAVE_LIBS_MIDIPP2=1;HAVE_LIBS_EVORAL=1;HAVE_FFTW3=1;HAVE_FFTW3F=1;HAVE_AUBIO=1;HAVE_LIBS_VAMP_SDK=1;HAVE_LIBS_VAMP_PLUGINS=1;HAVE_LIBS_TAGLIB=1;HAVE_LIBS_LIBLTC=1;HAVE_LIBS_RUBBERBAND=1;HAVE_CONTROL_PROTOCOL=1;HAVE_FRONTIER=1;HAVE_GENERIC_MIDI=1;HAVE_MACKIE=1;HAVE_OSC=1;HAVE_TRANZPORT=1;HAVE_WIIMOTE=1;HAVE_LIBS_SURFACES=1;HAVE_2IN2OUT=1;HAVE_1IN2OUT=1;HAVE_VBAP=1;HAVE_LIBS_PANNERS=1;HAVE_LIBS_TEMPORAL=1;HAVE_LRDF=1;HAVE_SAMPLERATE=1;HAVE_SERD=1;HAVE_SORD=1;HAVE_SRATOM=1;HAVE_LILV=1;HAVE_LILV_0_16_0=1;HAVE_OGG=1;HAVE_FLAC=1;HAVE_RUBBERBAND=1;USE_RUBBERBAND=1;HAVE_JACK_SESSION=1;HAVE_UNISTD=1;HAVE_JACK_ON_INFO_SHUTDOWN=1;HAVE_JACK_VIDEO_SUPPORT=1;HAVE_BOOST_SCOPED_PTR_HPP=1;HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1;HAVE_LIBS_ARDOUR=1;HAVE_GTKMM=1;HAVE_GTK=1;HAVE_LIBS_GTKMM2EXT=1;HAVE_LIBS_CLEARLOOKS_NEWER=1;HAVE_BOOST_FORMAT_HPP=1;HAVE_LIBS_AUDIOGRAPHER=1;HAVE_GNOMECANVAS=0;HAVE_GNOMECANVASMM=0;HAVE_X11=0;HAVE_FONTCONFIG=1;HAVE_BOOST_SHARED_PTR_HPP=1;HAVE_BOOST_WEAK_PTR_HPP=1;HAVE_GTK2_ARDOUR=1;HAVE_EXPORT=1;HAVE_MIDI_MAPS=1;HAVE_MCP=1;HAVE_PATCHFILES=1;HAVE_TOOLS_SANITY_CHECK=1;SMF_VERSION=\&quot;1.2\&quot;;LOCALEDIR=&quot;\&quot;\&quot;&quot;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"
@@ -234,7 +234,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconvRDC.lib zlib1RDC.lib boost-regex32RDC.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix)RDC.lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix)RDC.lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix)RDC.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)giomm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)cairomm32$(CairommDllSuffix)RDC.lib $(DllPrefix)pangomm32$(PangommDllSuffix)RDC.lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix)RDC.lib $(DllPrefix)pangoft232$(PangoDllSuffix)RDC.lib $(DllPrefix)pangowin32$(PangoDllSuffix)RDC.lib $(DllPrefix)pangocairo32$(PangoDllSuffix)RDC.lib $(DllPrefix)cairo32$(CairoDllSuffix)RDC.lib $(DllPrefix)atk32$(AtkDllSuffix)RDC.lib $(DllPrefix)gthread32$(GlibDllSuffix)RDC.lib $(DllPrefix)gobject32$(GlibDllSuffix)RDC.lib $(DllPrefix)gmodule32$(GlibDllSuffix)RDC.lib $(DllPrefix)glib32$(GlibDllSuffix)RDC.lib $(DllPrefix)gio32$(GlibDllSuffix)RDC.lib $(DllPrefix)gtk32$(GtkDllSuffix)RDC.lib $(DllPrefix)gdk32$(GtkDllSuffix)RDC.lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix)RDC.lib $(DllPrefix)sigc++32-2.0RDC.lib $(DllPrefix)curlRDC.lib $(DllPrefix)fontconfigRDC.lib freetype32-2RDC.lib raptor2.lib lrdf.lib libloRDC.lib $(DllPrefix)ardour32RDC.lib $(DllPrefix)ardour_cp32RDC.lib $(DllPrefix)audiographer32RDC.lib $(DllPrefix)lua32RDC.lib $(DllPrefix)pbd32RDC.lib $(DllPrefix)midi++32RDC.lib $(DllPrefix)evoral32RDC.lib $(DllPrefix)ptformat32-0RDC.lib $(DllPrefix)gtkmm2ext32RDC.lib $(DllPrefix)ltcRDC.lib $(DllPrefix)timecode32RDC.lib cairocanvasRDC.lib rubberbandRDC.lib $(DllPrefix)sndfile-1.lib $(DllPrefix)samplerate-0.lib vampsdkRDC.lib vamphostsdkRDC.lib panner_1in2out32RDC.lib panner_2in2out32RDC.lib panner_vbap32RDC.lib $(DllPrefix)lilv32-0RDC.lib $(DllPrefix)suil32-0RDC.lib $(DllPrefix)serd32-0RDC.lib $(DllPrefix)sord32-0RDC.lib $(DllPrefix)sratom32-0RDC.lib libart_lgpl_2.lib libjack.lib libxml2.lib intlRDC.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
+				AdditionalDependencies="libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib libeay32.lib iconvRDC.lib zlib1RDC.lib boost-regex32RDC.lib $(DllPrefix)atkmm32$(AtkmmDllSuffix)RDC.lib $(DllPrefix)gtkmm32$(GtkmmDllSuffix)RDC.lib $(DllPrefix)gdkmm32$(GtkmmDllSuffix)RDC.lib $(DllPrefix)glibmm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)giomm32$(GlibmmDllSuffix)RDC.lib $(DllPrefix)cairomm32$(CairommDllSuffix)RDC.lib $(DllPrefix)pangomm32$(PangommDllSuffix)RDC.lib pthreadVCE2.lib $(DllPrefix)pango32$(PangoDllSuffix)RDC.lib $(DllPrefix)pangoft232$(PangoDllSuffix)RDC.lib $(DllPrefix)pangowin32$(PangoDllSuffix)RDC.lib $(DllPrefix)pangocairo32$(PangoDllSuffix)RDC.lib $(DllPrefix)cairo32$(CairoDllSuffix)RDC.lib $(DllPrefix)atk32$(AtkDllSuffix)RDC.lib $(DllPrefix)gthread32$(GlibDllSuffix)RDC.lib $(DllPrefix)gobject32$(GlibDllSuffix)RDC.lib $(DllPrefix)gmodule32$(GlibDllSuffix)RDC.lib $(DllPrefix)glib32$(GlibDllSuffix)RDC.lib $(DllPrefix)gio32$(GlibDllSuffix)RDC.lib $(DllPrefix)gtk32$(GtkDllSuffix)RDC.lib $(DllPrefix)gdk32$(GtkDllSuffix)RDC.lib $(DllPrefix)gdk-pixbuf32$(GdkPixbufDllSuffix)RDC.lib $(DllPrefix)sigc++32-2.0RDC.lib $(DllPrefix)curlRDC.lib $(DllPrefix)fontconfigRDC.lib freetype32-2RDC.lib raptor2.lib lrdf.lib libloRDC.lib $(DllPrefix)ardour32RDC.lib $(DllPrefix)ardour_cp32RDC.lib $(DllPrefix)audiographer32RDC.lib $(DllPrefix)lua32RDC.lib $(DllPrefix)pbd32RDC.lib $(DllPrefix)midi++32RDC.lib $(DllPrefix)evoral32RDC.lib $(DllPrefix)ptformat32-0RDC.lib $(DllPrefix)gtkmm2ext32RDC.lib $(DllPrefix)ltcRDC.lib $(DllPrefix)temporal32RDC.lib $(DllPrefix)widgets32RDC.lib waveviewRDC.lib cairocanvasRDC.lib rubberbandRDC.lib $(DllPrefix)sndfile-1.lib $(DllPrefix)samplerate-0.lib vampsdkRDC.lib vamphostsdkRDC.lib panner_1in2out32RDC.lib panner_2in2out32RDC.lib panner_vbap32RDC.lib $(DllPrefix)lilv32-0RDC.lib $(DllPrefix)suil32-0RDC.lib $(DllPrefix)serd32-0RDC.lib $(DllPrefix)sord32-0RDC.lib $(DllPrefix)sratom32-0RDC.lib libart_lgpl_2.lib libjack.lib libxml2.lib intlRDC.lib shell32.lib psapi.lib iphlpapi.lib ws2_32.lib winmm.lib"
 				OutputFile="$(Release32TestSuiteFolder)\$(ProjectName)RDC.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="F:\pthread-win32\Pre-built.2\lib"
@@ -267,7 +267,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
+				CommandLine="cd ..\gtk2_ardour&#x0D;&#x0A;copy /Y &quot;resources\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\resources&quot;&#x0D;&#x0A;copy /Y &quot;icons\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\*.png&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;icons\cursor_square\hotspots&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)\icons&quot;&#x0D;&#x0A;copy /Y &quot;ardour.keys&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;copy /Y &quot;default_ui_config&quot; &quot;$(Release32TestSuiteFolder)\..\share\$(LibardourFolder)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -303,34 +303,18 @@
 				RelativePath="..\gtk2_ardour\analysis_window.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_button.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_dialog.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\ardour_display.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_dropdown.cc"
+				RelativePath="..\gtk2_ardour\ardour_gauge.cc"
 				>
 			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_http.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_knob.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_spinner.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_ui.cc"
 				>
@@ -412,15 +396,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\bundle_env_msvc.cc"
+				RelativePath="..\gtk2_ardour\big_transport_window.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\bundle_manager.cc"
+				RelativePath="..\gtk2_ardour\bundle_env_msvc.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\button_joiner.cc"
+				RelativePath="..\gtk2_ardour\bundle_manager.cc"
 				>
 			</File>
 			<File
@@ -459,6 +443,18 @@
 				RelativePath="..\gtk2_ardour\debug.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\disk_io_gauge.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\disk_space_gauge.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\dsp_load_gauge.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\duplicate_routes_dialog.cc"
 				>
@@ -667,6 +663,10 @@
 				RelativePath="..\gtk2_ardour\global_port_matrix.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\grid_lines.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\group_tabs.cc"
 				>
@@ -683,6 +683,10 @@
 				RelativePath="..\gtk2_ardour\hit.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\idleometer.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\insert_remove_time_dialog.cc"
 				>
@@ -727,6 +731,10 @@
 				RelativePath="..\gtk2_ardour\lua_script_manager.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\luadialog.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\luainstance.cc"
 				>
@@ -815,6 +823,10 @@
 				RelativePath="..\gtk2_ardour\midi_velocity_dialog.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\mini_timeline.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\missing_file_dialog.cc"
 				>
@@ -923,6 +935,10 @@
 				RelativePath="..\gtk2_ardour\patch_change_dialog.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\patch_change_widget.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\piano_roll_header.cc"
 				>
@@ -935,6 +951,10 @@
 				RelativePath="..\gtk2_ardour\playlist_selector.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\plugin_display.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\plugin_eq_gui.cc"
 				>
@@ -996,11 +1016,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\progress_reporter.cc"
+				RelativePath="..\gtk2_ardour\processor_selection.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\prompter.cc"
+				RelativePath="..\gtk2_ardour\progress_reporter.cc"
 				>
 			</File>
 			<File
@@ -1075,6 +1095,10 @@
 				RelativePath="..\gtk2_ardour\save_as_dialog.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\save_template_dialog.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\script_selector.cc"
 				>
@@ -1167,6 +1191,14 @@
 				RelativePath="..\gtk2_ardour\strip_silence_dialog.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\stripable_colorpicker.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\stripable_time_axis.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\sys_ex.cc"
 				>
@@ -1176,19 +1208,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_curve.cc"
+				RelativePath="..\gtk2_ardour\template_dialog.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_dialog.cc"
+				RelativePath="..\gtk2_ardour\tempo_curve.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_lines.cc"
+				RelativePath="..\gtk2_ardour\tempo_dialog.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\theme_manager.cc"
+				RelativePath="..\gtk2_ardour\tempo_lines.cc"
 				>
 			</File>
 			<File
@@ -1215,10 +1247,6 @@
 				RelativePath="..\gtk2_ardour\timers.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\tooltips.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\track_selection.cc"
 				>
@@ -1239,6 +1267,14 @@
 				RelativePath="..\gtk2_ardour\transform_dialog.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\transport_control.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\transport_control_ui.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\transpose_dialog.cc"
 				>
@@ -1349,34 +1385,18 @@
 				RelativePath="..\libs\ardour\ardour\ardour.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_button.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_dialog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\ardour_display.h"
-				>
-			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_dropdown.h"
+				RelativePath="..\gtk2_ardour\ardour_gauge.h"
 				>
 			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_http.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_knob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\gtk2_ardour\ardour_spinner.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\ardour_ui.h"
 				>
@@ -1433,6 +1453,10 @@
 				RelativePath="..\gtk2_ardour\automation_time_axis.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\axis_provider.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\axis_view.h"
 				>
@@ -1442,15 +1466,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\bundle_env.h"
+				RelativePath="..\gtk2_ardour\big_transport_window.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\bundle_manager.h"
+				RelativePath="..\gtk2_ardour\bundle_env.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\button_joiner.h"
+				RelativePath="..\gtk2_ardour\bundle_manager.h"
 				>
 			</File>
 			<File
@@ -1509,6 +1533,18 @@
 				RelativePath="..\gtk2_ardour\debug.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\disk_io_gauge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\disk_space_gauge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\dsp_load_gauge.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\duplicate_routes_dialog.h"
 				>
@@ -1521,6 +1557,10 @@
 				RelativePath="..\gtk2_ardour\editing.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\editing_convert.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\editing_syms.h"
 				>
@@ -1541,10 +1581,6 @@
 				RelativePath="..\gtk2_ardour\editor_drag.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\editor_enums.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\editor_group_tabs.h"
 				>
@@ -1585,6 +1621,10 @@
 				RelativePath="..\gtk2_ardour\enums.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\enums_convert.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\export_channel_selector.h"
 				>
@@ -1669,6 +1709,10 @@
 				RelativePath="..\gtk2_ardour\global_port_matrix.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\grid_lines.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\group_tabs.h"
 				>
@@ -1689,6 +1733,10 @@
 				RelativePath="..\gtk2_ardour\hit.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\idleometer.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\insert_remove_time_dialog.h"
 				>
@@ -1737,6 +1785,10 @@
 				RelativePath="..\gtk2_ardour\lua_script_manager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\luadialog.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\luainstance.h"
 				>
@@ -1841,6 +1893,10 @@
 				RelativePath="..\gtk2_ardour\midi_velocity_dialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\mini_timeline.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\missing_file_dialog.h"
 				>
@@ -1953,6 +2009,10 @@
 				RelativePath="..\gtk2_ardour\patch_change_dialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\patch_change_widget.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\piano_roll_header.h"
 				>
@@ -1969,6 +2029,10 @@
 				RelativePath="..\gtk2_ardour\playlist_selector.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\plugin_display.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\plugin_eq_gui.h"
 				>
@@ -2049,10 +2113,6 @@
 				RelativePath="..\gtk2_ardour\progress_reporter.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\prompter.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\public_editor.h"
 				>
@@ -2141,6 +2201,10 @@
 				RelativePath="..\gtk2_ardour\save_as_dialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\save_template_dialog.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\script_selector.h"
 				>
@@ -2249,6 +2313,14 @@
 				RelativePath="..\gtk2_ardour\strip_silence_dialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\stripable_colorpicker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\stripable_time_axis.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\sys_ex.h"
 				>
@@ -2258,19 +2330,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_curve.h"
+				RelativePath="..\gtk2_ardour\template_dialog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_dialog.h"
+				RelativePath="..\gtk2_ardour\tempo_curve.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\tempo_lines.h"
+				RelativePath="..\gtk2_ardour\tempo_dialog.h"
 				>
 			</File>
 			<File
-				RelativePath="..\gtk2_ardour\theme_manager.h"
+				RelativePath="..\gtk2_ardour\tempo_lines.h"
 				>
 			</File>
 			<File
@@ -2297,10 +2369,6 @@
 				RelativePath="..\gtk2_ardour\timers.h"
 				>
 			</File>
-			<File
-				RelativePath="..\gtk2_ardour\tooltips.h"
-				>
-			</File>
 			<File
 				RelativePath="..\gtk2_ardour\track_selection.h"
 				>
@@ -2321,6 +2389,14 @@
 				RelativePath="..\gtk2_ardour\transform_dialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\gtk2_ardour\transport_control.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gtk2_ardour\transport_control_ui.h"
+				>
+			</File>
 			<File
 				RelativePath="..\gtk2_ardour\transpose_dialog.h"
 				>