merge by hand changes from mtaht to fix up export behaviour, and gcc warnings when...

git-svn-id: svn://localhost/ardour2/trunk@1332 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 2be154afbf81628d74ad7ffbbc4a5a6835acbde7..4c47db4964ecf4c023a3ea271c5ede3361ceb254 100644 (file)
--- 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 7b8557f18b6fefafb89056f5c1188062608c83e1..ca11d4a4d995b1f04acf9107520566e82ea91d53 100644 (file)
--- 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<Action> 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<Action> act = ActionManager::get_action ("options", action);

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 349f472e6eac3aef9dca3343b42544028062e433..aa54af86fbdcc55dc1aa87fc1a96e7235dfa7984 100644 (file)
--- 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<Region> 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<Region> 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 e447603100e6c08ae7431c88dc66da3c3f51cd9f..55730cae116bef936dd26b747f5c40a1d6d53ea7 100644 (file)
--- 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 4723a0a66a7bbd581a85a0b97498e9e4009bf9ae..8e1579a83aec4ec2628086a03edb7adb85a2dc55 100644 (file)
--- 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 eba090665a173559c4a672cac964e0e160e170f7..0b668607ddef590ced74a35e8c3d61c71db60ccb 100644 (file)
--- 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 14ec340f414408a759f3b5526a1fe04bb276afe6..1ecf4fce8d9b5da716e3d208f665cc94e39879f1 100644 (file)
--- 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 a719fb169f2af983150620c8f56da841a036a2b3..9568c1781c694de71d4a0720990c235346c88254 100644 (file)
--- 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();