smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 09:36:33 +01:00
Code Issues Projects Releases Wiki Activity

remove channel selector from canvas note events, as was done in master

Browse source
This commit is contained in:
Paul Davis 2013-05-02 20:28:04 -04:00
parent e2f0c5f91e
commit 2fd62f25b3
2 changed files with 0 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

60
gtk2_ardour/note_base.cc
View file

@ -48,7 +48,6 @@ NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared
: _region(region) : _region(region)
, _item (0) , _item (0)
, _text(0) , _text(0)
// , _channel_selector_widget()
, _state(None) , _state(None)
, _note(note) , _note(note)
, _with_events (with_events) , _with_events (with_events)
@ -64,9 +63,6 @@ NoteBase::~NoteBase()
NoteBaseDeleted (this); NoteBaseDeleted (this);
delete _text; delete _text;
/* XXX */
// delete _channel_selector_widget;
} }
void void
@ -138,59 +134,9 @@ void
NoteBase::on_channel_change(uint8_t channel) NoteBase::on_channel_change(uint8_t channel)
{ {
_region.note_selected(this, true); _region.note_selected(this, true);
hide_channel_selector();
_region.change_channel(channel); _region.change_channel(channel);
} }
void
NoteBase::show_channel_selector ()
{
#if 0
if (_channel_selector_widget == 0) {
if(_region.channel_selector_scoped_note() != 0){
_region.channel_selector_scoped_note()->hide_channel_selector();
_region.set_channel_selector_scoped_note(0);
}
SingleMidiChannelSelector* _channel_selector = new SingleMidiChannelSelector(_note->channel());
_channel_selector->show_all();
_channel_selector->channel_selected.connect(
sigc::mem_fun(this, &NoteBase::on_channel_change));
_channel_selector->clicked.connect (
sigc::mem_fun (this, &NoteBase::hide_channel_selector));
_channel_selector_widget = new Widget(*(_item->property_parent()),
x1(),
y2() + 2,
(Gtk::Widget &) *_channel_selector);
_channel_selector_widget->hide();
_channel_selector_widget->property_height() = 100;
_channel_selector_widget->property_width() = 100;
_channel_selector_widget->raise_to_top();
_channel_selector_widget->show();
_region.set_channel_selector_scoped_note(this);
} else {
hide_channel_selector();
}
#endif
}
void
NoteBase::hide_channel_selector ()
{
#if 0
if (_channel_selector_widget) {
_channel_selector_widget->hide();
delete _channel_selector_widget;
_channel_selector_widget = 0;
}
#endif
}
void void
NoteBase::set_selected(bool selected) NoteBase::set_selected(bool selected)
{ {
@ -203,14 +149,8 @@ NoteBase::set_selected(bool selected)
if (_selected) { if (_selected) {
set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected())); set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
if(_region.channel_selector_scoped_note() != 0){
_region.channel_selector_scoped_note()->hide_channel_selector();
_region.set_channel_selector_scoped_note(0);
}
} else { } else {
set_outline_color(calculate_outline(base_color())); set_outline_color(calculate_outline(base_color()));
hide_channel_selector();
} }
} }

4
gtk2_ardour/note_base.h
View file

@ -91,9 +91,6 @@ public:
/** Channel selection changed */ /** Channel selection changed */
void on_channel_selection_change(uint16_t selection); void on_channel_selection_change(uint16_t selection);
void show_channel_selector();
void hide_channel_selector();
virtual void set_outline_color(uint32_t c) = 0; virtual void set_outline_color(uint32_t c) = 0;
virtual void set_fill_color(uint32_t c) = 0; virtual void set_fill_color(uint32_t c) = 0;
@ -153,7 +150,6 @@ protected:
MidiRegionView& _region; MidiRegionView& _region;
ArdourCanvas::Item* _item; ArdourCanvas::Item* _item;
ArdourCanvas::Text* _text; ArdourCanvas::Text* _text;
// Widget* _channel_selector_widget;
State _state; State _state;
const boost::shared_ptr<NoteType> _note; const boost::shared_ptr<NoteType> _note;
bool _with_events; bool _with_events;