summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_list_editor.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-24 02:54:10 +0000
committerDavid Robillard <d@drobilla.net>2012-05-24 02:54:10 +0000
commit27a1cf2cf73703267cac5bda2acca386afb374b3 (patch)
tree122ceba55fef1d183d1b32dca1fd60ffdc113112 /gtk2_ardour/midi_list_editor.cc
parenteffe4de1889bfefba6550dff4244e06c2c7261bd (diff)
Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC environment variables, e.g.: CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_list_editor.cc')
-rw-r--r--gtk2_ardour/midi_list_editor.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 66a8e8b6df..20fc0ed433 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -282,7 +282,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
previous_selection.push_back (*i);
- if (iter = model->get_iter (*i)) {
+ if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
@@ -445,7 +445,6 @@ MidiListEditor::key_release (GdkEventKey* ev)
TreeModel::Path path;
TreeViewColumn* col;
TreeModel::iterator iter;
- TreeModel::Row row;
MidiModel::NoteDiffCommand* cmd;
boost::shared_ptr<MidiModel> m (region->midi_source(0)->model());
boost::shared_ptr<NoteType> note;
@@ -702,7 +701,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
- if (iter = model->get_iter (*i)) {
+ if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
@@ -809,7 +808,7 @@ MidiListEditor::selection_changed ()
NotePlayer* player = new NotePlayer (track);
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
- if (iter = model->get_iter (*i)) {
+ if ((iter = model->get_iter (*i))) {
note = (*iter)[columns._note];
player->add (note);
}