ardour/livetrax
13
0
Fork 0
Code

clean up patch change/sysex headers.

Browse Source
This commit is contained in:
nick_m 2017-02-02 04:39:32 +11:00
parent 2eca71e6f1
commit f7b005ebf1
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/midi_region_view.cc
View File

@ -1339,7 +1339,7 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_c
const double x = trackview.editor().sample_to_pixel (region_frames);
const string patch_name = instrument_info().get_patch_name ((*i)->bank(), (*i)->program(), channel);
p->canvas_item()->set_position (ArdourCanvas::Duple (x, 1.0));
p->flag()->set_text (patch_name);
p->set_text (patch_name);
p->show();
}
@ -1419,7 +1419,7 @@ MidiRegionView::display_sysexes()
new SysEx (*this, _note_group, text, height, x, 1.0, sysex_ptr));
_sys_exes.insert (make_pair (sysex_ptr, sysex));
} else {
sysex->flag()->set_height (height);
sysex->set_height (height);
sysex->item().set_position (ArdourCanvas::Duple (x, 1.0));
}
@ -1491,7 +1491,7 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
bool hide_all = false;
PatchChanges::iterator x = _patch_changes.begin();
if (x != _patch_changes.end()) {
hide_all = x->second->flag()->width() >= _pixel_width;
hide_all = x->second->width() >= _pixel_width;
}
if (hide_all) {

4
gtk2_ardour/patch_change.h
View File

@ -56,10 +56,12 @@ public:
void hide ();
void show ();
double width() const { return _flag->width(); }
void set_text (std::string const & s) { _flag->set_text (s); }
ARDOUR::MidiModel::PatchChangePtr patch() const { return _patch; }
ArdourCanvas::Item* canvas_item() const { return _flag; }
ArdourCanvas::Item& item() const { return *_flag; }
ArdourCanvas::Flag* flag() const { return _flag; }
private:
bool event_handler (GdkEvent *);

5
gtk2_ardour/sys_ex.h
View File

@ -43,8 +43,9 @@ public:
void hide ();
void show ();
ArdourCanvas::Item& item() const { return *_flag; }
ArdourCanvas::Flag* flag() const { return _flag; }
void set_height (ArdourCanvas::Distance h) { _flag->set_height (h); }
ArdourCanvas::Item& item() const { return *_flag; }
private:
bool event_handler (GdkEvent* ev);