Merge branch 'windows' into windows+cc

Conflicts (hopefully resolved):
	libs/pbd/stacktrace.cc

8 files changed, 46 insertions, 42 deletions

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 47a2506f92..d20cbd3da9 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -1273,7 +1273,9 @@ EngineControl::EngineControl ()
 			    of settings.
 			 */
 			 change_driver = true;
-			 change_device = true;
+			 if (backend->requires_driver_selection()) {
+				 change_device = true;
+			 }
 			 change_rate = true;
 			 change_bufsize = true;
 			 change_channels = true;
diff --git a/libs/ardour/ardour/msvc_libardour.h b/libs/ardour/ardour/msvc_libardour.h
index 75c932905e..52aa65d95c 100644
--- a/libs/ardour/ardour/msvc_libardour.h
+++ b/libs/ardour/ardour/msvc_libardour.h
@@ -19,37 +19,9 @@
 #ifndef __msvc_libardour_h__
 #define __msvc_libardour_h__
 
+#include "ardour/visibility.h"
 #include <limits.h>
 
-#ifdef  LIBARDOUR_IS_IN_WIN_STATIC_LIB  // #define if your project uses libardour (under Windows) as a static library
-#define LIBARDOUR_IS_IN_WINDLL 0
-#endif
-
-#if !defined(LIBARDOUR_IS_IN_WINDLL)
-	#if defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
-	// If you need '__declspec' compatibility, add extra compilers to the above as necessary
-		#define LIBARDOUR_IS_IN_WINDLL 1
-	#else
-		#define LIBARDOUR_IS_IN_WINDLL 0
-	#endif
-#endif
-
-#if LIBARDOUR_IS_IN_WINDLL && !defined(LIBARDOUR_API)
-	#if defined(BUILDING_LIBARDOUR)
-		#define LIBARDOUR_API __declspec(dllexport)
-		#define LIBARDOUR_APICALLTYPE __stdcall
-	#elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point
-		#define LIBARDOUR_API __declspec(dllimport)
-		#define LIBARDOUR_APICALLTYPE __stdcall
-	#else
-		#error "Attempting to define __declspec with an incompatible compiler !"
-	#endif
-#elif !defined(LIBARDOUR_API)
-	// Other compilers / platforms could be accommodated here
-	#define LIBARDOUR_API
-	#define LIBARDOUR_APICALLTYPE
-#endif
-
 #ifndef _MAX_PATH
 #define _MAX_PATH  260
 #endif
diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h
index ccec43d909..e90ab71e26 100644
--- a/libs/ardour/ardour/session_event.h
+++ b/libs/ardour/ardour/session_event.h
@@ -28,6 +28,7 @@
 #include "pbd/ringbuffer.h"
 #include "pbd/event_loop.h"
 
+#include "ardour/visibility.h"
 #include "ardour/types.h"
 
 namespace ARDOUR {
@@ -35,7 +36,7 @@ namespace ARDOUR {
 class Slave;
 class Region;
 
-class SessionEvent {
+class LIBARDOUR_API SessionEvent {
 public:
 	enum Type {
 		SetTransportSpeed,
@@ -150,7 +151,7 @@ private:
 	friend class Butler;
 };
 
-class SessionEventManager {
+class LIBARDOUR_API SessionEventManager {
 public:
 	SessionEventManager () : pending_events (2048),
 	                         auto_loop_event(0), punch_out_event(0), punch_in_event(0) {}
diff --git a/libs/ardour/ardour/visibility.h b/libs/ardour/ardour/visibility.h
index 09287b877d..b702e94edb 100644
--- a/libs/ardour/ardour/visibility.h
+++ b/libs/ardour/ardour/visibility.h
@@ -20,6 +20,36 @@
 #ifndef __libardour_visibility_h__
 #define __libardour_visibility_h__
 
+#ifdef  LIBARDOUR_IS_IN_WIN_STATIC_LIB  // #define if your project uses libardour (under Windows) as a static library
+#define LIBARDOUR_IS_IN_WINDLL 0
+#endif
+
+#if !defined(LIBARDOUR_IS_IN_WINDLL)
+	#if defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
+	// If you need '__declspec' compatibility, add extra compilers to the above as necessary
+		#define LIBARDOUR_IS_IN_WINDLL 1
+	#else
+		#define LIBARDOUR_IS_IN_WINDLL 0
+	#endif
+#endif
+
+#if LIBARDOUR_IS_IN_WINDLL && !defined(LIBARDOUR_API)
+	#if defined(BUILDING_LIBARDOUR)
+		#define LIBARDOUR_API __declspec(dllexport)
+		#define LIBARDOUR_APICALLTYPE __cdecl
+	#elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point
+		#define LIBARDOUR_API __declspec(dllimport)
+		#define LIBARDOUR_APICALLTYPE __cdecl
+	#else
+		#error "Attempting to define __declspec with an incompatible compiler !"
+	#endif
+#elif !defined(LIBARDOUR_API)
+	// Other compilers / platforms could be accommodated here (as an example, see LIBARDOUR_HELPER_DLL, below)
+	#define LIBARDOUR_API
+	#define LIBARDOUR_APICALLTYPE
+#endif
+
+
 /* _WIN32 is defined by most compilers targetting Windows, but within the
  * ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
  * on how a Windows build is built.
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index eca808bfd7..aa79b0f24d 100644
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -106,10 +106,9 @@ PBD::stacktrace (std::ostream& out, int levels)
 #else
 
 std::string 
-PBD::demangle (std::string const & l)
+demangle (std::string const & l)
 {
-	std::string empty_string;
-	return empty_string;
+	return std::string();
 }
 
 void
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 194e35a26f..5b772d9af5 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1383,7 +1383,7 @@ MackieControlProtocol::add_down_select_button (int surface, int strip)
 void
 MackieControlProtocol::remove_down_select_button (int surface, int strip)
 {
-	DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf));
+	DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (uint32_t) (surface<<8)|(strip&0xf));
 	DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down select buttons\n", surface, strip));
 	if (x != _down_select_buttons.end()) {
 		_down_select_buttons.erase (x);
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index d24aec4f8e..3d8b58c97c 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -304,7 +304,7 @@ fi
 
 cp -R $GTKSTACK_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
-cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Modules
+cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Modules
 echo "Copying all GDK Pixbuf loaders ..."
 cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
 
@@ -312,9 +312,9 @@ cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders
 
 cat > pangorc <<EOF 
 [Pango]
-ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules
+ModulesPath=$GTKSTACK_ROOT/lib/pango/1.8.0/modules
 EOF
-env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
+env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.8.0/?@ROOTDIR@/?" > $Etc/pango.modules.in
 rm pangorc
 
 # Ditto for gdk-pixbuf loaders
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 0afb984d73..8cce6423d6 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -258,7 +258,7 @@ fi
 
 cp -R $GTKSTACK_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
-cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules
+cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Frameworks/modules
 echo "Copying all GDK Pixbuf loaders ..."
 cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Frameworks/modules
 # charset alias file
@@ -267,9 +267,9 @@ cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources
 # generate new Pango module file
 cat > pangorc <<EOF 
 [Pango]
-ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules
+ModulesPath=$GTKSTACK_ROOT/lib/pango/1.8.0/modules
 EOF
-env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/modules/?@executable_path/../lib/modules/?" > $Resources/pango.modules
+env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.8.0/modules/?@executable_path/../lib/modules/?" > $Resources/pango.modules
 rm pangorc
 
 # generate a new GDK pixbufs loaders file