Fix some set-but-not-used variable warnings from gcc 4.6

git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0418119c397ddac08542573c435c23639ffeb222..71768c699cd59ef2d22eb8db4118549523834a38 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -996,12 +996,8 @@ void
 ARDOUR_UI::update_buffer_load ()
 {
        char buf[64];
-       uint32_t c, p;
 
        if (_session) {
-               c = _session->capture_load ();
-               p = _session->playback_load ();
-
                snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
                          _session->playback_load(), _session->capture_load());
                buffer_load_label.set_text (buf);

diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
index 83beb598e736e7c71408916bad536c9aea672309..887f71b411e240de6a74c4003b7131ef21e76079 100644 (file)
--- a/gtk2_ardour/canvas-simpleline.c
+++ b/gtk2_ardour/canvas-simpleline.c
@@ -177,13 +177,9 @@ gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline)
 static void
 gnome_canvas_simpleline_destroy (GtkObject *object)
 {
-       GnomeCanvasSimpleLine *line;
-
        g_return_if_fail (object != NULL);
        g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
 
-       line = GNOME_CANVAS_SIMPLELINE (object);
-
        if (GTK_OBJECT_CLASS (parent_class)->destroy)
                (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -398,10 +394,6 @@ gnome_canvas_simpleline_draw (GnomeCanvasItem *item,
                               int x, int y,
                               int width, int height)
 {
-       GnomeCanvasSimpleLine *simpleline;
-
-       simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
         /* XXX not implemented */
 }
 
@@ -426,8 +418,6 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx
        double x1, y1, x2, y2;
        double dx, dy;
 
-       simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
        *actual_item = item;
 
        /* Find the bounds for the line */

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index c3f561944f424ad0e1863d8851fb2b5a18c4037d..7ec19e97ad27a1bdf40e8cfe8a87a1abc542ea89 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -809,8 +809,6 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 
        double firstx = (*in.begin())->when;
        double endx = (*the_end)->when;
-       double miny = in.get_min_y ();
-       double maxy = in.get_max_y ();
 
        in.freeze ();
        in.clear ();
@@ -818,7 +816,7 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
        for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
 
                double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y; // miny + ((*i)->y * (maxy - miny));
+               double value = (*i)->y;
                in.add (when, value);
        }
 
@@ -829,8 +827,6 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 
        firstx = (*out.begin())->when;
        endx = (*the_end)->when;
-       miny = out.get_min_y ();
-       maxy = out.get_max_y ();
 
        out.freeze ();
        out.clear ();
@@ -838,7 +834,7 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
        for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
 
                double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y; // miny + ((*i)->y * (maxy - miny));
+               double value = (*i)->y;
                out.add (when, value);
        }
 

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3e5a1724684f85da3e3bd771c13527ccc60d9d5b..1893fd361ad21785b8479b0603f391640626b19d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2130,7 +2130,7 @@ Editor::set_state (const XMLNode& node, int /*version*/)
 {
        const XMLProperty* prop;
        XMLNode* geometry;
-       int x, y, xoff, yoff;
+       int x, y;
        Gdk::Geometry g;
 
        if ((prop = node.property ("id")) != 0) {
@@ -2141,8 +2141,6 @@ Editor::set_state (const XMLNode& node, int /*version*/)
        g.base_height = default_height;
        x = 1;
        y = 1;
-       xoff = 0;
-       yoff = 21;
 
        if ((geometry = find_named_node (node, "geometry")) != 0) {
 
@@ -2174,19 +2172,6 @@ Editor::set_state (const XMLNode& node, int /*version*/)
                if (prop) {
                        y = atoi (prop->value());
                }
-
-               if ((prop = geometry->property ("x_off")) == 0) {
-                       prop = geometry->property ("x-off");
-               }
-               if (prop) {
-                       xoff = atoi (prop->value());
-               }
-               if ((prop = geometry->property ("y_off")) == 0) {
-                       prop = geometry->property ("y-off");
-               }
-               if (prop) {
-                       yoff = atoi (prop->value());
-               }
        }
 
        set_default_size (g.base_width, g.base_height);
@@ -2368,9 +2353,8 @@ Editor::get_state ()
        if (is_realized()) {
                Glib::RefPtr<Gdk::Window> win = get_window();
 
-               int x, y, xoff, yoff, width, height;
+               int x, y, width, height;
                win->get_root_origin(x, y);
-               win->get_position(xoff, yoff);
                win->get_size(width, height);
 
                XMLNode* geometry = new XMLNode ("geometry");
@@ -2383,10 +2367,6 @@ Editor::get_state ()
                geometry->add_property("x-pos", string(buf));
                snprintf(buf, sizeof(buf), "%d", y);
                geometry->add_property("y-pos", string(buf));
-               snprintf(buf, sizeof(buf), "%d", xoff);
-               geometry->add_property("x-off", string(buf));
-               snprintf(buf, sizeof(buf), "%d", yoff);
-               geometry->add_property("y-off", string(buf));
                snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&edit_pane)->gobj()));
                geometry->add_property("edit-horizontal-pane-pos", string(buf));
                geometry->add_property("notebook-shrunk", _notebook_shrunk ? "1" : "0");
