X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fdefault_click.cc;h=7e8eca8fd29c98ea4b5b4b0c4ea02ecb6fe34467;hb=cd63d97f65133d9c34f5ee36bc1a5a7bec530e21;hp=b1f477285272115122b1306d913880e74daaf945;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/default_click.cc b/libs/ardour/default_click.cc
index b1f4772852..7e8eca8fd2 100644
--- a/libs/ardour/default_click.cc
+++ b/libs/ardour/default_click.cc
@@ -18,8 +18,12 @@
 
 */
 
-#include "ardour/ardour.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]);