smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 17:16:38 +01:00
Code Issues Projects Releases Wiki Activity

fixes for windows branch build failures under linux. still does not build on linux, now due to taglib changes

Browse source
This commit is contained in:
Paul Davis 2013-07-31 20:08:43 -04:00
parent 98c6ca5abc
commit bb59def1ca
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/evoral/src/ControlList.cpp
View file

@ -16,11 +16,6 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
// 'std::isnan()' is not available in MSVC.
#ifndef COMPILER_MSVC
using std::isnan;
#endif
#include <cmath> #include <cmath>
#include <cassert> #include <cassert>
#include <utility> #include <utility>
@ -817,7 +812,7 @@ ControlList::modify (iterator iter, double when, double val)
(*iter)->when = when; (*iter)->when = when;
(*iter)->value = val; (*iter)->value = val;
if (isnan (val)) { if (::isnan (val)) {
abort (); abort ();
} }

1
libs/evoral/src/Curve.cpp
View file

@ -22,6 +22,7 @@
#include <climits> #include <climits>
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#include <vector>
#include <glibmm/threads.h> #include <glibmm/threads.h>

2
libs/evoral/src/libsmf/smf_load.c
View file

@ -123,7 +123,7 @@ parse_mthd_header(smf_t *smf)
return (-1); return (-1);
} }
tmp_mthd = (chunk_header_struct*)smf->file_buffer; tmp_mthd = (struct chunk_header_struct*)smf->file_buffer;
if (!chunk_signature_matches(tmp_mthd, "MThd")) { if (!chunk_signature_matches(tmp_mthd, "MThd")) {
g_critical("SMF error: MThd signature not found, is that a MIDI file?"); g_critical("SMF error: MThd signature not found, is that a MIDI file?");