projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak/fix splash screen event-loop
[ardour.git]
/
gtk2_ardour
/
ghostregion.h
diff --git
a/gtk2_ardour/ghostregion.h
b/gtk2_ardour/ghostregion.h
index 000399007b3118df9be0aa5afec5263c27ac0aba..1b2fb700c18e046221df0cfbccda93aa79d9c70c 100644
(file)
--- a/
gtk2_ardour/ghostregion.h
+++ b/
gtk2_ardour/ghostregion.h
@@
-21,6
+21,7
@@
#define __ardour_gtk_ghost_region_h__
#include <vector>
#define __ardour_gtk_ghost_region_h__
#include <vector>
+#include <boost/unordered_map.hpp>
#include "pbd/signals.h"
namespace ArdourCanvas {
#include "pbd/signals.h"
namespace ArdourCanvas {
@@
-33,6
+34,7
@@
class Hit;
class MidiStreamView;
class TimeAxisView;
class RegionView;
class MidiStreamView;
class TimeAxisView;
class RegionView;
+class MidiRegionView;
class GhostRegion : public sigc::trackable
{
class GhostRegion : public sigc::trackable
{
@@
-86,14
+88,15
@@
public:
NoteBase* event;
ArdourCanvas::Item* item;
NoteBase* event;
ArdourCanvas::Item* item;
+ bool is_hit;
};
};
- MidiGhostRegion(RegionView& rv,
+ MidiGhostRegion(
Midi
RegionView& rv,
TimeAxisView& tv,
TimeAxisView& source_tv,
double initial_unit_pos);
TimeAxisView& tv,
TimeAxisView& source_tv,
double initial_unit_pos);
- MidiGhostRegion(RegionView& rv,
+ MidiGhostRegion(
Midi
RegionView& rv,
MidiStreamView& msv,
TimeAxisView& source_tv,
double initial_unit_pos);
MidiStreamView& msv,
TimeAxisView& source_tv,
double initial_unit_pos);
@@
-109,21
+112,24
@@
public:
void update_contents_height();
void add_note(NoteBase*);
void update_contents_height();
void add_note(NoteBase*);
- void update_note (
Note*
);
- void update_hit (
Hit*
);
+ void update_note (
GhostEvent* note
);
+ void update_hit (
GhostEvent* hit
);
void remove_note (NoteBase*);
void remove_note (NoteBase*);
+ void redisplay_model();
void clear_events();
private:
void clear_events();
private:
+ ArdourCanvas::Container* _note_group;
ArdourCanvas::Color _outline;
ArdourCanvas::Rectangle* _tmp_rect;
ArdourCanvas::Polygon* _tmp_poly;
ArdourCanvas::Color _outline;
ArdourCanvas::Rectangle* _tmp_rect;
ArdourCanvas::Polygon* _tmp_poly;
- Midi
GhostRegion::GhostEvent* find_event (NoteBase*)
;
+ Midi
RegionView& parent_mrv
;
typedef Evoral::Note<Evoral::Beats> NoteType;
typedef Evoral::Note<Evoral::Beats> NoteType;
+ MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
- typedef
std::
map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
+ typedef
boost::unordered_
map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
EventList events;
EventList::iterator _optimization_iterator;
};
EventList events;
EventList::iterator _optimization_iterator;
};