diff options
| author | David Robillard <d@drobilla.net> | 2008-11-11 04:53:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-11-11 04:53:37 +0000 |
| commit | 4b8fb7e081bcd5172e5903ff3c4d603cfb72aa50 (patch) | |
| tree | 3f8f3720435a564542f2aa4ca1af8babca6ba1d6 /gtk2_ardour | |
| parent | 5c4601c08ac2e2c8010a5ac4c6d8413442c880ce (diff) | |
Fix silly careless errors.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4134 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/canvas-waveview.c | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 98b99cca07..0128ccbba2 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -305,10 +305,7 @@ AutomationTimeAxisView::set_height (uint32_t h) bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) ); TimeAxisView* state_parent = get_parent_with_state (); - XMLNode* xml_node; - if (state_parent) { - xml_node = state_parent->get_child_xml_node (_state_name); - } + XMLNode* xml_node = (state_parent ? state_parent->get_child_xml_node (_state_name) : NULL); TimeAxisView::set_height (h); base_rect->property_y2() = h; diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c index 3821d6ff98..f929b31197 100644 --- a/gtk2_ardour/canvas-waveview.c +++ b/gtk2_ardour/canvas-waveview.c @@ -1615,7 +1615,7 @@ gnome_canvas_waveview_draw (GnomeCanvasItem *item, double origin; double clip_length; double xoff; - double yoff; + double yoff = 0.0; double ulx; double uly; double lrx; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 9c0c896b14..0aa9d00840 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4644,7 +4644,7 @@ Editor::toggle_region_opaque () void Editor::toggle_record_enable () { - bool new_state; + bool new_state = false; bool first = true; for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView *>(*i); diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index d05e6424ce..cf08f4ad68 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -1151,7 +1151,7 @@ EngineControl::set_state (const XMLNode& root) XMLNodeList clist; XMLNodeConstIterator citer; XMLNode* child; - XMLProperty* prop; + XMLProperty* prop = NULL; bool using_dummy = false; int val; |