Fix some trivial compiler warnings and add editor_imageframe.cc to gtk2_ardour/wscript

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

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fb917ac19ee5c3729ba3c8f589207ec2f0b0af35..3a343f75b36812f1124d14ab2150f2239c08d0c1 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4947,7 +4947,7 @@ Editor::remove_route (TimeAxisView *tv)
 
        TrackViewList::iterator i;
        boost::shared_ptr<Route> route;
-       TimeAxisView* next_tv;
+       TimeAxisView* next_tv = 0;
 
        if (tv == entered_track) {
                entered_track = 0;

diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 93fd1d56b3e2b69e7ace4a1a9db019a2e2b30dc0..22852882ba97213c2e6ddcfffcfd26d405b845d5 100644 (file)
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -730,7 +730,7 @@ ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & ti
        // TODO position
        clock.set (session->convert_to_frames_at (0, time), true);
        
-       AudioClock::Mode mode;
+       AudioClock::Mode mode(AudioClock::SMPTE);
        
        switch (time.type) {
          case AnyTime::SMPTE:

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 83a35bcb9670ae19beb6c1437b58071d5291195b..2e9cfff614368c7b912948bcd9004ff5d13cd8a9 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -388,11 +388,11 @@ Mixer_UI::sync_order_keys (string const & src)
        }
 
        bool changed = false;
-       int order;
+       unsigned int order;
 
        for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
-               int old_key = order;
+               unsigned int old_key = order;
                unsigned int new_key = route->order_key (N_("signal"));
 
                assert (new_key < neworder.size());

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 17d9096dc98f06b074be5fbc62fc8ba16a400c67..d594d364d89b71e16d5bdc5c48a9a97ad3acc4f0 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -79,6 +79,7 @@ gtk2_ardour_sources = [
        'editor_export_audio.cc',
        'editor_group_tabs.cc',
        'editor_hscroller.cc',
+       'editor_imageframe.cc',
        'editor_keyboard.cc',
        'editor_keys.cc',
        'editor_markers.cc',

diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc
index cbc3458615cafd62cf4865c1fc5112ce21e06cfb..d380906c0cd49e1ce0d40e36334c2c26b61268ab 100644 (file)
--- a/libs/ardour/event_type_map.cc
+++ b/libs/ardour/event_type_map.cc
@@ -82,7 +82,7 @@ Evoral::ControlList::InterpolationStyle
 EventTypeMap::interpolation_of(const Evoral::Parameter& param)
 {
        switch (param.type()) {
-       case MidiCCAutomation:              
+       case MidiCCAutomation:
                switch (param.id()) {
                case MIDI_CTL_LSB_BANK:
                case MIDI_CTL_MSB_BANK:
@@ -128,6 +128,7 @@ EventTypeMap::interpolation_of(const Evoral::Parameter& param)
        case MidiPitchBenderAutomation:     return Evoral::ControlList::Linear; break; 
        default: assert(false);
        }
+       return Evoral::ControlList::Linear; // Not reached, suppress warnings
 }
 
 

diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc
index ec1c8a7b60f51cef8878be0b6cf379927d9f8555..eb48c8e34625320b410f547a656545ef6180344a 100644 (file)
--- a/libs/pbd/xml++.cc
+++ b/libs/pbd/xml++.cc
@@ -68,7 +68,7 @@ XMLTree::read_internal(bool validate)
        delete _root;
        _root = 0;
 
-       xmlParserCtxtPtr ctxt; /* the parser context */
+       xmlParserCtxtPtr ctxt = NULL; /* the parser context */
        xmlDocPtr doc; /* the resulting document tree */
 
        xmlKeepBlanksDefault(0);