projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if a (file) source really cannot be found, differentiate between audio & MIDI.
[ardour.git]
/
gtk2_ardour
/
ghostregion.cc
diff --git
a/gtk2_ardour/ghostregion.cc
b/gtk2_ardour/ghostregion.cc
index da2beeeca7069f378e4c519afb732d1c84fafaa6..2f9133803c97b1b19fb1f62aaedf3528af993d3e 100644
(file)
--- a/
gtk2_ardour/ghostregion.cc
+++ b/
gtk2_ardour/ghostregion.cc
@@
-18,7
+18,7
@@
*/
#include "evoral/Note.hpp"
*/
#include "evoral/Note.hpp"
-#include "canvas/
group
.h"
+#include "canvas/
container
.h"
#include "canvas/rectangle.h"
#include "canvas/wave_view.h"
#include "canvas/debug.h"
#include "canvas/rectangle.h"
#include "canvas/wave_view.h"
#include "canvas/debug.h"
@@
-38,11
+38,11
@@
using namespace ARDOUR;
PBD::Signal1<void,GhostRegion*> GhostRegion::CatchDeletion;
PBD::Signal1<void,GhostRegion*> GhostRegion::CatchDeletion;
-GhostRegion::GhostRegion (ArdourCanvas::
Group
* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos)
+GhostRegion::GhostRegion (ArdourCanvas::
Container
* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos)
: trackview (tv)
, source_trackview (source_tv)
{
: trackview (tv)
, source_trackview (source_tv)
{
- group = new ArdourCanvas::
Group
(parent);
+ group = new ArdourCanvas::
Container
(parent);
CANVAS_DEBUG_NAME (group, "ghost region");
group->set_position (ArdourCanvas::Duple (initial_pos, 0));
CANVAS_DEBUG_NAME (group, "ghost region");
group->set_position (ArdourCanvas::Duple (initial_pos, 0));
@@
-191,7
+191,7
@@
MidiGhostRegion::~MidiGhostRegion()
clear_events ();
}
clear_events ();
}
-MidiGhostRegion::GhostEvent::GhostEvent (NoteBase* e, ArdourCanvas::
Group
* g)
+MidiGhostRegion::GhostEvent::GhostEvent (NoteBase* e, ArdourCanvas::
Container
* g)
: event (e)
{
rect = new ArdourCanvas::Rectangle (g, ArdourCanvas::Rect (e->x0(), e->y0(), e->x1(), e->y1()));
: event (e)
{
rect = new ArdourCanvas::Rectangle (g, ArdourCanvas::Rect (e->x0(), e->y0(), e->x1(), e->y1()));
@@
-250,7
+250,7
@@
MidiGhostRegion::update_range ()
return;
}
return;
}
- double const h =
trackview.current_height() / double (mv->contents_note_range ()
);
+ double const h =
std::max(1., floor (trackview.current_height() / double (mv->contents_note_range ())) -1
);
for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
uint8_t const note_num = (*it)->event->note()->note();
for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
uint8_t const note_num = (*it)->event->note()->note();
@@
-285,7
+285,7
@@
MidiGhostRegion::add_note (NoteBase* n)
} else {
const double y = mv->note_to_y(note_num);
event->rect->set_y0 (y);
} else {
const double y = mv->note_to_y(note_num);
event->rect->set_y0 (y);
- event->rect->set_y1 (y +
mv->note_height(
));
+ event->rect->set_y1 (y +
std::max(1., floor(mv->note_height()) -1
));
}
}
}
}
}
}