From 7a76168b662c4e4fa0eec3859e500cb0b2ac65e7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 2 May 2012 20:45:17 +0000 Subject: more fixes/tweaks from the land of the lion git-svn-id: svn://localhost/ardour2/branches/3.0@12150 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/plugin.h | 4 ++-- libs/ardour/broadcast_info.cc | 2 +- libs/ardour/internal_send.cc | 2 +- libs/ardour/tempo.cc | 3 +-- libs/midi++2/ipmidi_port.cc | 2 +- libs/midi++2/jack_midi_port.cc | 2 +- libs/midi++2/midi++/port.h | 4 ++-- libs/pbd/convert.cc | 8 +++++--- libs/pbd/pbd/semaphore.h | 2 +- wscript | 4 ++++ 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 069a579ff7..90982bf0b5 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -118,8 +118,8 @@ class Plugin : public PBD::StatefulDestructible, public Latent virtual uint32_t parameter_count () const = 0; virtual float default_value (uint32_t port) = 0; virtual float get_parameter(uint32_t which) const = 0; - virtual std::string get_docs() const { return ""; } - virtual std::string get_parameter_docs(uint32_t which) const { return ""; } + virtual std::string get_docs () const { return ""; } + virtual std::string get_parameter_docs (uint32_t /*which*/) const { return ""; } virtual int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const = 0; virtual uint32_t nth_parameter (uint32_t which, bool& ok) const = 0; diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index af760629ff..d31104d545 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -81,7 +81,7 @@ BroadcastInfo::set_originator (std::string const & str) } void -BroadcastInfo::set_originator_ref_from_session (Session const & session) +BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/) { _has_info = true; diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index b4d89fb986..dfb0204c8c 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -359,7 +359,7 @@ InternalSend::set_can_pan (bool yn) } void -InternalSend::cycle_start (pframes_t nframes) +InternalSend::cycle_start (pframes_t /*nframes*/) { for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) { b->prepare (); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index f9b2bbca51..798ced17b4 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -19,11 +19,10 @@ #include #include +#include #include -#include - #include #include "pbd/xml++.h" #include "evoral/types.hpp" diff --git a/libs/midi++2/ipmidi_port.cc b/libs/midi++2/ipmidi_port.cc index 6eac803936..7e30752c38 100644 --- a/libs/midi++2/ipmidi_port.cc +++ b/libs/midi++2/ipmidi_port.cc @@ -260,7 +260,7 @@ IPMIDIPort::write (const byte* msg, size_t msglen, timestamp_t /* ignored */) { } int -IPMIDIPort::read (byte* buf, size_t bufsize) +IPMIDIPort::read (byte* /*buf*/, size_t /*bufsize*/) { /* nothing to do here - all handled by parse() */ return 0; diff --git a/libs/midi++2/jack_midi_port.cc b/libs/midi++2/jack_midi_port.cc index 162e2a5f1b..05eebc5aa1 100644 --- a/libs/midi++2/jack_midi_port.cc +++ b/libs/midi++2/jack_midi_port.cc @@ -76,7 +76,7 @@ JackMIDIPort::JackMIDIPort (const XMLNode& node, jack_client_t* jack_client) } void -JackMIDIPort::init (string const & name, Flags flags) +JackMIDIPort::init (const string& /*name*/, Flags /*flags*/) { if (!create_port ()) { _ok = true; diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 40a413f562..03abd1a41c 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -57,7 +57,7 @@ class Port { // FIXME: make Manager a friend of port so these can be hidden? /* Only for use by MidiManager. Don't ever call this. */ - virtual void cycle_start (pframes_t nframes) {} + virtual void cycle_start (pframes_t) {} /* Only for use by MidiManager. Don't ever call this. */ virtual void cycle_end () {} @@ -82,7 +82,7 @@ class Port { * executes any part of a JACK process callback (will * simply return immediately in that situation). */ - virtual void drain (int check_interval_usecs) {} + virtual void drain (int /* check_interval_usecs */) {} /** Write a message to port. * @return true on success. diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc index 07407e2fad..1787d3b70d 100644 --- a/libs/pbd/convert.cc +++ b/libs/pbd/convert.cc @@ -28,6 +28,8 @@ #endif #include +#include + #include "pbd/convert.h" #include "i18n.h" @@ -264,15 +266,15 @@ string_is_affirmative (const std::string& str) return false; } - /* the use of g_strncasecmp() is solely to get around issues with + /* the use of g_ascii_strncasecmp() is solely to get around issues with * charsets posed by trying to use C++ for the same * comparison. switching a std::string to its lower- or upper-case * version has several issues, but handled by default * in the way we desire when doing it in C. */ - return str == "1" || str == "y" || str == "Y" || (!g_strncasecmp(str.c_str(), "yes", str.length())) || - (!g_strncasecmp(str.c_str(), "true", str.length())); + return str == "1" || str == "y" || str == "Y" || (!g_ascii_strncasecmp(str.c_str(), "yes", str.length())) || + (!g_ascii_strncasecmp(str.c_str(), "true", str.length())); } /** A wrapper for dgettext that takes a msgid of the form Context|Text. diff --git a/libs/pbd/pbd/semaphore.h b/libs/pbd/pbd/semaphore.h index f1b07ea4f5..51e0ae409d 100644 --- a/libs/pbd/pbd/semaphore.h +++ b/libs/pbd/pbd/semaphore.h @@ -81,7 +81,7 @@ private: inline Semaphore::Semaphore(unsigned initial) { - if (semaphore_create(mach_task_self(), &sem->sem, SYNC_POLICY_FIFO, 0)) { + if (semaphore_create(mach_task_self(), &_sem, SYNC_POLICY_FIFO, initial)) { throw failed_constructor(); } } diff --git a/wscript b/wscript index 6f58ceb67a..e8bc76e222 100644 --- a/wscript +++ b/wscript @@ -473,6 +473,10 @@ def configure(conf): conf.define ('TOP_MENUBAR',1) conf.define ('GTKOSX',1) + # + # need this on OS X to pick up long long variants of several math functions + # + conf.env.append_value('CXXFLAGS_APPLEUTILITY', '-I../libs') # # Define OSX as a uselib to use when compiling -- cgit v1.2.3