diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-28 20:32:52 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-28 20:32:52 +0200 |
commit | cd28d62b26214770cfc269aafe666ec2fb3f2607 (patch) | |
tree | 40a8562aa2c5fb72c82c78084f31ac7799105524 /gtk2_ardour | |
parent | d1c2d53afe71bfd4fb870b7ed179e8a77a801622 (diff) |
fix compiler warnings.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/logmeter.h | 24 | ||||
-rw-r--r-- | gtk2_ardour/meter_patterns.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/meterbridge.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/utils.cc | 2 |
7 files changed, 21 insertions, 19 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index b70d0f0664..93a53dd1d3 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -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) { diff --git a/gtk2_ardour/logmeter.h b/gtk2_ardour/logmeter.h index c7b18ea6b9..a244fb4bbe 100644 --- 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 92d4078441..2166cc03ae 100644 --- 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 a2bcf5cc06..c8566adb64 100644 --- 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 be43a3d6a0..7e8188cac9 100644 --- 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 9e4aa39fa0..b35f843d15 100644 --- 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/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 72a922046f..97368a7863 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -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); |