projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move functions in pbd/clear_dir.h/cc into pbd/file_utils.h/cc
[ardour.git]
/
libs
/
ardour
/
default_click.cc
diff --git
a/libs/ardour/default_click.cc
b/libs/ardour/default_click.cc
index b4067a2051de31b9762ca0eb224d0d15187d062b..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
Sounds by Nick Mainsbridge.
This program is free software; you can redistribute it and/or modify
@@
-16,11
+16,14
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
*/
-#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;
using namespace ARDOUR;
@@
-556,7
+559,7
@@
const Sample Session::default_click_emphasis[] = {
0, 0,
};
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,
const Sample Session::default_click[] = {
0, -0.014312744, -0.03338623, 0.019165039, 0.042541504,
@@
-1172,4
+1175,4
@@
const Sample Session::default_click[] = {
0, 0, 0, 0, 0, 0, 0, 0,
};
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]);