X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_list_editor.cc;h=0a87823f8e577845060f9e2c34a3edd97d1a3f5f;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=66a8e8b6df9c5da4af9f76bb5b5d946b9d357b40;hpb=9befa88debe08349deb01ebc00b605721865eda4;p=ardour.git diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc index 66a8e8b6df..0a87823f8e 100644 --- a/gtk2_ardour/midi_list_editor.cc +++ b/gtk2_ardour/midi_list_editor.cc @@ -1,19 +1,19 @@ /* Copyright (C) 2009 Paul Davis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include @@ -185,7 +185,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber); bool apply = false; bool was_selected = false; - char* opname; + char const * opname; if (!view.get_path_at_pos (ev->x, ev->y, path, col, cellx, celly)) { return false; @@ -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]; @@ -291,17 +291,18 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) if (note->time() + fdelta >= 0) { cmd->change (note, prop, note->time() + fdelta); } else { - cmd->change (note, prop, 0.0); + cmd->change (note, prop, Evoral::MusicalTime()); } break; case MidiModel::NoteDiffCommand::Velocity: cmd->change (note, prop, (uint8_t) (note->velocity() + idelta)); break; case MidiModel::NoteDiffCommand::Length: - if (note->length() + fdelta >= 1.0/BBT_Time::ticks_per_beat) { + if (note->length().to_double() + fdelta >= + Evoral::MusicalTime::tick().to_double()) { cmd->change (note, prop, note->length() + fdelta); } else { - cmd->change (note, prop, 1.0/BBT_Time::ticks_per_beat); + cmd->change (note, prop, Evoral::MusicalTime::tick()); } break; case MidiModel::NoteDiffCommand::Channel: @@ -333,17 +334,18 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) if (note->time() + fdelta >= 0) { cmd->change (note, prop, note->time() + fdelta); } else { - cmd->change (note, prop, 0.0); + cmd->change (note, prop, Evoral::MusicalTime()); } break; case MidiModel::NoteDiffCommand::Velocity: cmd->change (note, prop, (uint8_t) (note->velocity() + idelta)); break; case MidiModel::NoteDiffCommand::Length: - if (note->length() + fdelta >= 1.0/BBT_Time::ticks_per_beat) { + if (note->length() + fdelta >= + Evoral::MusicalTime::tick().to_double()) { cmd->change (note, prop, note->length() + fdelta); } else { - cmd->change (note, prop, 1.0/BBT_Time::ticks_per_beat); + cmd->change (note, prop, Evoral::MusicalTime::tick()); } break; case MidiModel::NoteDiffCommand::Channel: @@ -445,7 +447,6 @@ MidiListEditor::key_release (GdkEventKey* ev) TreeModel::Path path; TreeViewColumn* col; TreeModel::iterator iter; - TreeModel::Row row; MidiModel::NoteDiffCommand* cmd; boost::shared_ptr m (region->midi_source(0)->model()); boost::shared_ptr note; @@ -588,7 +589,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text) bool apply = false; int idelta = 0; double fdelta = 0; - char* opname; + char const * opname; switch (edit_column) { case 0: // start break; @@ -638,7 +639,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text) * entry for the actual note ticks */ - int len_ticks = lrint (note->length() * Timecode::BBT_Time::ticks_per_beat); + uint64_t len_ticks = note->length().to_ticks(); std::map::iterator x = note_length_map.find (len_ticks); if (x == note_length_map.end()) { @@ -683,7 +684,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text) } if (fval > 0.0) { - fdelta = fval - note->length(); + fdelta = fval - note->length().to_double(); prop = MidiModel::NoteDiffCommand::Length; opname = _("change note length"); apply = true; @@ -702,7 +703,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]; @@ -763,7 +764,6 @@ MidiListEditor::redisplay_model () row[columns.velocity] = (*i)->velocity(); Timecode::BBT_Time bbt; - double dur; _session->tempo_map().bbt_time (conv.to ((*i)->time()), bbt); @@ -772,11 +772,11 @@ MidiListEditor::redisplay_model () row[columns.start] = ss.str(); bbt.bars = 0; - dur = (*i)->end_time() - (*i)->time(); - bbt.beats = floor (dur); - bbt.ticks = (uint32_t) lrint (fmod (dur, 1.0) * Timecode::BBT_Time::ticks_per_beat); + const Evoral::MusicalTime dur = (*i)->end_time() - (*i)->time(); + bbt.beats = dur.get_beats (); + bbt.ticks = dur.get_ticks (); - int len_ticks = lrint ((*i)->length() * Timecode::BBT_Time::ticks_per_beat); + int len_ticks = (*i)->length().to_ticks(); std::map::iterator x = note_length_map.find (len_ticks); if (x != note_length_map.end()) { @@ -809,7 +809,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); }