fix compiler warnings.
This commit is contained in:
parent
d1c2d53afe
commit
cd28d62b26
|
@ -6950,7 +6950,7 @@ Editor::uncombine_regions ()
|
|||
void
|
||||
Editor::toggle_midi_input_active (bool flip_others)
|
||||
{
|
||||
bool onoff;
|
||||
bool onoff = false;
|
||||
boost::shared_ptr<RouteList> rl (new RouteList);
|
||||
|
||||
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
|
||||
|
|
|
@ -35,16 +35,16 @@ alt_log_meter (float power)
|
|||
#endif
|
||||
|
||||
/* prototypes - avoid compiler warning */
|
||||
inline float log_meter (float db);
|
||||
inline float meter_deflect_ppm (float);
|
||||
inline float meter_deflect_din (float);
|
||||
inline float meter_deflect_nordic (float);
|
||||
inline float meter_deflect_vu (float);
|
||||
inline float meter_deflect_k (float, float);
|
||||
static inline float log_meter (float db);
|
||||
static inline float meter_deflect_ppm (float);
|
||||
static inline float meter_deflect_din (float);
|
||||
static inline float meter_deflect_nordic (float);
|
||||
static inline float meter_deflect_vu (float);
|
||||
static inline float meter_deflect_k (float, float);
|
||||
|
||||
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
log_meter (float db)
|
||||
{
|
||||
gfloat def = 0.0f; /* Meter deflection %age */
|
||||
|
@ -75,7 +75,7 @@ log_meter (float db)
|
|||
return def/115.0f;
|
||||
}
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
meter_deflect_ppm (float db)
|
||||
{
|
||||
if (db < -30) {
|
||||
|
@ -91,7 +91,7 @@ meter_deflect_ppm (float db)
|
|||
}
|
||||
}
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
meter_deflect_din (float db)
|
||||
{
|
||||
float rv = dB_to_coefficient(db);
|
||||
|
@ -103,7 +103,7 @@ meter_deflect_din (float db)
|
|||
}
|
||||
}
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
meter_deflect_nordic (float db)
|
||||
{
|
||||
if (db < -60) {
|
||||
|
@ -118,7 +118,7 @@ meter_deflect_nordic (float db)
|
|||
}
|
||||
}
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
meter_deflect_vu (float db)
|
||||
{
|
||||
const float rv = 6.77165f * dB_to_coefficient(db);
|
||||
|
@ -126,7 +126,7 @@ meter_deflect_vu (float db)
|
|||
return rv;
|
||||
}
|
||||
|
||||
inline float
|
||||
static inline float
|
||||
meter_deflect_k (float db, float krange)
|
||||
{
|
||||
db+=krange;
|
||||
|
|
|
@ -243,7 +243,7 @@ static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
|
|||
}
|
||||
}
|
||||
|
||||
static void set_fg_color(Gtk::Widget& w, MeterType type, Gdk::Color * c) {
|
||||
static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
|
||||
float r,g,b;
|
||||
switch(type) {
|
||||
case MeterVU:
|
||||
|
@ -812,7 +812,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
|
|||
break;
|
||||
}
|
||||
|
||||
gint pos;
|
||||
gint pos = -1;
|
||||
|
||||
for (std::map<float,string>::const_iterator j = points.begin(); j != points.end(); ++j) {
|
||||
float fraction = 0;
|
||||
|
@ -850,6 +850,8 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
|
|||
break;
|
||||
}
|
||||
|
||||
if (pos < 0) continue;
|
||||
|
||||
layout->set_text(j->second.c_str());
|
||||
|
||||
int tw, th;
|
||||
|
|
|
@ -596,7 +596,7 @@ Meterbridge::remove_strip (MeterStrip* strip)
|
|||
}
|
||||
|
||||
void
|
||||
Meterbridge::sync_order_keys (RouteSortOrderKey src)
|
||||
Meterbridge::sync_order_keys (RouteSortOrderKey)
|
||||
{
|
||||
Glib::Threads::Mutex::Lock lm (_resync_mutex);
|
||||
|
||||
|
|
|
@ -1926,7 +1926,7 @@ void
|
|||
Mixer_UI::toggle_midi_input_active (bool flip_others)
|
||||
{
|
||||
boost::shared_ptr<RouteList> rl (new RouteList);
|
||||
bool onoff;
|
||||
bool onoff = false;
|
||||
|
||||
set_route_targets_for_operation ();
|
||||
|
||||
|
|
|
@ -392,7 +392,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
|
|||
}
|
||||
|
||||
bool
|
||||
TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t samplerate, unsigned int stream)
|
||||
TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*samplerate*/, unsigned int stream)
|
||||
{
|
||||
if (!probeok) return false;
|
||||
if (stream >= m_audio.size()) return false;
|
||||
|
|
|
@ -395,7 +395,7 @@ emulate_key_event (Gtk::Widget* w, unsigned int keyval)
|
|||
ev.state = 0;
|
||||
ev.keyval = keyval;
|
||||
ev.length = 0;
|
||||
ev.string = (gchar*) "";
|
||||
ev.string = "";
|
||||
ev.hardware_keycode = keymapkey[0].keycode;
|
||||
ev.group = keymapkey[0].group;
|
||||
g_free(keymapkey);
|
||||
|
|
|
@ -327,6 +327,8 @@ PeakMeter::meter ()
|
|||
}
|
||||
}
|
||||
|
||||
#define CHECKSIZE(MTR) (n < MTR.size() + n_midi && n >= n_midi)
|
||||
|
||||
float
|
||||
PeakMeter::meter_level(uint32_t n, MeterType type) {
|
||||
switch (type) {
|
||||
|
@ -334,8 +336,8 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
|
|||
case MeterK20:
|
||||
case MeterK14:
|
||||
{
|
||||
const int n_midi = current_meters.n_midi();
|
||||
if ((n - n_midi) < _kmeter.size() && (n - n_midi) >= 0) {
|
||||
const uint32_t n_midi = current_meters.n_midi();
|
||||
if (CHECKSIZE(_kmeter)) {
|
||||
return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read());
|
||||
}
|
||||
}
|
||||
|
@ -343,8 +345,8 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
|
|||
case MeterIEC1DIN:
|
||||
case MeterIEC1NOR:
|
||||
{
|
||||
const int n_midi = current_meters.n_midi();
|
||||
if ((n - n_midi) < _iec1meter.size() && (n - n_midi) >= 0) {
|
||||
const uint32_t n_midi = current_meters.n_midi();
|
||||
if (CHECKSIZE(_iec1meter)) {
|
||||
return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read());
|
||||
}
|
||||
}
|
||||
|
@ -352,16 +354,16 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
|
|||
case MeterIEC2BBC:
|
||||
case MeterIEC2EBU:
|
||||
{
|
||||
const int n_midi = current_meters.n_midi();
|
||||
if ((n - n_midi) < _iec2meter.size() && (n - n_midi) >= 0) {
|
||||
const uint32_t n_midi = current_meters.n_midi();
|
||||
if (CHECKSIZE(_iec2meter)) {
|
||||
return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case MeterVU:
|
||||
{
|
||||
const int n_midi = current_meters.n_midi();
|
||||
if ((n - n_midi) < _vumeter.size() && (n - n_midi) >= 0) {
|
||||
const uint32_t n_midi = current_meters.n_midi();
|
||||
if (CHECKSIZE(_vumeter)) {
|
||||
return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -398,6 +398,9 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
|
|||
case MonitoringInput:
|
||||
be_silent = false;
|
||||
break;
|
||||
default:
|
||||
be_silent = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -233,6 +233,7 @@ RingBuffer<T>::get_read_vector (RingBuffer<T>::rw_vector *vec)
|
|||
|
||||
vec->buf[0] = &buf[r];
|
||||
vec->len[0] = free_cnt;
|
||||
vec->buf[1] = 0;
|
||||
vec->len[1] = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -188,7 +188,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
|
|||
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
|
||||
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
|
||||
} \
|
||||
int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \
|
||||
int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \
|
||||
if (argc > 1) { \
|
||||
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type); \
|
||||
} \
|
||||
|
@ -199,7 +199,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
|
|||
static int _ ## name (const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data) { \
|
||||
return static_cast<OSC*>(user_data)->cb_ ## name (path, types, argv, argc, data); \
|
||||
} \
|
||||
int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *data) { \
|
||||
int cb_ ## name (const char *, const char *, lo_arg **argv, int argc, void *) { \
|
||||
if (argc > 1) { \
|
||||
name (argv[0]->arg1type, argv[1]->arg2type,argv[2]->arg3type,argv[3]->arg4type); \
|
||||
} \
|
||||
|
|
Loading…
Reference in New Issue