mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 23:05:04 +01:00
Somewhat primitive implementation of allowing the edit note dialog to handle multiple notes (#4096).
git-svn-id: svn://localhost/ardour2/branches/3.0@12623 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
0ac73d8513
commit
a766fe1fd9
5 changed files with 124 additions and 38 deletions
|
|
@ -28,21 +28,27 @@
|
||||||
|
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
using namespace Gtk;
|
using namespace Gtk;
|
||||||
using namespace Gtkmm2ext;
|
using namespace Gtkmm2ext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EditNoteDialog constructor.
|
* EditNoteDialog constructor.
|
||||||
*
|
*
|
||||||
* @param n Note to edit.
|
* @param n Notes to edit.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEvent* ev)
|
EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<ArdourCanvas::CanvasNoteEvent*> n)
|
||||||
: ArdourDialog (_("Note"))
|
: ArdourDialog (_("Note"))
|
||||||
, _region_view (rv)
|
, _region_view (rv)
|
||||||
, _event (ev)
|
, _events (n)
|
||||||
|
, _channel_all (_("Set selected notes to this channel"))
|
||||||
|
, _pitch_all (_("Set selected notes to this pitch"))
|
||||||
|
, _velocity_all (_("Set selected notes to this velocity"))
|
||||||
, _time_clock (X_("notetime"), true, "", true, false)
|
, _time_clock (X_("notetime"), true, "", true, false)
|
||||||
|
, _time_all (_("Set selected notes to this time"))
|
||||||
, _length_clock (X_("notelength"), true, "", true, false, true)
|
, _length_clock (X_("notelength"), true, "", true, false, true)
|
||||||
|
, _length_all (_("Set selected notes to this length"))
|
||||||
{
|
{
|
||||||
Table* table = manage (new Table (4, 2));
|
Table* table = manage (new Table (4, 2));
|
||||||
table->set_spacings (6);
|
table->set_spacings (6);
|
||||||
|
|
@ -52,47 +58,88 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
|
||||||
Label* l = manage (left_aligned_label (_("Channel")));
|
Label* l = manage (left_aligned_label (_("Channel")));
|
||||||
table->attach (*l, 0, 1, r, r + 1);
|
table->attach (*l, 0, 1, r, r + 1);
|
||||||
table->attach (_channel, 1, 2, r, r + 1);
|
table->attach (_channel, 1, 2, r, r + 1);
|
||||||
|
table->attach (_channel_all, 2, 3, r, r + 1);
|
||||||
++r;
|
++r;
|
||||||
|
|
||||||
_channel.set_range (1, 16);
|
_channel.set_range (1, 16);
|
||||||
_channel.set_increments (1, 2);
|
_channel.set_increments (1, 2);
|
||||||
_channel.set_value (ev->note()->channel () + 1);
|
_channel.set_value ((*_events.begin())->note()->channel () + 1);
|
||||||
|
|
||||||
l = manage (left_aligned_label (_("Pitch")));
|
l = manage (left_aligned_label (_("Pitch")));
|
||||||
table->attach (*l, 0, 1, r, r + 1);
|
table->attach (*l, 0, 1, r, r + 1);
|
||||||
table->attach (_pitch, 1, 2, r, r + 1);
|
table->attach (_pitch, 1, 2, r, r + 1);
|
||||||
|
table->attach (_pitch_all, 2, 3, r, r + 1);
|
||||||
++r;
|
++r;
|
||||||
|
|
||||||
_pitch.set_range (0, 127);
|
_pitch.set_range (0, 127);
|
||||||
_pitch.set_increments (1, 10);
|
_pitch.set_increments (1, 10);
|
||||||
_pitch.set_value (ev->note()->note ());
|
_pitch.set_value ((*_events.begin())->note()->note());
|
||||||
|
|
||||||
l = manage (left_aligned_label (_("Velocity")));
|
l = manage (left_aligned_label (_("Velocity")));
|
||||||
table->attach (*l, 0, 1, r, r + 1);
|
table->attach (*l, 0, 1, r, r + 1);
|
||||||
table->attach (_velocity, 1, 2, r, r + 1);
|
table->attach (_velocity, 1, 2, r, r + 1);
|
||||||
|
table->attach (_velocity_all, 2, 3, r, r + 1);
|
||||||
++r;
|
++r;
|
||||||
|
|
||||||
_velocity.set_range (0, 127);
|
_velocity.set_range (0, 127);
|
||||||
_velocity.set_increments (1, 10);
|
_velocity.set_increments (1, 10);
|
||||||
_velocity.set_value (ev->note()->velocity ());
|
_velocity.set_value ((*_events.begin())->note()->velocity ());
|
||||||
|
|
||||||
l = manage (left_aligned_label (_("Time")));
|
l = manage (left_aligned_label (_("Time")));
|
||||||
table->attach (*l, 0, 1, r, r + 1);
|
table->attach (*l, 0, 1, r, r + 1);
|
||||||
table->attach (_time_clock, 1, 2, r, r + 1);
|
table->attach (_time_clock, 1, 2, r, r + 1);
|
||||||
|
table->attach (_time_all, 2, 3, r, r + 1);
|
||||||
++r;
|
++r;
|
||||||
|
|
||||||
_time_clock.set_session (_region_view->get_time_axis_view().session ());
|
_time_clock.set_session (_region_view->get_time_axis_view().session ());
|
||||||
_time_clock.set_mode (AudioClock::BBT);
|
_time_clock.set_mode (AudioClock::BBT);
|
||||||
_time_clock.set (_region_view->source_relative_time_converter().to (ev->note()->time ()), true);
|
_time_clock.set (_region_view->source_relative_time_converter().to ((*_events.begin())->note()->time ()), true);
|
||||||
|
|
||||||
l = manage (left_aligned_label (_("Length")));
|
l = manage (left_aligned_label (_("Length")));
|
||||||
table->attach (*l, 0, 1, r, r + 1);
|
table->attach (*l, 0, 1, r, r + 1);
|
||||||
table->attach (_length_clock, 1, 2, r, r + 1);
|
table->attach (_length_clock, 1, 2, r, r + 1);
|
||||||
|
table->attach (_length_all, 2, 3, r, r + 1);
|
||||||
++r;
|
++r;
|
||||||
|
|
||||||
_length_clock.set_session (_region_view->get_time_axis_view().session ());
|
_length_clock.set_session (_region_view->get_time_axis_view().session ());
|
||||||
_length_clock.set_mode (AudioClock::BBT);
|
_length_clock.set_mode (AudioClock::BBT);
|
||||||
_length_clock.set (_region_view->region_relative_time_converter().to (ev->note()->length ()), true);
|
_length_clock.set (_region_view->region_relative_time_converter().to ((*_events.begin())->note()->length ()), true);
|
||||||
|
|
||||||
|
/* Set up `set all notes...' buttons' sensitivity */
|
||||||
|
|
||||||
|
_channel_all.set_sensitive (false);
|
||||||
|
_pitch_all.set_sensitive (false);
|
||||||
|
_velocity_all.set_sensitive (false);
|
||||||
|
_time_all.set_sensitive (false);
|
||||||
|
_length_all.set_sensitive (false);
|
||||||
|
|
||||||
|
int test_channel = (*_events.begin())->note()->channel ();
|
||||||
|
int test_pitch = (*_events.begin())->note()->note ();
|
||||||
|
int test_velocity = (*_events.begin())->note()->velocity ();
|
||||||
|
double test_time = (*_events.begin())->note()->time ();
|
||||||
|
double test_length = (*_events.begin())->note()->length ();
|
||||||
|
|
||||||
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
|
if ((*i)->note()->channel() != test_channel) {
|
||||||
|
_channel_all.set_sensitive (true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((*i)->note()->note() != test_pitch) {
|
||||||
|
_pitch_all.set_sensitive (true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((*i)->note()->velocity() != test_velocity) {
|
||||||
|
_velocity_all.set_sensitive (true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((*i)->note()->time () != test_time) {
|
||||||
|
_time_all.set_sensitive (true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((*i)->note()->length () != test_length) {
|
||||||
|
_length_all.set_sensitive (true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
get_vbox()->pack_start (*table);
|
get_vbox()->pack_start (*table);
|
||||||
|
|
||||||
|
|
@ -122,33 +169,53 @@ EditNoteDialog::run ()
|
||||||
|
|
||||||
bool had_change = false;
|
bool had_change = false;
|
||||||
|
|
||||||
if (_channel.get_value_as_int() - 1 != _event->note()->channel()) {
|
if (!_channel_all.get_sensitive() || _channel_all.get_active ()) {
|
||||||
_region_view->change_note_channel (_event, _channel.get_value_as_int () - 1);
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
had_change = true;
|
if (_channel.get_value_as_int() - 1 != (*i)->note()->channel()) {
|
||||||
|
_region_view->change_note_channel (*i, _channel.get_value_as_int () - 1);
|
||||||
|
had_change = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_pitch.get_value_as_int() != _event->note()->note()) {
|
if (!_pitch_all.get_sensitive() || _pitch_all.get_active ()) {
|
||||||
_region_view->change_note_note (_event, _pitch.get_value_as_int (), false);
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
had_change = true;
|
if (_pitch.get_value_as_int() != (*i)->note()->note()) {
|
||||||
|
_region_view->change_note_note (*i, _pitch.get_value_as_int ());
|
||||||
|
had_change = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_velocity.get_value_as_int() != _event->note()->velocity()) {
|
if (!_velocity_all.get_sensitive() || _velocity_all.get_active ()) {
|
||||||
_region_view->change_note_velocity (_event, _velocity.get_value_as_int (), false);
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
had_change = true;
|
if (_velocity.get_value_as_int() != (*i)->note()->velocity()) {
|
||||||
|
_region_view->change_note_velocity (*i, _velocity.get_value_as_int ());
|
||||||
|
had_change = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
|
double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
|
||||||
|
|
||||||
if (t != _event->note()->time()) {
|
if (!_time_all.get_sensitive() || _time_all.get_active ()) {
|
||||||
_region_view->change_note_time (_event, t);
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
had_change = true;
|
if (t != (*i)->note()->time()) {
|
||||||
|
_region_view->change_note_time (*i, t);
|
||||||
|
had_change = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
|
double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
|
||||||
|
|
||||||
if (d != _event->note()->length()) {
|
if (!_length_all.get_sensitive() || _length_all.get_active ()) {
|
||||||
_region_view->change_note_length (_event, d);
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
had_change = true;
|
if (d != (*i)->note()->length()) {
|
||||||
|
_region_view->change_note_length (*i, d);
|
||||||
|
had_change = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!had_change) {
|
if (!had_change) {
|
||||||
|
|
@ -157,7 +224,9 @@ EditNoteDialog::run ()
|
||||||
|
|
||||||
_region_view->apply_diff ();
|
_region_view->apply_diff ();
|
||||||
|
|
||||||
_event->set_selected (_event->selected()); // change color
|
for (set<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
|
||||||
|
(*i)->set_selected ((*i)->selected()); // change color
|
||||||
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,16 +33,21 @@ namespace Gnome {
|
||||||
class EditNoteDialog : public ArdourDialog
|
class EditNoteDialog : public ArdourDialog
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
EditNoteDialog (MidiRegionView *, Gnome::Canvas::CanvasNoteEvent *);
|
EditNoteDialog (MidiRegionView *, std::set<Gnome::Canvas::CanvasNoteEvent*>);
|
||||||
|
|
||||||
int run ();
|
int run ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MidiRegionView* _region_view;
|
MidiRegionView* _region_view;
|
||||||
Gnome::Canvas::CanvasNoteEvent* _event;
|
std::set<Gnome::Canvas::CanvasNoteEvent*> _events;
|
||||||
Gtk::SpinButton _channel;
|
Gtk::SpinButton _channel;
|
||||||
|
Gtk::CheckButton _channel_all;
|
||||||
Gtk::SpinButton _pitch;
|
Gtk::SpinButton _pitch;
|
||||||
|
Gtk::CheckButton _pitch_all;
|
||||||
Gtk::SpinButton _velocity;
|
Gtk::SpinButton _velocity;
|
||||||
|
Gtk::CheckButton _velocity_all;
|
||||||
AudioClock _time_clock;
|
AudioClock _time_clock;
|
||||||
|
Gtk::CheckButton _time_all;
|
||||||
AudioClock _length_clock;
|
AudioClock _length_clock;
|
||||||
|
Gtk::CheckButton _length_all;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,12 @@
|
||||||
#include "canvas.h"
|
#include "canvas.h"
|
||||||
#include "window_proxy.h"
|
#include "window_proxy.h"
|
||||||
|
|
||||||
namespace Gnome { namespace Canvas {
|
namespace Gnome {
|
||||||
class NoEventText;
|
namespace Canvas {
|
||||||
} }
|
class NoEventText;
|
||||||
|
class CanvasNoteEvent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
namespace Gtkmm2ext {
|
namespace Gtkmm2ext {
|
||||||
class TearOff;
|
class TearOff;
|
||||||
|
|
@ -1489,7 +1492,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
|
||||||
void edit_tempo_marker (ArdourCanvas::Item*);
|
void edit_tempo_marker (ArdourCanvas::Item*);
|
||||||
void edit_meter_marker (ArdourCanvas::Item*);
|
void edit_meter_marker (ArdourCanvas::Item*);
|
||||||
void edit_control_point (ArdourCanvas::Item*);
|
void edit_control_point (ArdourCanvas::Item*);
|
||||||
void edit_note (ArdourCanvas::Item *);
|
void edit_notes (std::set<Gnome::Canvas::CanvasNoteEvent *> const &);
|
||||||
|
|
||||||
void marker_menu_edit ();
|
void marker_menu_edit ();
|
||||||
void marker_menu_remove ();
|
void marker_menu_remove ();
|
||||||
|
|
|
||||||
|
|
@ -1438,8 +1438,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NoteItem:
|
case NoteItem:
|
||||||
edit_note (item);
|
{
|
||||||
|
ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
|
||||||
|
assert (e);
|
||||||
|
edit_notes (e->region_view().selection ());
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -2307,12 +2311,13 @@ Editor::edit_control_point (ArdourCanvas::Item* item)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Editor::edit_note (ArdourCanvas::Item* item)
|
Editor::edit_notes (MidiRegionView::Selection const & s)
|
||||||
{
|
{
|
||||||
ArdourCanvas::CanvasNoteEvent* e = dynamic_cast<ArdourCanvas::CanvasNoteEvent*> (item);
|
if (s.empty ()) {
|
||||||
assert (e);
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
EditNoteDialog d (&e->region_view(), e);
|
EditNoteDialog d (&(*s.begin())->region_view(), s);
|
||||||
d.set_position (Gtk::WIN_POS_MOUSE);
|
d.set_position (Gtk::WIN_POS_MOUSE);
|
||||||
ensure_float (d);
|
ensure_float (d);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -281,6 +281,11 @@ public:
|
||||||
|
|
||||||
void show_list_editor ();
|
void show_list_editor ();
|
||||||
|
|
||||||
|
typedef std::set<ArdourCanvas::CanvasNoteEvent*> Selection;
|
||||||
|
Selection selection () const {
|
||||||
|
return _selection;
|
||||||
|
}
|
||||||
|
|
||||||
void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
|
void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
|
||||||
|
|
||||||
void enable_display (bool);
|
void enable_display (bool);
|
||||||
|
|
@ -409,8 +414,7 @@ private:
|
||||||
MouseState _mouse_state;
|
MouseState _mouse_state;
|
||||||
int _pressed_button;
|
int _pressed_button;
|
||||||
|
|
||||||
typedef std::set<ArdourCanvas::CanvasNoteEvent*> Selection;
|
/** Currently selected CanvasNoteEvents */
|
||||||
/// Currently selected CanvasNoteEvents
|
|
||||||
Selection _selection;
|
Selection _selection;
|
||||||
|
|
||||||
bool _sort_needed;
|
bool _sort_needed;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue