diff options
author | Carl Hetherington <carl@carlh.net> | 2011-07-02 17:16:46 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-07-02 17:16:46 +0000 |
commit | cd17e05e3a22614387050736c89a4727c4da0d61 (patch) | |
tree | f224ba7c78d83a9abc5d1c8ecf7bedb31005ed74 /gtk2_ardour | |
parent | c03ea1fdb307fadff2b3c3f837426f1039bf5b10 (diff) |
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/canvas-simpleline.c | 10 | ||||
-rw-r--r-- | gtk2_ardour/crossfade_edit.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 43 | ||||
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/editor_regions.cc | 9 | ||||
-rw-r--r-- | gtk2_ardour/engine_dialog.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 9 | ||||
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 10 | ||||
-rw-r--r-- | gtk2_ardour/processor_box.cc | 6 |
11 files changed, 11 insertions, 98 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 0418119c39..71768c699c 100644 --- 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 83beb598e7..887f71b411 100644 --- 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 c3f561944f..7ec19e97ad 100644 --- 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 3e5a172468..1893fd361a 100644 --- 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 42765e1d87..c889921db7 100644 --- 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 2427f53962..8ac44a8eff 100644 --- 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 94830b40b9..763768ddcc 100644 --- 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 a558d36fce..b207124ecb 100644 --- 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 2de95c1f73..7d585aceb7 100644 --- 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 23cb790e41..c2e082ff61 100644 --- 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 0aeef0ff17..9f2f1ed1e5 100644 --- 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; |