Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / libs / ardour / default_click.cc

diff --git a/libs/ardour/default_click.cc b/libs/ardour/default_click.cc
index 5bdbeb2ac5f5d4144d56a5b13082e007c58e4251..7e8eca8fd29c98ea4b5b4b0c4ea02ecb6fe34467 100644 (file)
--- a/libs/ardour/default_click.cc
+++ b/libs/ardour/default_click.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 20002 Paul Davis 
+    Copyright (C) 20002 Paul Davis
     Sounds by Nick Mainsbridge.
 
     This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,12 @@
 
 */
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
+#include "ardour/session.h"
+#include "ardour/types.h"
+
+#ifdef COMPILER_MSVC
+#pragma warning(disable:4305)
+#endif
 
 using namespace ARDOUR;
 
@@ -555,7 +559,7 @@ const Sample Session::default_click_emphasis[] = {
       0, 0,
 };
 
-const nframes_t Session::default_click_emphasis_length = sizeof (default_click_emphasis) / sizeof (default_click_emphasis[0]);
+const framecnt_t Session::default_click_emphasis_length = sizeof (default_click_emphasis) / sizeof (default_click_emphasis[0]);
 
 const Sample Session::default_click[] = {
               0, -0.014312744, -0.03338623, 0.019165039, 0.042541504,
@@ -1171,4 +1175,4 @@ const Sample Session::default_click[] = {
               0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-const nframes_t Session::default_click_length = sizeof (default_click) / sizeof (default_click[0]);
+const framecnt_t Session::default_click_length = sizeof (default_click) / sizeof (default_click[0]);