ardour/livetrax
13
0
Fork 0
Code

Add support for the C99 function 'log2()' which is newly needed by 'gtk2_ardour/tempo_lines.cc' (but isn't available from MSVC).

Browse Source 
These changes are MSVC specific and shouldn't affect the other builds.

(incidentally, libpbd already offers a function called 'fast_log2()'. Not sure if that could have been used instead...)
This commit is contained in:
John Emmas 2015-01-10 11:56:24 +00:00
parent ca7965d7aa
commit f598105966
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/pbd/msvc/msvc_pbd.cc
View File

@ -262,6 +262,25 @@ trunc(double x)
return (floor(x)); return (floor(x));
} }
//***************************************************************
//
// log2()
//
// Emulates C99 log2() using log().
//
// Returns:
//
// On Success: The binary (base-2) logarithm of 'x'
// (e.g. log2(1024) == 10).
// On Failure: None, except that calling log(x) should generate
// an appropriate error for us (such as ERANGE etc).
//
LIBPBD_API double PBD_APICALLTYPE
log2(double x)
{
return (log(x) / log((double)2.0));
}
namespace PBD { namespace PBD {
//*************************************************************** //***************************************************************

1
libs/pbd/pbd/msvc_pbd.h
View File

@ -232,6 +232,7 @@ LIBPBD_API ssize_t PBD_APICALLTYPE pwrite(int handle, const void *buf, size_t
LIBPBD_API int PBD_APICALLTYPE poll(struct pollfd *fds, nfds_t nfds, int timeout); LIBPBD_API int PBD_APICALLTYPE poll(struct pollfd *fds, nfds_t nfds, int timeout);
LIBPBD_API double PBD_APICALLTYPE round(double x); LIBPBD_API double PBD_APICALLTYPE round(double x);
LIBPBD_API double PBD_APICALLTYPE trunc(double x); LIBPBD_API double PBD_APICALLTYPE trunc(double x);
LIBPBD_API double PBD_APICALLTYPE log2(double x);
namespace PBD { namespace PBD {

4
msvc_extra_headers/ardourext/misc.h.input
View File

@ -254,6 +254,10 @@ inline int64_t abs(int64_t val) throw()
#define rint(value) round(value) #define rint(value) round(value)
#if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB) #if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB)
extern double round(double x); extern double round(double x);
// log2().... MSVC doesn't offer the C99 function 'log2()'
// so let's emulate it.
extern double log2(double x);
#endif #endif
#endif /* __ardour_msvc_extensions_h__ */ #endif /* __ardour_msvc_extensions_h__ */