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 "evoral/midi_util.h"
#include "evoral/Note.hpp"
-#include "ardour/beats_frames_converter.h"
+#include "ardour/beats_samples_converter.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/actions.h"
-#include "ardour_ui.h"
#include "midi_list_editor.h"
#include "note_player.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Gtk;
static map<int,std::string> note_length_map;
-static void
+static void
fill_note_length_map ()
{
note_length_map.insert (make_pair<int,string> (BBT_Time::ticks_per_beat, _("Whole")));
if (note_length_map.empty()) {
fill_note_length_map ();
}
-
+
/* We do not handle nested sources/regions. Caller should have tackled this */
if (r->max_source_level() > 0) {
note_length_model = ListStore::create (note_length_columns);
TreeModel::Row row;
-
+
for (std::map<int,string>::iterator i = note_length_map.begin(); i != note_length_map.end(); ++i) {
row = *(note_length_model->append());
row[note_length_columns.ticks] = i->first;
redisplay_model ();
- region->midi_source(0)->model()->ContentsChanged.connect (content_connection, invalidator (*this),
+ region->midi_source(0)->model()->ContentsChanged.connect (content_connection, invalidator (*this),
boost::bind (&MidiListEditor::redisplay_model, this), gui_context());
buttons.attach (sound_notes_button, 0, 1, 0, 1);
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action ("Editor", "sound-midi-notes");
if (act) {
- gtk_activatable_set_related_action (GTK_ACTIVATABLE (sound_notes_button.gobj()), act->gobj());
+ gtk_activatable_set_related_action (GTK_ACTIVATABLE (sound_notes_button.gobj()), act->gobj());
}
view.show ();
if (!view.get_path_at_pos (ev->x, ev->y, path, col, cellx, celly)) {
return false;
}
-
+
if (view.get_selection()->count_selected_rows() == 0) {
was_selected = false;
} else if (view.get_selection()->is_selected (path)) {
} else {
was_selected = false;
}
-
+
int colnum = GPOINTER_TO_UINT (col->get_data (X_("colnum")));
switch (colnum) {
if (was_selected) {
/* use selection */
-
+
TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
TreeModel::iterator iter;
boost::shared_ptr<NoteType> note;
-
+
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
previous_selection.push_back (*i);
if ((iter = model->get_iter (*i))) {
-
- note = (*iter)[columns._note];
-
+
+ note = (*iter)[columns._note];
+
switch (prop) {
case MidiModel::NoteDiffCommand::StartTime:
if (note->time() + fdelta >= 0) {
cmd->change (note, prop, note->time() + fdelta);
} else {
- cmd->change (note, prop, Evoral::Beats());
+ cmd->change (note, prop, Temporal::Beats());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length().to_double() + fdelta >=
- Evoral::Beats::tick().to_double()) {
+ Temporal::Beats::tick().to_double()) {
cmd->change (note, prop, note->length() + fdelta);
} else {
- cmd->change (note, prop, Evoral::Beats::tick());
+ cmd->change (note, prop, Temporal::Beats::tick());
}
break;
case MidiModel::NoteDiffCommand::Channel:
} else {
/* just this row */
-
+
TreeModel::iterator iter;
iter = model->get_iter (path);
if (iter) {
boost::shared_ptr<NoteType> note = (*iter)[columns._note];
-
+
switch (prop) {
case MidiModel::NoteDiffCommand::StartTime:
if (note->time() + fdelta >= 0) {
cmd->change (note, prop, note->time() + fdelta);
} else {
- cmd->change (note, prop, Evoral::Beats());
+ cmd->change (note, prop, Temporal::Beats());
}
break;
case MidiModel::NoteDiffCommand::Velocity:
break;
case MidiModel::NoteDiffCommand::Length:
if (note->length() + fdelta >=
- Evoral::Beats::tick().to_double()) {
+ Temporal::Beats::tick().to_double()) {
cmd->change (note, prop, note->length() + fdelta);
} else {
- cmd->change (note, prop, Evoral::Beats::tick());
+ cmd->change (note, prop, Temporal::Beats::tick());
}
break;
case MidiModel::NoteDiffCommand::Channel:
m->apply_command (*_session, cmd);
/* reset selection to be as it was before we rebuilt */
-
+
for (vector<TreeModel::Path>::iterator i = previous_selection.begin(); i != previous_selection.end(); ++i) {
view.get_selection()->select (*i);
}
ret = true;
}
break;
-
+
case GDK_Up:
case GDK_uparrow:
if (edit_column > 0) {
case GDK_Escape:
stop_editing (true);
break;
-
+
}
return ret;
ret = true;
}
break;
-
+
case GDK_r:
if (_session && Gtkmm2ext::Keyboard::modifier_state_contains (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) {
_session->redo (1);
}
break;
case 3: // name
+ ival = ParameterDescriptor::midi_note_num (text);
+ if (ival < 128) {
+ idelta = ival - note->note();
+ prop = MidiModel::NoteDiffCommand::NoteNumber;
+ opname = _("change note number");
+ apply = true;
+ }
break;
case 4: // velocity
if (sscanf (text.c_str(), "%d", &ival) == 1 && ival != note->velocity()) {
if (sscanf (text.c_str(), "%lf", &fval) == 1) {
/* numeric value entered */
-
+
if (text.find ('.') == string::npos && text.find (',') == string::npos) {
/* integral => units are ticks */
fval = fval / BBT_Time::ticks_per_beat;
* displaying numeric value ... use new value
* from note length map, and convert to beats.
*/
-
+
for (x = note_length_map.begin(); x != note_length_map.end(); ++x) {
if (x->second == text) {
break;
}
}
-
+
if (x != note_length_map.end()) {
fval = x->first / BBT_Time::ticks_per_beat;
}
fval = -1.0;
if (text != x->second) {
-
+
/* get ticks for the newly selected
* note length
*/
break;
}
}
-
+
if (x != note_length_map.end()) {
/* convert to beats */
fval = (double) x->first / BBT_Time::ticks_per_beat;
MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (opname);
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))) {
- note = (*iter)[columns._note];
-
+ note = (*iter)[columns._note];
+
switch (prop) {
case MidiModel::NoteDiffCommand::Velocity:
cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
/* model has been redisplayed by now */
/* keep selected row(s), move cursor there, don't continue editing */
-
+
TreeViewColumn* col = view.get_column (edit_column);
view.set_cursor (edit_path, *col, 0);
if (_session) {
- BeatsFramesConverter conv (_session->tempo_map(), region->position());
+ BeatsSamplesConverter conv (_session->tempo_map(), region->position());
MidiModel::Notes notes = region->midi_source(0)->model()->notes();
TreeModel::Row row;
stringstream ss;
for (MidiModel::Notes::iterator i = notes.begin(); i != notes.end(); ++i) {
row = *(model->append());
row[columns.channel] = (*i)->channel() + 1;
- row[columns.note_name] = Evoral::midi_note_name ((*i)->note());
+ row[columns.note_name] = ParameterDescriptor::midi_note_name ((*i)->note());
row[columns.note] = (*i)->note();
row[columns.velocity] = (*i)->velocity();
- Timecode::BBT_Time bbt;
-
- _session->tempo_map().bbt_time (conv.to ((*i)->time()), bbt);
+ Timecode::BBT_Time bbt (_session->tempo_map().bbt_at_sample (region->position() + conv.to ((*i)->time())));
ss.str ("");
ss << bbt;
row[columns.start] = ss.str();
bbt.bars = 0;
- const Evoral::Beats dur = (*i)->end_time() - (*i)->time();
+ const Temporal::Beats dur = (*i)->end_time() - (*i)->time();
bbt.beats = dur.get_beats ();
bbt.ticks = dur.get_ticks ();
-
+
uint64_t len_ticks = (*i)->length().to_ticks();
std::map<int,string>::iterator x = note_length_map.find (len_ticks);
void
MidiListEditor::selection_changed ()
{
- if (!ARDOUR_UI::config()->get_sound_midi_notes()) {
+ if (!UIConfiguration::instance().get_sound_midi_notes()) {
return;
}
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
if ((iter = model->get_iter (*i))) {
- note = (*iter)[columns._note];
+ note = (*iter)[columns._note];
player->add (note);
}
}
projects / ardour.git / blobdiff