#include "ardour/midi_track.h"
#include "ardour/region_factory.h"
#include "ardour/smf_source.h"
+#include "ardour/session.h"
#include "ardour_ui.h"
#include "canvas-simplerect.h"
, _highest_note(71)
, _data_note_min(60)
, _data_note_max(71)
+ , _note_lines (0)
{
- if (tv.is_track()) {
- stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
- } else {
- stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
- }
-
- use_rec_regions = tv.editor().show_waveforms_recording ();
-
/* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
- midi_underlay_group = new ArdourCanvas::Group (*canvas_group);
+ midi_underlay_group = new ArdourCanvas::Group (*_canvas_group);
midi_underlay_group->lower_to_bottom();
/* put the note lines in the timeaxisview's group, so it
can be put below ghost regions from MIDI underlays*/
- _note_lines = new ArdourCanvas::LineSet(*canvas_group, ArdourCanvas::LineSet::Horizontal);
+ _note_lines = new ArdourCanvas::LineSet(*_canvas_group, ArdourCanvas::LineSet::Horizontal);
_note_lines->property_x1() = 0;
_note_lines->property_y1() = 0;
_note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames);
_note_lines->property_y2() = 0;
- _note_lines->signal_event().connect(bind(
- mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event),
+ _note_lines->signal_event().connect(sigc::bind(
+ sigc::mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event),
_note_lines, &_trackview));
_note_lines->lower_to_bottom();
- ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines));
+ color_handler ();
+
+ ColorsChanged.connect(sigc::mem_fun(*this, &MidiStreamView::color_handler));
note_range_adjustment.set_page_size(_highest_note - _lowest_note);
note_range_adjustment.set_value(_lowest_note);
note_range_adjustment.signal_value_changed().connect(
- mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
+ sigc::mem_fun(*this, &MidiStreamView::note_range_adjustment_changed));
}
MidiStreamView::~MidiStreamView ()
return 0;
}
- RegionView* region_view = new MidiRegionView (canvas_group, _trackview, region,
+ RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color);
-
+
region_view->init (region_color, false);
return region_view;
display_region (region_view, wfd);
/* catch regionview going away */
- region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region));
+ region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context());
RegionViewAdded (region_view);
}
void
-MidiStreamView::display_diskstream (boost::shared_ptr<Diskstream> ds)
+MidiStreamView::display_track (boost::shared_ptr<Track> tr)
{
- StreamView::display_diskstream(ds);
+ StreamView::display_track (tr);
+
draw_note_lines();
+
NoteRangeChanged();
}
}
void
-MidiStreamView::redisplay_diskstream ()
+MidiStreamView::redisplay_track ()
{
if (!_trackview.is_midi_track()) {
return;
_range_dirty = false;
_data_note_min = 127;
_data_note_max = 0;
- _trackview.get_diskstream()->playlist()->foreach_region(
+ _trackview.track()->playlist()->foreach_region(
sigc::mem_fun (*this, &StreamView::update_contents_metrics)
);
}
// Add and display region views, and flag them as valid
- _trackview.get_diskstream()->playlist()->foreach_region(
+ _trackview.track()->playlist()->foreach_region(
sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))
);
{
StreamView::update_contents_height();
_note_lines->property_y2() = height;
- draw_note_lines();
+
+ apply_note_range (lowest_note(), highest_note(), true);
}
void
MidiStreamView::draw_note_lines()
{
+ if (!_note_lines) {
+ return;
+ }
+
double y;
double prev_y = contents_height();
uint32_t color;
_note_lines->clear();
+
+ if(height < 140){
+ return;
+ }
for (int i = lowest_note(); i <= highest_note(); ++i) {
y = floor(note_to_y(i));
{
_highest_note = highest;
_lowest_note = lowest;
+
+ int range = _highest_note - _lowest_note;
+ int pixels_per_note = floor (height/range);
+
+ /* do not grow note height beyond 10 pixels */
+ if (pixels_per_note > 10) {
+
+ int available_note_range = floor ((height)/10);
+ int additional_notes = available_note_range - range;
+
+ /* distribute additional notes to higher and lower ranges, clamp at 0 and 127 */
+ for (int i = 0; i < additional_notes; i++){
+
+ if (i % 2 && _highest_note < 127){
+ _highest_note++;
+ }
+ else if (i % 2) {
+ _lowest_note--;
+ }
+ else if (_lowest_note > 0){
+ _lowest_note--;
+ }
+ else {
+ _highest_note++;
+ }
+ }
+ }
+
note_range_adjustment.set_page_size(_highest_note - _lowest_note);
note_range_adjustment.set_value(_lowest_note);
+
draw_note_lines();
if (to_region_views) {
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- ((MidiRegionView*)(*i))->apply_note_range(lowest, highest);
+ ((MidiRegionView*)(*i))->apply_note_range(_lowest_note, _highest_note);
}
}
{
// cerr << _trackview.name() << " streamview SRB\n";
- if (_trackview.session().transport_rolling()) {
+ if (_trackview.session()->transport_rolling()) {
if (!rec_active &&
- _trackview.session().record_status() == Session::Recording &&
- _trackview.get_diskstream()->record_enabled()) {
+ _trackview.session()->record_status() == Session::Recording &&
+ _trackview.track()->record_enabled()) {
- if (use_rec_regions && rec_regions.size() == rec_rects.size()) {
+ if (Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
- /* add a new region, but don't bother if they set use_rec_regions mid-record */
+ /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
MidiRegion::SourceList sources;
- for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin();
- prc != rec_data_ready_connections.end(); ++prc) {
- (*prc).disconnect();
- }
- rec_data_ready_connections.clear();
+ rec_data_ready_connections.drop_connections ();
- boost::shared_ptr<MidiDiskstream> mds = _trackview.midi_track()->midi_diskstream();
+ sources.push_back (_trackview.midi_track()->write_source());
- sources.push_back(mds->write_source());
-
- rec_data_ready_connections.push_back (mds->write_source()->ViewDataRangeReady.connect (bind (
- mem_fun (*this, &MidiStreamView::rec_data_range_ready),
- boost::weak_ptr<Source>(mds->write_source()))));
+ _trackview.midi_track()->write_source()->ViewDataRangeReady.connect
+ (rec_data_ready_connections,
+ invalidator (*this),
+ ui_bind (&MidiStreamView::rec_data_range_ready, this, _1, _2, boost::weak_ptr<Source>(_trackview.midi_track()->write_source())),
+ gui_context());
// handle multi
nframes_t start = 0;
if (rec_regions.size() > 0) {
start = rec_regions.back().first->start()
- + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
+ + _trackview.track()->get_captured_frames(rec_regions.size()-1);
}
+
+ PropertyList plist;
+
+ plist.add (ARDOUR::Properties::start, start);
+ plist.add (ARDOUR::Properties::length, 1);
+ plist.add (ARDOUR::Properties::name, string());
+ plist.add (ARDOUR::Properties::layer, 0);
boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion>
- (RegionFactory::create (sources, start, 1 , "", 0, Region::DefaultFlags, false)));
+ (RegionFactory::create (sources, plist, false)));
assert(region);
region->block_property_changes ();
- region->set_position (_trackview.session().transport_frame(), this);
+ region->set_position (_trackview.session()->transport_frame(), this);
rec_regions.push_back (make_pair(region, (RegionView*)0));
// rec regions are destroyed in setup_rec_box
/* start a new rec box */
boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
- boost::shared_ptr<MidiDiskstream> ds = mt->midi_diskstream();
- nframes_t frame_pos = ds->current_capture_start ();
+ nframes_t frame_pos = mt->current_capture_start ();
gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
gdouble xend;
uint32_t fill_color;
xend = xstart;
fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
- ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
+ ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
rec_rect->property_x1() = xstart;
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
RecBoxInfo recbox;
recbox.rectangle = rec_rect;
- recbox.start = _trackview.session().transport_frame();
+ recbox.start = _trackview.session()->transport_frame();
recbox.length = 0;
rec_rects.push_back (recbox);
screen_update_connection.disconnect();
screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
- mem_fun (*this, &MidiStreamView::update_rec_box));
+ sigc::mem_fun (*this, &MidiStreamView::update_rec_box));
rec_updating = true;
rec_active = true;
} else if (rec_active &&
- (_trackview.session().record_status() != Session::Recording ||
- !_trackview.get_diskstream()->record_enabled())) {
+ (_trackview.session()->record_status() != Session::Recording ||
+ !_trackview.track()->record_enabled())) {
screen_update_connection.disconnect();
rec_active = false;
rec_updating = false;
/* disconnect rapid update */
screen_update_connection.disconnect();
-
- for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin();
- prc != rec_data_ready_connections.end(); ++prc) {
- (*prc).disconnect();
- }
- rec_data_ready_connections.clear();
+ rec_data_ready_connections.drop_connections ();
rec_updating = false;
rec_active = false;
void
MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t start, nframes_t dur)
{
- ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur));
+ ENSURE_GUI_THREAD (*this, &MidiStreamView::update_rec_regions, data, start, dur)
- if (use_rec_regions) {
+ if (Config->get_show_waveforms_while_recording ()) {
uint32_t n = 0;
bool update_range = false;
if (nlen != region->length()) {
- region->freeze ();
- region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
+ region->suspend_property_changes ();
+ region->set_position (_trackview.track()->get_capture_start_frame(n), this);
region->set_length (start + dur - region->position(), this);
- region->thaw ("updated");
+ region->resume_property_changes ();
if (origlen == 1) {
/* our special initial length */
gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
rect->property_x2() = xend;
- ARDOUR::BeatsFramesConverter tconv(_trackview.session(), region->position());
+ ARDOUR::BeatsFramesConverter tconv(_trackview.session()->tempo_map(), region->position());
const MidiModel::TimeType start_beats = tconv.from(start);
/* draw events */
const boost::shared_ptr<MidiRegionView::NoteType>& note = *i;
+ cerr << "New note arrived, length = " << note->length()
+ << " num " << note->note()
+ << endl;
+
+ if (note->length() == 0) {
+ /* we got NoteOn but not NoteOff (yet)
+ */
+ continue;
+ }
+
nframes_t note_start_frames = tconv.to(note->time());
nframes_t note_end_frames = tconv.to(note->end_time());
- if (note->length() > 0 && note_end_frames + region->position() > start)
+
+ if (note->length() > 0 && note_end_frames + region->position() > start) {
mrv->resolve_note(note->note(), note_end_frames);
+ }
if (note_start_frames + region->position() < start) {
continue;
} else {
- nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n);
+ nframes_t nlen = _trackview.track()->get_captured_frames(n);
if (nlen != region->length()) {
if (region->source_length(0) >= region->position() + nlen) {
- region->freeze ();
- region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
+ region->suspend_property_changes ();
+ region->set_position (_trackview.track()->get_capture_start_frame(n), this);
region->set_length (nlen, this);
- region->thaw ("updated");
+ region->resume_property_changes ();
if (origlen == 1) {
/* our special initial length */
{
// this is called from the butler thread for now
- ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), start, cnt, weak_src));
+ ENSURE_GUI_THREAD (*this, &MidiStreamView::rec_data_range_ready, start, cnt, weak_src)
boost::shared_ptr<SMFSource> src (boost::dynamic_pointer_cast<SMFSource>(weak_src.lock()));
void
MidiStreamView::color_handler ()
{
- //case cMidiTrackBase:
- if (_trackview.is_midi_track()) {
- //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
- }
+ draw_note_lines ();
- //case cMidiBusBase:
- if (!_trackview.is_midi_track()) {
- //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
+ if (_trackview.is_midi_track()) {
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+ } else {
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
}
}
projects / ardour.git / blobdiff