*/
+#include "ardour/parameter_descriptor.h"
+
#include "evoral/Note.hpp"
#include "canvas/container.h"
#include "canvas/polygon.h"
#include "canvas/wave_view.h"
#include "canvas/debug.h"
-#include "ardour_ui.h"
#include "automation_time_axis.h"
#include "ghostregion.h"
#include "midi_streamview.h"
#include "midi_time_axis.h"
+#include "region_view.h"
#include "rgb_macros.h"
#include "note.h"
#include "hit.h"
+#include "ui_config.h"
using namespace std;
using namespace Editing;
using namespace ArdourCanvas;
using namespace ARDOUR;
-PBD::Signal1<void,GhostRegion*> GhostRegion::CatchDeletion;
-
-GhostRegion::GhostRegion (ArdourCanvas::Container* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos)
- : trackview (tv)
- , source_trackview (source_tv)
+GhostRegion::GhostRegion(RegionView& rv,
+ ArdourCanvas::Container* parent,
+ TimeAxisView& tv,
+ TimeAxisView& source_tv,
+ double initial_pos)
+ : parent_rv(rv)
+ , trackview(tv)
+ , source_trackview(source_tv)
{
group = new ArdourCanvas::Container (parent);
CANVAS_DEBUG_NAME (group, "ghost region");
GhostRegion::~GhostRegion ()
{
- CatchDeletion (this);
+ parent_rv.remove_ghost(this);
+ trackview.erase_ghost(this);
delete base_rect;
delete group;
}
GhostRegion::set_colors ()
{
if (is_automation_ghost()) {
- base_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("ghost track base", "ghost track base"));
+ base_rect->set_fill_color (UIConfiguration::instance().color_mod ("ghost track base", "ghost track base"));
}
}
return (dynamic_cast<AutomationTimeAxisView*>(&trackview)) != 0;
}
-AudioGhostRegion::AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos)
- : GhostRegion(tv.ghost_group(), tv, source_tv, initial_unit_pos)
+AudioGhostRegion::AudioGhostRegion(RegionView& rv,
+ TimeAxisView& tv,
+ TimeAxisView& source_tv,
+ double initial_unit_pos)
+ : GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos)
{
}
guint fill_color;
if (is_automation_ghost()) {
- fill_color = ARDOUR_UI::config()->color ("ghost track wave fill");
+ fill_color = UIConfiguration::instance().color ("ghost track wave fill");
}
else {
fill_color = source_track_color(200);
}
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->set_outline_color (ARDOUR_UI::config()->color ("ghost track wave"));
+ waves[n]->set_outline_color (UIConfiguration::instance().color ("ghost track wave"));
waves[n]->set_fill_color (fill_color);
- waves[n]->set_clip_color (ARDOUR_UI::config()->color ("ghost track wave clip"));
- waves[n]->set_zero_color (ARDOUR_UI::config()->color ("ghost track zero line"));
+ waves[n]->set_clip_color (UIConfiguration::instance().color ("ghost track wave clip"));
+ waves[n]->set_zero_color (UIConfiguration::instance().color ("ghost track zero line"));
}
}
/** The general constructor; called when the destination timeaxisview doesn't have
* a midistreamview.
*
+ * @param rv The parent RegionView that is being ghosted.
* @param tv TimeAxisView that this ghost region is on.
* @param source_tv TimeAxisView that we are the ghost for.
*/
-MidiGhostRegion::MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos)
- : GhostRegion(tv.ghost_group(), tv, source_tv, initial_unit_pos)
- , _optimization_iterator (events.end ())
+MidiGhostRegion::MidiGhostRegion(RegionView& rv,
+ TimeAxisView& tv,
+ TimeAxisView& source_tv,
+ double initial_unit_pos)
+ : GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos)
+ , _optimization_iterator(events.end())
{
base_rect->lower_to_bottom();
update_range ();
}
/**
+ * @param rv The parent RegionView being ghosted.
* @param msv MidiStreamView that this ghost region is on.
* @param source_tv TimeAxisView that we are the ghost for.
*/
-MidiGhostRegion::MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos)
- : GhostRegion(msv.midi_underlay_group, msv.trackview(), source_tv, initial_unit_pos)
- , _optimization_iterator (events.end ())
+MidiGhostRegion::MidiGhostRegion(RegionView& rv,
+ MidiStreamView& msv,
+ TimeAxisView& source_tv,
+ double initial_unit_pos)
+ : GhostRegion(rv,
+ msv.midi_underlay_group,
+ msv.trackview(),
+ source_tv,
+ initial_unit_pos)
+ , _optimization_iterator(events.end())
{
base_rect->lower_to_bottom();
update_range ();
GhostRegion::set_colors();
for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
- (*it)->item->set_fill_color (ARDOUR_UI::config()->color_mod((*it)->event->base_color(), "ghost track midi fill"));
- (*it)->item->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
+ _fill = UIConfiguration::instance().color_mod((*it)->event->base_color(), "ghost track midi fill");
+ _outline = UIConfiguration::instance().color ("ghost track midi outline");
+ (*it)->item->set_fill_color (_fill);
+ (*it)->item->set_outline_color (_outline);
}
}
GhostEvent* event = new GhostEvent (n, group);
events.push_back (event);
- event->item->set_fill_color (ARDOUR_UI::config()->color_mod(n->base_color(), "ghost track midi fill"));
- event->item->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
+ event->item->set_fill_color (_fill);
+ event->item->set_outline_color (_outline);
MidiStreamView* mv = midi_view();
ArdourCanvas::Rectangle* rect = NULL;
ArdourCanvas::Polygon* poly = NULL;
if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>(event->item))) {
- rect->set_y0 (y);
- rect->set_y1 (y + h);
+ rect->set (ArdourCanvas::Rect (rect->x0(), y, rect->x1(), y + h));
} else if ((poly = dynamic_cast<ArdourCanvas::Polygon*>(event->item))) {
Duple position = poly->position();
position.y = y;
ArdourCanvas::Polygon* poly = NULL;
if ((note = dynamic_cast<Note*>(parent))) {
if ((rect = dynamic_cast<ArdourCanvas::Rectangle*>(ev->item))) {
- double const x1 = parent->x0 ();
- double const x2 = parent->x1 ();
- rect->set_x0 (x1);
- rect->set_x1 (x2);
+ rect->set (ArdourCanvas::Rect (parent->x0(), rect->y0(), parent->x1(), rect->y1()));
}
} else if ((hit = dynamic_cast<Hit*>(parent))) {
if ((poly = dynamic_cast<ArdourCanvas::Polygon*>(ev->item))) {