@@ -3527,7 +3507,6 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which)
        XMLProperty* prop;
        char buf[32];
        XMLNode* node = ARDOUR_UI::instance()->editor_settings();
-       int width, height;
 
        enum Pane {
                Horizontal = 0x1,
@@ -3536,22 +3515,8 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which)
 
        static Pane done;
 
-       XMLNode* geometry;
-
-       width = default_width;
-       height = default_height;
-
-       if ((geometry = find_named_node (*node, "geometry")) != 0) {
-
-               prop = geometry->property ("x-size");
-               if (prop) {
-                       width = atoi (prop->value());
-               }
-               prop = geometry->property ("y-size");
-               if (prop) {
-                       height = atoi (prop->value());
-               }
-       }
+       XMLNode* geometry = find_named_node (*node, "geometry");
+       assert (geometry);
 
        if (which == static_cast<Paned*> (&edit_pane)) {
 

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 42765e1d8740095644e856313e59bfadda789f85..c889921db774b7ed5ac9f29edd9c1859d2f4e0c1 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1309,11 +1309,6 @@ RegionSpliceDrag::motion (GdkEvent* event, bool)
 
        pair<TimeAxisView*, int> const tvp = _editor->trackview_by_y_position (_drags->current_pointer_y ());
        RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
-       layer_t layer = tvp.second;
-
-       if (tv && tv->layer_display() == Overlaid) {
-               layer = 0;
-       }
 
        /* The region motion is only processed if the pointer is over
           an audio track.

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 2427f53962a0654a6e44dbf4b8266ab7e9ce5544..8ac44a8effabe3d7113859c7df7c83b45fc010fd 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1936,7 +1936,6 @@ Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
 {
        double wx, wy;
        double cx, cy;
-       framepos_t where;
        RouteTimeAxisView *dest_rtv = 0;
        RouteTimeAxisView *source_rtv = 0;
 
@@ -1949,7 +1948,7 @@ Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
        event.button.x = wx;
        event.button.y = wy;
 
-       where = event_frame (&event, &cx, &cy);
+       event_frame (&event, &cx, &cy);
 
        std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
        if (tv.first == 0) {

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 94830b40b946d53818bc248fc28b31c397330871..763768ddcc754af33b6be2ba3e5f62eaeaab83a9 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -369,7 +369,6 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
        } else {
                // find parent node, add as new child
                TreeModel::iterator i;
-               TreeModel::Children rows = _model->children();
 
                boost::unordered_map<string, Gtk::TreeModel::RowReference>::iterator it;
 
@@ -394,9 +393,9 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
                        */
 
                        row = *(_model->insert (subrows.end()));
-               }
-               else {
-                 row = *(_model->append());
+                       
+               } else {
+                       row = *(_model->append());
                }
 
                row[_columns.property_toggles_visible] = true;
@@ -491,8 +490,6 @@ EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange
 
                /* find the region in our model and update its row */
                TreeModel::Children rows = _model->children ();
