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

more fixes/tweaks from the land of the lion

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12150 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-02 20:45:17 +00:00
parent a562e5f7f2
commit 7a76168b66
10 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/plugin.h
View file

@ -119,7 +119,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent
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_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;

2
libs/ardour/broadcast_info.cc
View file

@ -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;

2
libs/ardour/internal_send.cc
View file

@ -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 ();

3
libs/ardour/tempo.cc
View file

@ -19,11 +19,10 @@
#include <algorithm>
#include <stdexcept>
#include <cmath>
#include <unistd.h>
#include <cmath>
#include <glibmm/thread.h>
#include "pbd/xml++.h"
#include "evoral/types.hpp"

2
libs/midi++2/ipmidi_port.cc
View file

@ -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;

2
libs/midi++2/jack_midi_port.cc
View file

@ -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;

4
libs/midi++2/midi++/port.h
View file

@ -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.

8
libs/pbd/convert.cc
View file

@ -28,6 +28,8 @@
#endif
#include <inttypes.h>
#include <glib.h>
#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.

2
libs/pbd/pbd/semaphore.h
View file

@ -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();
}
}

4
wscript
View file

@ -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