allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

* removed debugging output, minor color fix

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4346 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier
2008-12-24 10:52:26 +00:00
parent 821683acf2
commit acf19ca513
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/canvas-flag.cc
View File

@@ -48,6 +48,5 @@ CanvasFlag::~CanvasFlag()
bool
CanvasFlag::on_event(GdkEvent* ev)
{
cerr << "CanvasFlag::on_event(GdkEvent* ev)" << endl;
return false;
}

5
gtk2_ardour/canvas-note-event.cc
View File

@@ -186,6 +186,7 @@ CanvasNoteEvent::base_color()
ColorMode mode = _region.color_mode();
const uint8_t minimal_opaqueness = 15;
uint8_t opaqueness = std::max(minimal_opaqueness, uint8_t(_note->velocity() + _note->velocity()));
switch (mode) {
case TrackColor:
@@ -195,12 +196,12 @@ CanvasNoteEvent::base_color()
SCALE_USHORT_TO_UINT8_T(color.get_red()),
SCALE_USHORT_TO_UINT8_T(color.get_green()),
SCALE_USHORT_TO_UINT8_T(color.get_blue()),
minimal_opaqueness + _note->velocity());
opaqueness);
}
case ChannelColors:
return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()],
minimal_opaqueness + _note->velocity());
opaqueness);
default:
return meter_style_fill_color(_note->velocity());

4
gtk2_ardour/interactive-item.h
View File

@@ -52,9 +52,7 @@ public:
{}
bool on_event(GdkEvent* ev) {
std::cerr << "InteractiveRect::on_event(GdkEvent* ev)" << std::endl;
if(_parent_item) {
std::cerr << " parent not null" << std::endl;
return _parent_item->on_event(ev);
} else {
return false;
@@ -74,9 +72,7 @@ public:
{}
bool on_event(GdkEvent* ev) {
std::cerr << "InteractiveRect::on_event(GdkEvent* ev)" << std::endl;
if(_parent_item) {
std::cerr << " parent not null" << std::endl;
return _parent_item->on_event(ev);
} else {
return false;