diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/midi_time_axis.cc | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index c8c34e4369..9344e19943 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -93,7 +93,7 @@ using namespace Editing; static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 162; static const uint32_t KEYBOARD_MIN_HEIGHT = 140; -MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, +MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr<Route> rt, Canvas& canvas) : AxisView(sess) // virtually inherited , RouteTimeAxisView(ed, sess, rt, canvas) @@ -718,21 +718,21 @@ MidiTimeAxisView::add_region (nframes64_t pos) nframes64_t start = pos; real_editor->snap_to (start, -1); - const Meter& m = _session.tempo_map().meter_at(start); - const Tempo& t = _session.tempo_map().tempo_at(start); - double length = floor (m.frames_per_bar(t, _session.frame_rate())); + const Meter& m = _session->tempo_map().meter_at(start); + const Tempo& t = _session->tempo_map().tempo_at(start); + double length = floor (m.frames_per_bar(t, _session->frame_rate())); const boost::shared_ptr<MidiDiskstream> diskstream = boost::dynamic_pointer_cast<MidiDiskstream>(view()->trackview().track()->diskstream()); - boost::shared_ptr<Source> src = _session.create_midi_source_for_session (*diskstream.get()); + boost::shared_ptr<Source> src = _session->create_midi_source_for_session (*diskstream.get()); boost::shared_ptr<Region> region = (RegionFactory::create (src, 0, (nframes_t) length, PBD::basename_nosuffix(src->name()))); playlist()->add_region (region, start); XMLNode &after = playlist()->get_state(); - _session.add_command (new MementoCommand<Playlist> (*playlist().get(), &before, &after)); + _session->add_command (new MementoCommand<Playlist> (*playlist().get(), &before, &after)); real_editor->commit_reversible_command(); |