Fix warnings.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3139 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index ae557f4c106eabaea39c79b01d2e20182493745a..8f84febbba011d6fbff446de695d9f1703d89076 100644 (file)
--- 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 01c5a9dee81449e2ec3a949a3661dad04809ba52..8f543b5e8fe337e92d6c260d6f86a38c08299ed8 100644 (file)
--- 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> 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 f0d5e11a3261448591244b91252781bd51d6eaa7..1ef2e00b568434b3bca1494d466d0a7e77369474 100644 (file)
--- 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> 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 bafaf12a2795ce76ec5dfdf0c78dcc2c686be812..dee5706c51b38d387ba1b221d12677b8b182c3fc 100644 (file)
--- 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 662cfeee73f4c69e62befb303d9ecd61ca1ace1b..70225d605b9b2df90611032a264540d94e39f273 100644 (file)
--- 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 c211374583d80d65208f80bb3b2b2875286eb584..85b41c4f888bd0b261097ff839f93077fdbf3d2c 100644 (file)
--- 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 b85b3573fd19dfdb3363999a3f0fcbf6eb683ae2..31239e79df209ba59a8d2018770cd53134296174 100644 (file)
--- 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<Style> style;
        RefPtr<TextBuffer::Tag> ptag;
        RefPtr<TextBuffer::Tag> mtag;
-       char *prefix;
+       const char *prefix;
        size_t prefix_len;
        bool fatal_received = false;
 #ifndef OLD_STYLE_ERRORS