diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/export_format_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index fb917ac19e..3a343f75b3 100644 --- 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 93fd1d56b3..22852882ba 100644 --- 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 83a35bcb96..2e9cfff614 100644 --- 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 17d9096dc9..d594d364d8 100644 --- 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', |