From b619d01da4f353fefbf3be740f8add0c61415c56 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 8 Mar 2008 16:23:26 +0000 Subject: [PATCH] Fix warnings. git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3139 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/analysis_window.cc | 6 +++--- gtk2_ardour/ardour_ui.cc | 4 ++-- gtk2_ardour/ardour_ui_ed.cc | 2 +- gtk2_ardour/canvas-waveview.c | 1 - gtk2_ardour/editor_actions.cc | 2 +- gtk2_ardour/main.cc | 2 +- libs/gtkmm2ext/gtk_ui.cc | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc index ae557f4c10..8f84febbba 100644 --- a/gtk2_ardour/analysis_window.cc +++ b/gtk2_ardour/analysis_window.cc @@ -43,9 +43,6 @@ using namespace PBD; AnalysisWindow::AnalysisWindow() : - show_minmax_button (_("Show frequency power range")), - show_normalized_button (_("Normalize values")), - source_selection_label (_("Signal source")), source_selection_ranges_rb (_("Selected ranges")), source_selection_regions_rb (_("Selected regions")), @@ -53,6 +50,9 @@ AnalysisWindow::AnalysisWindow() : display_model_label (_("Display model")), display_model_composite_separate_rb (_("Composite graphs for each track")), display_model_composite_all_tracks_rb (_("Composite graph of all tracks")), + + show_minmax_button (_("Show frequency power range")), + show_normalized_button (_("Normalize values")), fft_graph (16384) { diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 01c5a9dee8..8f543b5e8f 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1598,7 +1598,7 @@ ARDOUR_UI::engine_running () ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false); Glib::RefPtr action; - char* action_name = 0; + const char* action_name = 0; switch (engine->frames_per_cycle()) { case 32: @@ -3228,7 +3228,7 @@ ARDOUR_UI::TransportControllable::set_value (float val) return; } - char *action = 0; + const char *action = 0; switch (type) { case Roll: diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index f0d5e11a32..1ef2e00b56 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -631,7 +631,7 @@ void ARDOUR_UI::set_jack_buffer_size (nframes_t nframes) { Glib::RefPtr action; - char* action_name = 0; + const char* action_name = 0; switch (nframes) { case 32: diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c index bafaf12a27..dee5706c51 100644 --- a/gtk2_ardour/canvas-waveview.c +++ b/gtk2_ardour/canvas-waveview.c @@ -1765,7 +1765,6 @@ gnome_canvas_waveview_draw (GnomeCanvasItem *item, for (--xoff, --cache_index; xoff >= ulx; --xoff) { double min; - int clip_min; min = waveview->cache->data[cache_index].min; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 662cfeee73..70225d605b 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -754,7 +754,7 @@ Editor::register_actions () void Editor::toggle_ruler_visibility (RulerType rt) { - char* action = 0; + const char* action = 0; if (no_ruler_shown_update) { return; diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index c211374583..85b41c4f88 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -57,7 +57,7 @@ TextReceiver text_receiver ("ardour"); extern int curvetest (string); static ARDOUR_UI *ui = 0; -static char* localedir = LOCALEDIR; +static const char* localedir = LOCALEDIR; #ifdef __APPLE__ diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index b85b3573fd..31239e79df 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -414,7 +414,7 @@ UI::process_error_message (Transmitter::Channel chn, const char *str) RefPtr