From 3dfae5be660dd271e7895a481b7fbfbeee7981a4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 17 Jan 2007 02:35:16 +0000 Subject: merge by hand changes from mtaht to fix up export behaviour, and gcc warnings when optimized git-svn-id: svn://localhost/ardour2/trunk@1332 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 3 ++- gtk2_ardour/ardour_ui_options.cc | 6 ++++++ gtk2_ardour/audio_streamview.cc | 8 +++++++- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor_mouse.cc | 2 -- libs/ardour/session.cc | 2 +- libs/ardour/session_command.cc | 2 +- libs/pbd/whitespace.cc | 2 +- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 2be154afbf..4c47db4964 100644 --- a/SConstruct +++ b/SConstruct @@ -659,7 +659,8 @@ opt_flags[:0] = [ "-O3", "-fomit-frame-pointer", "-ffast-math", - "-fstrength-reduce" + "-fstrength-reduce", + "-fno-strict-aliasing" ] if env['DEBUG'] == 1: diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 7b8557f18b..ca11d4a4d9 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -102,6 +102,9 @@ ARDOUR_UI::set_native_file_header_format (HeaderFormat hf) case AIFF: action = X_("FileHeaderFormatAIFF"); break; + default: + fatal << string_compose (_("programming error: %1"), "illegal file header format in ::set_native_file_header_format") << endmsg; + /*NOTREACHED*/ } Glib::RefPtr act = ActionManager::get_action ("options", action); @@ -126,6 +129,9 @@ ARDOUR_UI::set_native_file_data_format (SampleFormat sf) case FormatInt24: action = X_("FileDataFormat24bit"); break; + default: + fatal << string_compose (_("programming error: %1"), "illegal file data format in ::set_native_file_data_format") << endmsg; + /*NOTREACHED*/ } Glib::RefPtr act = ActionManager::get_action ("options", action); diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 349f472e6e..aa54af86fb 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -48,6 +48,8 @@ #include "utils.h" #include "color.h" +#include "i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -130,7 +132,7 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) void AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves) { - AudioRegionView *region_view; + AudioRegionView *region_view = 0; ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r)); @@ -167,6 +169,10 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai region_view = new TapeAudioRegionView (canvas_group, _trackview, region, _samples_per_unit, region_color); break; + default: + fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg; + /*NOTREACHED*/ + } region_view->init (region_color, wait_for_waves); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e447603100..55730cae11 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2808,7 +2808,7 @@ Editor::extend_selection_to_track (TimeAxisView& view) TrackViewList sorted = track_views; TrackViewByPositionSorter cmp; bool passed_clicked = false; - bool forwards; + bool forwards = true; sorted.sort (cmp); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 4723a0a66a..8e1579a83a 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2708,8 +2708,6 @@ Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event) void Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event) { - cerr << "start region copy grab, selected regions = " << selection->regions.size() << endl; - if (selection->regions.empty() || clicked_regionview == 0) { return; } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index eba090665a..0b668607dd 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3397,7 +3397,7 @@ Session::remove_redirect (Redirect* redirect) nframes_t Session::available_capture_duration () { - float sample_bytes_on_disk; + float sample_bytes_on_disk = 4.0; // keep gcc happy switch (Config->get_native_file_data_format()) { case FormatFloat: diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index 14ec340f41..1ecf4fce8d 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -28,7 +28,7 @@ Session::memento_command_factory(XMLNode *n) { PBD::ID id; XMLNode *before = 0, *after = 0; - XMLNode *child; + XMLNode *child = 0; /* get id */ id = PBD::ID(n->property("obj_id")->value()); diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc index a719fb169f..9568c1781c 100644 --- a/libs/pbd/whitespace.cc +++ b/libs/pbd/whitespace.cc @@ -9,7 +9,7 @@ strip_whitespace_edges (string& str) { string::size_type i; string::size_type len; - string::size_type s; + string::size_type s = 0; len = str.length(); -- cgit v1.2.3