diff options
author | Robin Gareus <robin@gareus.org> | 2013-01-04 17:36:52 +0000 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-01-04 17:36:52 +0000 |
commit | bb3690db586d092e70732d6546969a8828aadcfe (patch) | |
tree | 4a1669d778a847469a3a301b80b642fa8f4b85f8 /libs | |
parent | 2c95bfcd46d9093f665bbedfad3cdf73e45f3d35 (diff) |
merge Marcel Bonnet's patches for Free-BSD
(may need further cleanup:
compare with timbyr's windows patch,
verify fst/vsti + ALSA)
git-svn-id: svn://localhost/ardour2/branches/3.0@13774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/audiofile_tagger.cc | 2 | ||||
-rw-r--r-- | libs/ardour/export_format_base.cc | 2 | ||||
-rw-r--r-- | libs/fst/jackvst.h | 4 | ||||
-rw-r--r-- | libs/fst/vsti.c | 4 | ||||
-rw-r--r-- | libs/midi++2/midi++/ipmidi_port.h | 11 | ||||
-rw-r--r-- | libs/pbd/cpus.cc | 1 |
6 files changed, 21 insertions, 3 deletions
diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 81ccf7a35e..57650860ee 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -40,7 +40,7 @@ namespace ARDOUR { bool -AudiofileTagger::tag_file (string const & filename, SessionMetadata const & metadata) +AudiofileTagger::tag_file (std::string const & filename, SessionMetadata const & metadata) { TagLib::FileRef file (filename.c_str()); TagLib::Tag & tag (*file.tag()); diff --git a/libs/ardour/export_format_base.cc b/libs/ardour/export_format_base.cc index c218b6154a..ed8bb9d5f8 100644 --- a/libs/ardour/export_format_base.cc +++ b/libs/ardour/export_format_base.cc @@ -185,7 +185,7 @@ ExportFormatBase::nearest_sample_rate (framecnt_t sample_rate) SampleRate best_match = SR_None; #define DO_SR_COMPARISON(rate) \ - diff = std::abs((rate) - sample_rate); \ + diff = std::fabs((rate) - sample_rate); \ if(diff < smallest_diff) { \ smallest_diff = diff; \ best_match = (rate); \ diff --git a/libs/fst/jackvst.h b/libs/fst/jackvst.h index b496f68493..8f2618879d 100644 --- a/libs/fst/jackvst.h +++ b/libs/fst/jackvst.h @@ -6,7 +6,9 @@ #include <jack/jack.h> #include <jack/ringbuffer.h> #include <fst.h> +#ifdef WITH_ALSA #include <alsa/asoundlib.h> +#endif typedef struct _JackVST JackVST; @@ -28,7 +30,9 @@ struct _JackVST { int want_midi; pthread_t midi_thread; +#ifdef WITH_ALSA snd_seq_t* seq; +#endif WITH_ALSA int midiquit; jack_ringbuffer_t* event_queue; struct VstEvents* events; diff --git a/libs/fst/vsti.c b/libs/fst/vsti.c index a9f5076775..ed79ea0c3c 100644 --- a/libs/fst/vsti.c +++ b/libs/fst/vsti.c @@ -34,6 +34,8 @@ #include <sched.h> #include "ardour/vestige/aeffectx.h" +#ifdef WITH_ALSA + snd_seq_t * create_sequencer (const char* client_name, bool isinput) { @@ -185,6 +187,6 @@ void stop_midireceiver (JackVST *jvst) pthread_join (jvst->midi_thread,NULL); snd_seq_close (jvst->seq); } - +#endif diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h index ff1691baab..c077170026 100644 --- a/libs/midi++2/midi++/ipmidi_port.h +++ b/libs/midi++2/midi++/ipmidi_port.h @@ -23,6 +23,17 @@ #include <iostream> #if defined(WIN32) #include <winsock.h> +#elif defined(__FREE_BSD__) +#include <netinet/in.h> +#include <sys/socket.h> +#include <sys/_sockaddr_storage.h> +#include <arpa/inet.h> +#include <netinet/ip_carp.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <net/if.h> +#include <net/route.h> #else #include <arpa/inet.h> #include <net/if.h> diff --git a/libs/pbd/cpus.cc b/libs/pbd/cpus.cc index ba4ba32fe4..80c40162ea 100644 --- a/libs/pbd/cpus.cc +++ b/libs/pbd/cpus.cc @@ -25,6 +25,7 @@ #ifdef __linux__ #include <unistd.h> #elif defined(__APPLE__) || defined(__FreeBSD__) +#include <sys/stddef.h> #include <sys/types.h> #include <sys/sysctl.h> #endif |