fix compiler warnings.

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index beebd8505fdddead735e423d6912b9a3af0ea65e..e1daeca75c75dc6e20b20b991c2503e5b4abef6e 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6948,7 +6948,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) {

diff --git a/gtk2_ardour/logmeter.h b/gtk2_ardour/logmeter.h
index c7b18ea6b95acb8eabf8cf578a3e04bff48c9510..a244fb4bbeab2a73be15cc603182e64505ea3f9f 100644 (file)
--- a/gtk2_ardour/logmeter.h
+++ b/gtk2_ardour/logmeter.h
@@ -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;

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index 92d4078441333d1166d7184ed51e3b971dee8467..2166cc03ae75526a2244f5d83863508b190b699c 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -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;

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index a2bcf5cc0653a3810ddbed3cba012020c2bb8c8c..c8566adb640d300c6c393068a13cf932569d6450 100644 (file)
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -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);
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index be43a3d6a081df30a510eda90b06eb7a780f5435..7e8188cac9a5aeda61793017285933c3d25fb515 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -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 ();
 

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 9e4aa39fa01e5efdc5bdeb9dd0a7d186c2278be3..b35f843d15588645969bece1af36e590a80e5445 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -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;

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 26e865bec33f5397e506b803f629fb7db2c4ead7..765038b728b6e6b2b3691f5a56fffdcb7a86642d 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -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());
                                }
                        }

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 5dfc956c75fc63449b143db0dddf523e62d212e0..9db8e1ff3aba3b7d2597a3794f898a441237712d 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -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;
                }
        }
 

diff --git a/libs/pbd/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h
index f14fa7185184356d154f40da1a134446d0200bb0..652457b4937ada5ff5b39ce67e7be054f10f15c1 100644 (file)
--- a/libs/pbd/pbd/ringbuffer.h
+++ b/libs/pbd/pbd/ringbuffer.h
@@ -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;
        }
 }

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 5c3422799b3adea9e8998579c985af1ec83fee53..84dd0d9c86c082b7ba75e57e82e19b28a235ff45 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -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); \
                 }                                                      \