-               TreeModel::iterator i = rows.begin ();
-
        }
 
        if (what_changed.contains (ARDOUR::Properties::hidden)) {

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index a558d36fcec107ced1f09f86d1c7d4aa7ea62813..b207124ecbece7d95997af3483b50670b686d284 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -911,7 +911,6 @@ EngineControl::driver_changed ()
 {
        string driver = driver_combo.get_active_text();
        string::size_type maxlen = 0;
-       int maxindex = -1;
        int n = 0;
 
        enumerate_devices (driver);
@@ -926,7 +925,6 @@ EngineControl::driver_changed ()
        for (vector<string>::iterator i = strings.begin(); i != strings.end(); ++i, ++n) {
                if ((*i).length() > maxlen) {
                        maxlen = (*i).length();
-                       maxindex = n;
                }
        }
 

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 2de95c1f73aa67e0dfe4dcb0d03e594822c43c52..7d585aceb7a1631bd33bb07ebd555f7eda84291a 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -411,7 +411,6 @@ bool
 MidiRegionView::button_release (GdkEventButton* ev)
 {
        double event_x, event_y;
-       framepos_t event_frame = 0;
 
        if (ev->button != 1) {
                return false;
@@ -423,8 +422,6 @@ MidiRegionView::button_release (GdkEventButton* ev)
        group->w2i(event_x, event_y);
        group->ungrab(ev->time);
 
-       event_frame = trackview.editor().pixel_to_frame(event_x);
-
        switch (_mouse_state) {
        case Pressed: // Clicked
 
@@ -792,7 +789,6 @@ void
 MidiRegionView::channel_edit ()
 {
        bool first = true;
-       bool mixed = false;
        uint8_t current_channel;
 
        if (_selection.empty()) {
@@ -800,14 +796,9 @@ MidiRegionView::channel_edit ()
        }
        
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               Selection::iterator next = i;
                if (first) {
                        current_channel = (*i)->note()->channel ();
                        first = false;
-               } else {
-                       if (current_channel != (*i)->note()->channel()) {
-                               mixed = true;
-                       }
                }
        }
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 23cb790e413bfc4c3d02b2616d73783b24e0bc7e..c2e082ff611b14a6ab592b776810063b65421b35 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1462,21 +1462,13 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
        char buf[32];
        XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
        XMLNode* geometry;
-       int width, height;
+       int height;
        static int32_t done[3] = { 0, 0, 0 };
 
-       width = default_width;
        height = default_height;
 
        if ((geometry = find_named_node (*node, "geometry")) != 0) {
 
-
-               if ((prop = geometry->property ("x_size")) == 0) {
-                       prop = geometry->property ("x-size");
-               }
-               if (prop) {
-                       width = atoi (prop->value());
-               }
                if ((prop = geometry->property ("y_size")) == 0) {
                        prop = geometry->property ("y-size");
                }

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 0aeef0ff17d60fa82890fbef57d65ed3518e1c38..9f2f1ed1e5b6739f14723dbd8e5f918644d2bbc7 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -823,14 +823,11 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                processor = child->processor ();
        }
 
-       int ret = false;
-
        if (processor && Keyboard::is_delete_event (ev)) {
 
                Glib::signal_idle().connect (sigc::bind (
                                sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
                                boost::weak_ptr<Processor>(processor)));
-               ret = true;
 
        } else if (Keyboard::is_context_menu_event (ev)) {
 
@@ -849,7 +846,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                }
 
                show_processor_menu (ev->time);
-               ret = true;
 
        } else if (processor && Keyboard::is_button2_event (ev)
 #ifndef GTKOSX
@@ -864,8 +860,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 42264cf1cbaf5835333ca7e8e3e9a8b356404e40..e21c588c62bcfb338ed4fccdb4a34bd05e64d548 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -267,6 +267,10 @@ namespace ARDOUR {
                          case Seconds:
                                return seconds != 0;
                        }
+
+                       /* NOTREACHED */
+                       assert (false);
+                       return false;
                }
        };
 

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 22be5a39124c47a8e014f7a28f099fe9db6947a5..1132b2a05037010188866874dd8b634428f33e53 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1252,7 +1252,6 @@ AudioDiskstream::do_flush (RunContext /*context*/, bool force_flush)
                if (destructive()) {
                        (*chan)->capture_transition_buf->get_read_vector(&transvec);
                        size_t transcount = transvec.len[0] + transvec.len[1];
-                       bool have_start = false;
                        size_t ti;
 
                        for (ti=0; ti < transcount; ++ti) {
@@ -1264,9 +1263,7 @@ AudioDiskstream::do_flush (RunContext /*context*/, bool force_flush)
                                        (*chan)->write_source->mark_capture_start (captrans.capture_val);
                                        (*chan)->curr_capture_cnt = 0;
 
-                                       have_start = true;
-                               }
-                               else if (captrans.type == CaptureEnd) {
+                               } else if (captrans.type == CaptureEnd) {
 
                                        // capture end, the capture_val represents total frames in capture
 

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 0c9fd4f31464d3d07e483a4c521b8e700335ce71..70cd9ec3f5de0f837b4d4210e705a1844d6990be 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -190,9 +190,6 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, fram
 
                framecnt_t fade_in = 64;
                framecnt_t fade_out = 64;
-               framepos_t position;
-               framecnt_t len;
-               frameoffset_t offset;
 
                switch (region->coverage (start, end)) {
                case OverlapNone:
@@ -212,9 +209,6 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, fram
                }
 
                case OverlapStart: {
-                       position = region->position() - start;
-                       len = end - region->position();
-
                        if (end > region->position() + region->fade_in()->back()->when)
                                fade_in = region->fade_in()->back()->when;  //end is after fade-in, preserve the fade-in
                        if (end > region->last_frame() - region->fade_out()->back()->when)
@@ -223,10 +217,6 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, fram
                }
 
                case OverlapEnd: {
-                       position = 0;
-                       offset = start - region->position();
-                       len = region->length() - offset;
-
                        if (start < region->last_frame() - region->fade_out()->back()->when)  //start is before fade-out, preserve the fadeout
                                fade_out = region->fade_out()->back()->when;
 

diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 773deb93ab68a2acbee30db59f04800293f9d3d5..79c0c12691e162413037271c7e1279b601136262 100644 (file)
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -136,7 +136,6 @@ AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cn
        boost::shared_ptr<gain_t> gbuf;
        framecnt_t to_read;
        framecnt_t to_zero;
-       pair<framepos_t,framepos_t> extent = _playlist->get_extent();
 
        /* we must be careful not to read beyond the end of our "section" of
         * the playlist, because otherwise we may read data that exists, but

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index e3eef62107fc07bab37584ccb9e3187c85427c01..f6cab420ed7a769949b214306dcba80fcee75897 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -905,7 +905,6 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
        MidiRegion::SourceList srcs;
        MidiRegion::SourceList::iterator src;
        vector<CaptureInfo*>::iterator ci;
-       bool mark_write_completed = false;
 
        finish_capture (true);
 
@@ -1075,8 +1074,6 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                        }
                }
 
-
-               mark_write_completed = true;
        }
 
        use_new_write_source (0);

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 7d7b51aa7f6dc61513656f5c13b19c57bc246d1e..1df9950f868d59cbb07c8b8af2b9545d2b24d50f 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -714,8 +714,6 @@ MidiTrack::set_input_active (bool yn)
 void
 MidiTrack::map_input_active (bool yn)
 {
-       bool changed = false;
-
        if (!_input) {
                return;
        }
@@ -726,7 +724,6 @@ MidiTrack::map_input_active (bool yn)
                MidiPort* mp = dynamic_cast<MidiPort*> (&*p);
                if (yn != mp->input_active()) {
                        mp->set_input_active (yn);
-                       changed = true;
                }
        }
 }

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 66a0eab9ad0a9355fdbde8f6a2566303d7416b4d..6fad2084e4e267ae370f0fba2ee562f19179c666 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -848,7 +848,6 @@ Playlist::flush_notifications (bool from_undo)
  {
         RegionList::iterator i;
         framecnt_t old_length = 0;
-        int ret = -1;
 
         if (!holding_state()) {
                 old_length = _get_extent().second;
@@ -881,7 +880,6 @@ Playlist::flush_notifications (bool from_undo)
                         }
 
                         notify_region_removed (region);
-                        ret = 0;
                         break;
                 }
         }

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 8221f7b46e7988b354d38b81df9abe3cf688f030..912fc20dcda350fb6f6c1ac510f58860a8eb92b2 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -733,8 +733,7 @@ PluginManager::set_status (PluginType t, string id, PluginStatusType status)
                return;
        }
 
-       pair<PluginStatusList::iterator, bool> res = statuses.insert (ps);
-       //cerr << "Added " << t << " " << id << " " << status << " success ? " << res.second << endl;
+       statuses.insert (ps);
 }
 
 ARDOUR::PluginInfoList&

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 9de9e6cf5cef91004e1eb29ccab7ac6c1a92a6ad..81d85a8640d7035c878a47ee82aaf97f3dcd1fcf 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -860,8 +860,6 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorList::ite
        DEBUG_TRACE (DEBUG::Processors, string_compose (
                             "%1 adding processor %2\n", name(), processor->name()));
 
-       ChanCount old_pms = processor_max_streams;
-
        if (!_session.engine().connected() || !processor) {
                return 1;
        }
@@ -1018,8 +1016,6 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
                loc = _processors.end ();
        }
 
-       ChanCount old_pms = processor_max_streams;
-
        if (!_session.engine().connected()) {
                return 1;
        }
@@ -1044,7 +1040,7 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
                                pi->set_count (1);
                        }
 
-                       ProcessorList::iterator inserted = _processors.insert (loc, *i);
+                       _processors.insert (loc, *i);
 
                        if ((*i)->active()) {
                                (*i)->activate ();
@@ -1216,8 +1212,6 @@ Route::ab_plugins (bool forward)
 void
 Route::clear_processors (Placement p)
 {
-       const ChanCount old_pms = processor_max_streams;
-
        if (!_session.engine().connected()) {
                return;
        }
@@ -1298,8 +1292,6 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
                return 0;
        }
 
-       ChanCount old_pms = processor_max_streams;
-
        if (!_session.engine().connected()) {
                return 1;
        }

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 8a677105bd81509398a54829e2ad21c54a0be2f8..9c37e0a09cdff2a48656180143148c970156ee19 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -182,15 +182,9 @@ int
 Session::silent_process_routes (pframes_t nframes, bool& need_butler)
 {
        bool record_active = actively_recording();
-       int  declick = get_transport_declick_required();
        bool rec_monitors = get_rec_monitors_input();
        boost::shared_ptr<RouteList> r = routes.reader ();
 
-       if (transport_sub_state & StopPendingCapture) {
-               /* force a declick out */
-               declick = -1;
-       }
-
        const framepos_t start_frame = _transport_frame;
        const framepos_t end_frame = _transport_frame + lrintf(nframes * _transport_speed);
 
@@ -705,7 +699,6 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
 
                                memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size);
                                average_slave_delta = 0L;
-                               this_delta = 0;
                        }
                }
 

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 7006c6c7eb2464a37de125c92e51920dec1d0e7a..e5ba83015d9814ee1b4d2a5bb6e9e98bc7792c91 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -405,8 +405,6 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt)
 framecnt_t
 SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
 {
-       framepos_t old_file_pos;
-
        if (!writable()) {
                warning << string_compose (_("attempt to write a non-writable audio file source (%1)"), _path) << endmsg;
                return 0;
@@ -482,7 +480,6 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt)
                }
        }
 
-       old_file_pos = file_pos;
        update_length (file_pos, cnt);
 
        if (_build_peakfiles) {

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index 75e9b4c5e1ca407f8194c705b45405b2207bfe30..cf8557de82740a602cf0ab792c6289323625b6b1 100644 (file)
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -128,13 +128,11 @@ TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFe
        Plugin::FeatureSet features;
 
        Sample* data = 0;
-       float* bufs[1] = { 0 };
 
        int buff_size = 1024;
        int step_size = 64;
 
        data = new Sample[buff_size];
-       bufs[0] = data;
 
        AnalysisFeatureList::iterator i = positions.begin();
 

diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index 8919f10f9a64114bfcb36c8c1cef17616492e1bd..9a5e65332b4f18d24581876e843574a296b06c8f 100644 (file)
--- a/libs/pbd/pool.cc
+++ b/libs/pbd/pool.cc
@@ -178,8 +178,7 @@ PerThreadPool::PerThreadPool ()
 {
        {
                /* for some reason this appears necessary to get glib's thread private stuff to work */
-               GPrivate* key;
-               key = g_private_new (NULL);
+               g_private_new (NULL);
        }
 
        _key = g_private_new (free_per_thread_pool);