ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

switch from boost::{shared,weak}_ptr to std::{shared,weak}_ptr 

This is mostly a simple lexical search+replace but the absence of operator< for
std::weak_ptr<T> leads to some complications, particularly with Evoral::Sequence
and ExportPortChannel.
This commit is contained in:
Paul Davis 2023-02-16 16:33:28 -07:00
parent 90c5524e7b
commit b35518e212
819 changed files with 9736 additions and 9709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/analysis_window.cc
View File

@ -243,8 +243,8 @@ AnalysisWindow::analyze_data (Gtk::Button * /*button*/)
TimeSelection ts = s.time;
for (TrackSelection::iterator i = s.tracks.begin(); i != s.tracks.end(); ++i) {
boost::shared_ptr<AudioPlaylist> pl
= boost::dynamic_pointer_cast<AudioPlaylist>((*i)->playlist());
std::shared_ptr<AudioPlaylist> pl
= std::dynamic_pointer_cast<AudioPlaylist>((*i)->playlist());
if (!pl)
continue;

22
gtk2_ardour/ardour_ui.cc
View File

@ -1476,10 +1476,10 @@ ARDOUR_UI::update_timecode_format ()
if (_session) {
bool matching;
boost::shared_ptr<TimecodeTransportMaster> tcmaster;
boost::shared_ptr<TransportMaster> tm = TransportMasterManager::instance().current();
std::shared_ptr<TimecodeTransportMaster> tcmaster;
std::shared_ptr<TransportMaster> tm = TransportMasterManager::instance().current();
if ((tm->type() == LTC || tm->type() == MTC) && (tcmaster = boost::dynamic_pointer_cast<TimecodeTransportMaster>(tm)) != 0 && tm->locked()) {
if ((tm->type() == LTC || tm->type() == MTC) && (tcmaster = std::dynamic_pointer_cast<TimecodeTransportMaster>(tm)) != 0 && tm->locked()) {
matching = (tcmaster->apparent_timecode_format() == _session->config.get_timecode_format());
} else {
matching = true;
@ -1542,7 +1542,7 @@ ARDOUR_UI::session_add_midi_route (
ChanCount one_midi_channel;
one_midi_channel.set (DataType::MIDI, 1);
list<boost::shared_ptr<MidiTrack> > tracks;
list<std::shared_ptr<MidiTrack> > tracks;
tracks = _session->new_midi_track (one_midi_channel, one_midi_channel, strict_io, instrument, pset, route_group, how_many, name_template, order, ARDOUR::Normal, true, trigger_visibility);
if (tracks.size() != how_many) {
@ -1579,7 +1579,7 @@ ARDOUR_UI::session_add_audio_route (
ARDOUR::PresentationInfo::order_t order,
bool trigger_visibility)
{
list<boost::shared_ptr<AudioTrack> > tracks;
list<std::shared_ptr<AudioTrack> > tracks;
RouteList routes;
assert (_session);
@ -1610,7 +1610,7 @@ ARDOUR_UI::session_add_audio_route (
}
if (strict_io) {
for (list<boost::shared_ptr<AudioTrack> >::iterator i = tracks.begin(); i != tracks.end(); ++i) {
for (list<std::shared_ptr<AudioTrack> >::iterator i = tracks.begin(); i != tracks.end(); ++i) {
(*i)->set_strict_io (true);
}
for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
@ -1761,11 +1761,11 @@ ARDOUR_UI::trx_record_enable_all_tracks ()
return false;
}
boost::shared_ptr<RouteList> rl = _session->get_tracks ();
std::shared_ptr<RouteList> rl = _session->get_tracks ();
bool none_record_enabled = true;
for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*r);
std::shared_ptr<Track> t = std::dynamic_pointer_cast<Track> (*r);
assert (t);
if (t->rec_enable_control()->get_value()) {
@ -2130,13 +2130,13 @@ ARDOUR_UI::toggle_record_enable (uint16_t rid)
return;
}
boost::shared_ptr<Route> r;
std::shared_ptr<Route> r;
if ((r = _session->get_remote_nth_route (rid)) != 0) {
boost::shared_ptr<Track> t;
std::shared_ptr<Track> t;
if ((t = boost::dynamic_pointer_cast<Track>(r)) != 0) {
if ((t = std::dynamic_pointer_cast<Track>(r)) != 0) {
t->rec_enable_control()->set_value (!t->rec_enable_control()->get_value(), Controllable::UseGroup);
}
}

12
gtk2_ardour/ardour_ui3.cc
View File

@ -121,11 +121,11 @@ ARDOUR_UI::reset_focus (Gtk::Widget* w)
void
ARDOUR_UI::monitor_dim_all ()
{
boost::shared_ptr<Route> mon = _session->monitor_out ();
std::shared_ptr<Route> mon = _session->monitor_out ();
if (!mon) {
return;
}
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
std::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-dim-all");
_monitor->set_dim_all (tact->get_active());
@ -134,11 +134,11 @@ ARDOUR_UI::monitor_dim_all ()
void
ARDOUR_UI::monitor_cut_all ()
{
boost::shared_ptr<Route> mon = _session->monitor_out ();
std::shared_ptr<Route> mon = _session->monitor_out ();
if (!mon) {
return;
}
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
std::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-cut-all");
_monitor->set_cut_all (tact->get_active());
@ -147,11 +147,11 @@ ARDOUR_UI::monitor_cut_all ()
void
ARDOUR_UI::monitor_mono ()
{
boost::shared_ptr<Route> mon = _session->monitor_out ();
std::shared_ptr<Route> mon = _session->monitor_out ();
if (!mon) {
return;
}
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
std::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
_monitor->set_mono (tact->get_active());

4
gtk2_ardour/au_pluginui.h
View File

@ -79,7 +79,7 @@ class AUPluginUI;
class AUPluginUI : public PlugUIBase, public Gtk::VBox
{
public:
AUPluginUI (boost::shared_ptr<ARDOUR::PlugInsertBase>);
AUPluginUI (std::shared_ptr<ARDOUR::PlugInsertBase>);
~AUPluginUI ();
gint get_preferred_width () { return req_width; }
@ -115,7 +115,7 @@ public:
private:
WindowRef wr;
boost::shared_ptr<ARDOUR::AUPlugin> au;
std::shared_ptr<ARDOUR::AUPlugin> au;
int prefheight;
int prefwidth;

14
gtk2_ardour/audio_clip_editor.cc
View File

@ -92,7 +92,7 @@ AudioClipEditor::ClipBBTMetric::get_marks (std::vector<ArdourCanvas::Ruler::Mark
return;
}
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (!at) {
return;
}
@ -402,7 +402,7 @@ AudioClipEditor::drop_waves ()
}
void
AudioClipEditor::set_region (boost::shared_ptr<AudioRegion> r, TriggerReference tr)
AudioClipEditor::set_region (std::shared_ptr<AudioRegion> r, TriggerReference tr)
{
drop_waves ();
@ -425,12 +425,12 @@ AudioClipEditor::set_region (boost::shared_ptr<AudioRegion> r, TriggerReference
len = r->source (0)->length ().samples ();
for (uint32_t n = 0; n < n_chans; ++n) {
boost::shared_ptr<Region> wr = RegionFactory::get_whole_region_for_source (r->source (n));
std::shared_ptr<Region> wr = RegionFactory::get_whole_region_for_source (r->source (n));
if (!wr) {
continue;
}
boost::shared_ptr<AudioRegion> war = boost::dynamic_pointer_cast<AudioRegion> (wr);
std::shared_ptr<AudioRegion> war = std::dynamic_pointer_cast<AudioRegion> (wr);
if (!war) {
continue;
}
@ -445,7 +445,7 @@ AudioClipEditor::set_region (boost::shared_ptr<AudioRegion> r, TriggerReference
}
TriggerPtr trigger (tr.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (at) {
if (at->segment_tempo() == 0.) {
/* tempo unknown, hide ruler */
@ -607,9 +607,9 @@ AudioClipEditorBox::zoom_out_click ()
}
void
AudioClipEditorBox::set_region (boost::shared_ptr<Region> r, TriggerReference tref)
AudioClipEditorBox::set_region (std::shared_ptr<Region> r, TriggerReference tref)
{
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (r);
if (!ar) {
return;

10
gtk2_ardour/audio_clip_editor.h
View File

@ -70,7 +70,7 @@ public:
ClipEditorBox () {}
~ClipEditorBox () {}
virtual void set_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::TriggerReference) = 0;
virtual void set_region (std::shared_ptr<ARDOUR::Region>, ARDOUR::TriggerReference) = 0;
static void init ();
static void register_clip_editor_actions (Gtkmm2ext::Bindings*);
@ -92,7 +92,7 @@ public:
AudioClipEditor ();
~AudioClipEditor ();
void set_region (boost::shared_ptr<ARDOUR::AudioRegion>, ARDOUR::TriggerReference);
void set_region (std::shared_ptr<ARDOUR::AudioRegion>, ARDOUR::TriggerReference);
void on_size_allocate (Gtk::Allocation&);
double sample_to_pixel (ARDOUR::samplepos_t);
@ -138,7 +138,7 @@ private:
samplepos_t left_origin;
double _spp;
double scroll_fraction;
boost::shared_ptr<ARDOUR::AudioRegion> audio_region;
std::shared_ptr<ARDOUR::AudioRegion> audio_region;
void scroll_left ();
void scrol_right ();
@ -201,7 +201,7 @@ public:
AudioClipEditorBox ();
~AudioClipEditorBox ();
void set_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::TriggerReference);
void set_region (std::shared_ptr<ARDOUR::Region>, ARDOUR::TriggerReference);
void region_changed (const PBD::PropertyChange& what_changed);
private:
@ -215,7 +215,7 @@ private:
PBD::ScopedConnection state_connection;
boost::shared_ptr<ARDOUR::Region> _region;
std::shared_ptr<ARDOUR::Region> _region;
void zoom_in_click ();
void zoom_out_click ();

6
gtk2_ardour/audio_clock.cc
View File

@ -1014,7 +1014,7 @@ AudioClock::set_slave_info ()
return;
}
boost::shared_ptr<TransportMaster> tm = TransportMasterManager::instance().current();
std::shared_ptr<TransportMaster> tm = TransportMasterManager::instance().current();
if (_session->transport_master_is_external()) {
@ -1035,8 +1035,8 @@ AudioClock::set_slave_info ()
case LTC:
case MTC:
if (tm) {
boost::shared_ptr<TimecodeTransportMaster> tcmaster;
if ((tcmaster = boost::dynamic_pointer_cast<TimecodeTransportMaster>(tm)) != 0) {
std::shared_ptr<TimecodeTransportMaster> tcmaster;
if ((tcmaster = std::dynamic_pointer_cast<TimecodeTransportMaster>(tm)) != 0) {
//TODO: _left_btn.set_name () // tcmaster->apparent_timecode_format() != _session->config.get_timecode_format();
_left_btn.set_text (string_compose ("%1%2", tm->display_name()[0], tcmaster->position_string ()), false);
_right_btn.set_text (tm->delta_string (), false);

2
gtk2_ardour/audio_region_editor.cc
View File

@ -52,7 +52,7 @@ _peak_amplitude_thread (void* arg)
return 0;
}
AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion> r)
AudioRegionEditor::AudioRegionEditor (Session* s, std::shared_ptr<AudioRegion> r)
: RegionEditor (s, r)
, _audio_region (r)
, gain_adjustment(accurate_coefficient_to_dB(fabsf (_audio_region->scale_amplitude())), -40.0, +40.0, 0.1, 1.0, 0)

4
gtk2_ardour/audio_region_editor.h
View File

@ -55,7 +55,7 @@ class AudioRegionView;
class AudioRegionEditor : public RegionEditor
{
public:
AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::AudioRegion>);
AudioRegionEditor (ARDOUR::Session*, std::shared_ptr<ARDOUR::AudioRegion>);
~AudioRegionEditor ();
void peak_amplitude_thread ();
@ -67,7 +67,7 @@ private:
void gain_changed ();
void gain_adjustment_changed ();
boost::shared_ptr<ARDOUR::AudioRegion> _audio_region;
std::shared_ptr<ARDOUR::AudioRegion> _audio_region;
Gtk::Label gain_label;
Gtk::Adjustment gain_adjustment;

4
gtk2_ardour/audio_region_properties_box.cc
View File

@ -117,7 +117,7 @@ RegionPropertiesBox::set_session (Session* s)
}
void
RegionPropertiesBox::set_region (boost::shared_ptr<Region> r)
RegionPropertiesBox::set_region (std::shared_ptr<Region> r)
{
set_session (&r->session ());
@ -191,7 +191,7 @@ AudioRegionPropertiesBox::~AudioRegionPropertiesBox ()
}
void
AudioRegionPropertiesBox::set_region (boost::shared_ptr<Region> r)
AudioRegionPropertiesBox::set_region (std::shared_ptr<Region> r)
{
RegionPropertiesBox::set_region (r);
}

6
gtk2_ardour/audio_region_properties_box.h
View File

@ -47,12 +47,12 @@ public:
RegionPropertiesBox ();
~RegionPropertiesBox ();
virtual void set_region (boost::shared_ptr<ARDOUR::Region>);
virtual void set_region (std::shared_ptr<ARDOUR::Region>);
void set_session (ARDOUR::Session* s);
protected:
boost::shared_ptr<ARDOUR::Region> _region;
std::shared_ptr<ARDOUR::Region> _region;
Gtk::Label _header_label;
@ -78,7 +78,7 @@ public:
AudioRegionPropertiesBox ();
~AudioRegionPropertiesBox ();
virtual void set_region (boost::shared_ptr<ARDOUR::Region>);
virtual void set_region (std::shared_ptr<ARDOUR::Region>);
private:
ArdourWidgets::ArdourButton fade_in_enable_button;

42
gtk2_ardour/audio_region_view.cc
View File

@ -111,7 +111,7 @@ static Cairo::RefPtr<Cairo::Pattern> create_pending_peak_pattern() {
return p;
}
AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, std::shared_ptr<AudioRegion> r, double spu,
uint32_t basic_color)
: RegionView (parent, tv, r, spu, basic_color)
, fade_in_handle(0)
@ -131,7 +131,7 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis
{
}
AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, std::shared_ptr<AudioRegion> r, double spu,
uint32_t basic_color, bool recording, TimeAxisViewItem::Visibility visibility)
: RegionView (parent, tv, r, spu, basic_color, recording, visibility)
, fade_in_handle(0)
@ -151,8 +151,8 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxis
{
}
AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_ptr<AudioRegion> other_region)
: RegionView (other, boost::shared_ptr<Region> (other_region))
AudioRegionView::AudioRegionView (const AudioRegionView& other, std::shared_ptr<AudioRegion> other_region)
: RegionView (other, std::shared_ptr<Region> (other_region))
, fade_in_handle(0)
, fade_out_handle(0)
, fade_in_trim_handle(0)
@ -297,11 +297,11 @@ AudioRegionView::~AudioRegionView ()
/* all waveviews etc will be destroyed when the group is destroyed */
}
boost::shared_ptr<ARDOUR::AudioRegion>
std::shared_ptr<ARDOUR::AudioRegion>
AudioRegionView::audio_region() const
{
// "Guaranteed" to succeed...
return boost::dynamic_pointer_cast<AudioRegion>(_region);
return std::dynamic_pointer_cast<AudioRegion>(_region);
}
void
@ -415,7 +415,7 @@ AudioRegionView::region_renamed ()
str = string ("*") + str;
}
boost::shared_ptr<AudioRegion> ar (audio_region());
std::shared_ptr<AudioRegion> ar (audio_region());
const gain_t scale_amplitude = ar->scale_amplitude();
if (scale_amplitude != 1.0) {
char tmp[32];
@ -651,7 +651,7 @@ AudioRegionView::reset_fade_in_shape ()
}
void
AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
AudioRegionView::reset_fade_in_shape_width (std::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
{
trim_fade_in_drag_active = drag_active;
if (fade_in_handle == 0) {
@ -702,7 +702,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, s
Points points;
Points::size_type pi;
boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_in());
std::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_in());
Evoral::ControlList::const_iterator x;
samplecnt_t length = list->length().samples();
@ -731,7 +731,7 @@ AudioRegionView::reset_fade_out_shape ()
}
void
AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
AudioRegionView::reset_fade_out_shape_width (std::shared_ptr<AudioRegion> ar, samplecnt_t width, bool drag_active)
{
trim_fade_out_drag_active = drag_active;
if (fade_out_handle == 0) {
@ -789,7 +789,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar,
Points points;
Points::size_type pi;
boost::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_out());
std::shared_ptr<const Evoral::ControlList> list (audio_region()->fade_out());
Evoral::ControlList::const_iterator x;
double length = list->length().samples();
@ -827,7 +827,7 @@ AudioRegionView::get_fade_out_shape_width ()
void
AudioRegionView::redraw_start_xfade ()
{
boost::shared_ptr<AudioRegion> ar (audio_region());
std::shared_ptr<AudioRegion> ar (audio_region());
if (!ar->fade_in() || ar->fade_in()->empty()) {
return;
@ -838,7 +838,7 @@ AudioRegionView::redraw_start_xfade ()
}
void
AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, samplecnt_t /*width*/, Points& points, double effective_height,
AudioRegionView::redraw_start_xfade_to (std::shared_ptr<AudioRegion> ar, samplecnt_t /*width*/, Points& points, double effective_height,
double rect_width)
{
if (points.size() < 2) {
@ -866,7 +866,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, sampl
/* fade out line */
boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_in ();
std::shared_ptr<AutomationList> inverse = ar->inverse_fade_in ();
Points ipoints;
Points::size_type npoints;
@ -916,7 +916,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, sampl
void
AudioRegionView::redraw_end_xfade ()
{
boost::shared_ptr<AudioRegion> ar (audio_region());
std::shared_ptr<AudioRegion> ar (audio_region());
if (!ar->fade_out() || ar->fade_out()->empty()) {
return;
@ -928,7 +928,7 @@ AudioRegionView::redraw_end_xfade ()
}
void
AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, samplecnt_t width, Points& points, double effective_height,
AudioRegionView::redraw_end_xfade_to (std::shared_ptr<AudioRegion> ar, samplecnt_t width, Points& points, double effective_height,
double rect_edge, double rect_width)
{
if (points.size() < 2) {
@ -957,7 +957,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, samplec
/* fade in line */
boost::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
std::shared_ptr<AutomationList> inverse = ar->inverse_fade_out ();
Points ipoints;
Points::size_type npoints;
@ -1520,7 +1520,7 @@ AudioRegionView::entered ()
fade_out_handle->raise_to_top ();
}
if (fade_in_trim_handle) {
boost::shared_ptr<AudioRegion> ar (audio_region());
std::shared_ptr<AudioRegion> ar (audio_region());
if (!ar->locked() && (ar->fade_in()->back()->when > 64 || (ar->can_trim() & Trimmable::FrontTrimEarlier))) {
fade_in_trim_handle->show ();
fade_in_trim_handle->raise_to_top ();
@ -1529,7 +1529,7 @@ AudioRegionView::entered ()
}
}
if (fade_out_trim_handle) {
boost::shared_ptr<AudioRegion> ar (audio_region());
std::shared_ptr<AudioRegion> ar (audio_region());
if (!ar->locked() && (ar->fade_out()->back()->when > 64 || (ar->can_trim() & Trimmable::EndTrimLater))) {
fade_out_trim_handle->show ();
fade_out_trim_handle->raise_to_top ();
@ -1550,8 +1550,8 @@ AudioRegionView::entered ()
void
AudioRegionView::exited ()
{
trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>());
trackview.editor().set_current_movable (boost::shared_ptr<Movable>());
trackview.editor().set_current_trimmable (std::shared_ptr<Trimmable>());
trackview.editor().set_current_movable (std::shared_ptr<Movable>());
// if (gain_line) {
// gain_line->remove_visibility (AutomationLine::ControlPoints);

20
gtk2_ardour/audio_region_view.h
View File

@ -59,25 +59,25 @@ class AudioRegionView : public RegionView
public:
AudioRegionView (ArdourCanvas::Container *,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::AudioRegion>,
std::shared_ptr<ARDOUR::AudioRegion>,
double initial_samples_per_pixel,
uint32_t base_color);
AudioRegionView (ArdourCanvas::Container *,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::AudioRegion>,
std::shared_ptr<ARDOUR::AudioRegion>,
double samples_per_pixel,
uint32_t base_color,
bool recording,
TimeAxisViewItem::Visibility);
AudioRegionView (const AudioRegionView& other, boost::shared_ptr<ARDOUR::AudioRegion>);
AudioRegionView (const AudioRegionView& other, std::shared_ptr<ARDOUR::AudioRegion>);
~AudioRegionView ();
void init (bool wait_for_data);
boost::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
std::shared_ptr<ARDOUR::AudioRegion> audio_region() const;
void create_waves ();
void delete_waves ();
@ -95,15 +95,15 @@ public:
void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event, bool with_guard_points);
void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
boost::shared_ptr<AudioRegionGainLine> get_gain_line() const { return gain_line; }
std::shared_ptr<AudioRegionGainLine> get_gain_line() const { return gain_line; }
void region_changed (const PBD::PropertyChange&);
void envelope_active_changed ();
GhostRegion* add_ghost (TimeAxisView&);
void reset_fade_in_shape_width (boost::shared_ptr<ARDOUR::AudioRegion> ar, samplecnt_t, bool drag_active = false);
void reset_fade_out_shape_width (boost::shared_ptr<ARDOUR::AudioRegion> ar, samplecnt_t, bool drag_active = false);
void reset_fade_in_shape_width (std::shared_ptr<ARDOUR::AudioRegion> ar, samplecnt_t, bool drag_active = false);
void reset_fade_out_shape_width (std::shared_ptr<ARDOUR::AudioRegion> ar, samplecnt_t, bool drag_active = false);
samplepos_t get_fade_in_shape_width ();
samplepos_t get_fade_out_shape_width ();
@ -127,8 +127,8 @@ public:
void drag_start ();
void drag_end ();
void redraw_start_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, samplecnt_t, ArdourCanvas::Points&, double, double);
void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, samplecnt_t, ArdourCanvas::Points&, double, double, double);
void redraw_start_xfade_to (std::shared_ptr<ARDOUR::AudioRegion>, samplecnt_t, ArdourCanvas::Points&, double, double);
void redraw_end_xfade_to (std::shared_ptr<ARDOUR::AudioRegion>, samplecnt_t, ArdourCanvas::Points&, double, double, double);
void redraw_start_xfade ();
void redraw_end_xfade ();
@ -181,7 +181,7 @@ protected:
ArdourCanvas::Rectangle* end_xfade_rect;
bool _end_xfade_visible;
boost::shared_ptr<AudioRegionGainLine> gain_line;
std::shared_ptr<AudioRegionGainLine> gain_line;
double _amplitude_above_axis;

36
gtk2_ardour/audio_streamview.cc
View File

@ -91,10 +91,10 @@ AudioStreamView::set_amplitude_above_axis (gdouble app)
}
RegionView*
AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_waves, bool recording)
AudioStreamView::create_region_view (std::shared_ptr<Region> r, bool wait_for_waves, bool recording)
{
AudioRegionView *region_view = 0;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (r);
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (r);
if (region == 0) {
return 0;
@ -139,7 +139,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
}
RegionView*
AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool recording)
AudioStreamView::add_region_view_internal (std::shared_ptr<Region> r, bool wait_for_waves, bool recording)
{
RegionView *region_view = create_region_view (r, wait_for_waves, recording);
@ -151,7 +151,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
/* catch region going away */
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, std::weak_ptr<Region> (r)), gui_context());
RegionViewAdded (region_view);
@ -221,15 +221,15 @@ AudioStreamView::setup_rec_box ()
SourceList sources;
rec_data_ready_connections.drop_connections ();
boost::shared_ptr<AudioTrack> tr = _trackview.audio_track();
std::shared_ptr<AudioTrack> tr = _trackview.audio_track();
for (uint32_t n = 0; n < tr->n_channels().n_audio(); ++n) {
boost::shared_ptr<AudioFileSource> src = tr->write_source (n);
std::shared_ptr<AudioFileSource> src = tr->write_source (n);
if (src) {
sources.push_back (src);
src->PeakRangeReady.connect (rec_data_ready_connections,
invalidator (*this),
boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, std::weak_ptr<Source>(src)),
gui_context());
}
}
@ -249,8 +249,8 @@ AudioStreamView::setup_rec_box ()
plist.add (Properties::name, string());
plist.add (Properties::layer, 0);
boost::shared_ptr<AudioRegion> region (
boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
std::shared_ptr<AudioRegion> region (
std::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
assert(region);
region->set_position (timepos_t (_trackview.session()->transport_sample()));
@ -259,7 +259,7 @@ AudioStreamView::setup_rec_box ()
/* start a new rec box */
boost::shared_ptr<AudioTrack> at = _trackview.audio_track();
std::shared_ptr<AudioTrack> at = _trackview.audio_track();
samplepos_t const sample_pos = at->current_capture_start ();
create_rec_box(sample_pos, 0);
@ -286,8 +286,8 @@ AudioStreamView::setup_rec_box ()
/* remove temp regions */
for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) {
list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp;
for (list<pair<std::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) {
list<pair<std::shared_ptr<Region>,RegionView*> >::iterator tmp;
tmp = iter;
++tmp;
@ -314,11 +314,11 @@ AudioStreamView::setup_rec_box ()
}
void
AudioStreamView::rec_peak_range_ready (samplepos_t start, samplecnt_t cnt, boost::weak_ptr<Source> weak_src)
AudioStreamView::rec_peak_range_ready (samplepos_t start, samplecnt_t cnt, std::weak_ptr<Source> weak_src)
{
ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src)
boost::shared_ptr<Source> src (weak_src.lock());
std::shared_ptr<Source> src (weak_src.lock());
if (!src) {
return;
@ -347,9 +347,9 @@ AudioStreamView::update_rec_regions (samplepos_t start, samplecnt_t cnt)
uint32_t n = 0;
for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
for (list<pair<std::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
list<pair<std::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
++tmp;
assert (n < rec_rects.size());
@ -360,7 +360,7 @@ AudioStreamView::update_rec_regions (samplepos_t start, samplecnt_t cnt)
continue;
}
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion>(iter->first);
if (!region) {
iter = tmp;
@ -455,7 +455,7 @@ AudioStreamView::hide_all_fades ()
* second is the AudioRegionViews that end xfades were hidden for.
*/
pair<list<AudioRegionView*>, list<AudioRegionView*> >
AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
AudioStreamView::hide_xfades_with (std::shared_ptr<AudioRegion> ar)
{
list<AudioRegionView*> start_hidden;
list<AudioRegionView*> end_hidden;

12
gtk2_ardour/audio_streamview.h
View File

@ -62,9 +62,9 @@ public:
void show_all_fades ();
void hide_all_fades ();
std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > hide_xfades_with (boost::shared_ptr<ARDOUR::AudioRegion> ar);
std::pair<std::list<AudioRegionView*>, std::list<AudioRegionView*> > hide_xfades_with (std::shared_ptr<ARDOUR::AudioRegion> ar);
RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
RegionView* create_region_view (std::shared_ptr<ARDOUR::Region>, bool, bool);
void set_selected_points (PointSelection&);
void reload_waves ();
@ -75,11 +75,11 @@ public:
private:
void setup_rec_box ();
void rec_peak_range_ready (samplepos_t start, ARDOUR::samplecnt_t cnt, boost::weak_ptr<ARDOUR::Source> src);
void rec_peak_range_ready (samplepos_t start, ARDOUR::samplecnt_t cnt, std::weak_ptr<ARDOUR::Source> src);
void update_rec_regions (ARDOUR::samplepos_t, ARDOUR::samplecnt_t);
RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> );
RegionView* add_region_view_internal (std::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false);
void remove_audio_region_view (std::shared_ptr<ARDOUR::AudioRegion> );
void redisplay_track ();
@ -87,7 +87,7 @@ private:
double _amplitude_above_axis;
std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
std::map<std::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
ArdourCanvas::Container* _region_group;

2
gtk2_ardour/audio_time_axis.cc
View File

@ -79,7 +79,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
}
void
AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
AudioTimeAxisView::set_route (std::shared_ptr<Route> rt)
{
_route = rt;

2
gtk2_ardour/audio_time_axis.h
View File

@ -70,7 +70,7 @@ public:
AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
virtual ~AudioTimeAxisView ();
void set_route (boost::shared_ptr<ARDOUR::Route>);
void set_route (std::shared_ptr<ARDOUR::Route>);
AudioStreamView* audio_view();

10
gtk2_ardour/audio_trigger_properties_box.cc
View File

@ -166,7 +166,7 @@ void
AudioTriggerPropertiesBox::MultiplyTempo(float mult)
{
TriggerPtr trigger (tref.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (at) {
at->set_segment_tempo (at->segment_tempo () * mult);
}
@ -176,7 +176,7 @@ void
AudioTriggerPropertiesBox::toggle_stretch ()
{
TriggerPtr trigger (tref.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (at) {
at->set_stretchable (!at->stretchable ());
}
@ -186,7 +186,7 @@ void
AudioTriggerPropertiesBox::set_stretch_mode (Trigger::StretchMode sm)
{
TriggerPtr trigger (tref.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (at) {
at->set_stretch_mode (sm);
}
@ -205,7 +205,7 @@ void
AudioTriggerPropertiesBox::on_trigger_changed (const PBD::PropertyChange& pc)
{
TriggerPtr trigger (tref.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (!at) {
return;
}
@ -290,7 +290,7 @@ AudioTriggerPropertiesBox::beats_changed ()
}
TriggerPtr trigger (tref.trigger());
boost::shared_ptr<AudioTrigger> at = boost::dynamic_pointer_cast<AudioTrigger> (trigger);
std::shared_ptr<AudioTrigger> at = std::dynamic_pointer_cast<AudioTrigger> (trigger);
if (at) {
at->set_segment_beatcnt (_beat_adjustment.get_value());
}

10
gtk2_ardour/automation_controller.cc
View File

@ -51,7 +51,7 @@ using namespace ArdourWidgets;
using PBD::Controllable;
AutomationBarController::AutomationBarController (
boost::shared_ptr<AutomationControl> ac,
std::shared_ptr<AutomationControl> ac,
Adjustment* adj)
: ArdourWidgets::BarController (*adj, ac)
, _controllable (ac)
@ -69,7 +69,7 @@ AutomationBarController::~AutomationBarController()
{
}
AutomationController::AutomationController(boost::shared_ptr<AutomationControl> ac,
AutomationController::AutomationController(std::shared_ptr<AutomationControl> ac,
Adjustment* adj,
bool use_knob)
: _widget(NULL)
@ -140,10 +140,10 @@ AutomationController::~AutomationController()
{
}
boost::shared_ptr<AutomationController>
std::shared_ptr<AutomationController>
AutomationController::create(const Evoral::Parameter& param,
const ParameterDescriptor& desc,
boost::shared_ptr<AutomationControl> ac,
std::shared_ptr<AutomationControl> ac,
bool use_knob)
{
const double lo = ac->internal_to_interface(desc.lower, true);
@ -160,7 +160,7 @@ AutomationController::create(const Evoral::Parameter& param,
assert (ac);
assert(ac->parameter() == param);
return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment, use_knob));
return std::shared_ptr<AutomationController>(new AutomationController(ac, adjustment, use_knob));
}
void

14
gtk2_ardour/automation_controller.h
View File

@ -51,26 +51,26 @@ namespace Gtk {
class AutomationBarController : public ArdourWidgets::BarController {
public:
AutomationBarController(boost::shared_ptr<ARDOUR::AutomationControl> ac,
AutomationBarController(std::shared_ptr<ARDOUR::AutomationControl> ac,
Gtk::Adjustment* adj);
~AutomationBarController();
private:
std::string get_label (double&);
boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
std::shared_ptr<ARDOUR::AutomationControl> _controllable;
};
/** A BarController which displays the value and allows control of an AutomationControl */
class AutomationController : public Gtk::Alignment {
public:
static boost::shared_ptr<AutomationController> create (
static std::shared_ptr<AutomationController> create (
const Evoral::Parameter& param,
const ARDOUR::ParameterDescriptor& desc,
boost::shared_ptr<ARDOUR::AutomationControl> ac,
std::shared_ptr<ARDOUR::AutomationControl> ac,
bool use_knob = false);
~AutomationController();
boost::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
std::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
void disable_vertical_scroll();
@ -84,7 +84,7 @@ public:
void stop_updating ();
private:
AutomationController (boost::shared_ptr<ARDOUR::AutomationControl> ac,
AutomationController (std::shared_ptr<ARDOUR::AutomationControl> ac,
Gtk::Adjustment* adj,
bool use_knob);
@ -99,7 +99,7 @@ private:
bool on_button_release(GdkEventButton* ev);
Gtk::Widget* _widget;
boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
std::shared_ptr<ARDOUR::AutomationControl> _controllable;
Gtk::Adjustment* _adjustment;
sigc::connection _screen_update_connection;
PBD::ScopedConnectionList _changed_connections;

4
gtk2_ardour/automation_line.cc
View File

@ -87,7 +87,7 @@ using namespace Temporal;
AutomationLine::AutomationLine (const string& name,
TimeAxisView& tv,
ArdourCanvas::Item& parent,
boost::shared_ptr<AutomationList> al,
std::shared_ptr<AutomationList> al,
const ParameterDescriptor& desc)
: trackview (tv)
, _name (name)
@ -1236,7 +1236,7 @@ AutomationLine::clear ()
}
void
AutomationLine::set_list (boost::shared_ptr<ARDOUR::AutomationList> list)
AutomationLine::set_list (std::shared_ptr<ARDOUR::AutomationList> list)
{
alist = list;
queue_reset ();

10
gtk2_ardour/automation_line.h
View File

@ -68,7 +68,7 @@ public:
AutomationLine (const std::string& name,
TimeAxisView& tv,
ArdourCanvas::Item& parent,
boost::shared_ptr<ARDOUR::AutomationList> al,
std::shared_ptr<ARDOUR::AutomationList> al,
const ARDOUR::ParameterDescriptor& desc);
@ -136,8 +136,8 @@ public:
double compute_delta (double from, double to) const;
void apply_delta (double& val, double delta) const;
void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
void set_list(std::shared_ptr<ARDOUR::AutomationList> list);
std::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
void track_entered();
void track_exited();
@ -175,7 +175,7 @@ protected:
guint32 _height;
uint32_t _line_color;
uint32_t _view_index_offset;
boost::shared_ptr<ARDOUR::AutomationList> alist;
std::shared_ptr<ARDOUR::AutomationList> alist;
VisibleAspects _visible;
@ -207,7 +207,7 @@ private:
friend class ContiguousControlPoints;
typedef boost::shared_ptr<ContiguousControlPoints> CCP;
typedef std::shared_ptr<ContiguousControlPoints> CCP;
std::vector<CCP> contiguous_points;
bool sync_model_with_view_point (ControlPoint&);

22
gtk2_ardour/automation_region_view.cc
View File

@ -48,9 +48,9 @@ using namespace Temporal;
AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent,
AutomationTimeAxisView& time_axis,
boost::shared_ptr<ARDOUR::Region> region,
std::shared_ptr<ARDOUR::Region> region,
const Evoral::Parameter& param,
boost::shared_ptr<ARDOUR::AutomationList> list,
std::shared_ptr<ARDOUR::AutomationList> list,
double spu,
uint32_t basic_color)
: RegionView(parent, time_axis, region, spu, basic_color, true)
@ -91,12 +91,12 @@ AutomationRegionView::init (bool /*wfd*/)
}
void
AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> list)
AutomationRegionView::create_line (std::shared_ptr<ARDOUR::AutomationList> list)
{
_line = boost::shared_ptr<AutomationLine> (new MidiAutomationLine(
_line = std::shared_ptr<AutomationLine> (new MidiAutomationLine(
ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()),
trackview, *get_canvas_group(), list,
boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
std::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
_parameter));
_line->set_colors();
_line->set_height ((uint32_t)rint(trackview.current_height() - 2.5 - NAME_HIGHLIGHT_SIZE));
@ -171,8 +171,8 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev)
void
AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, double y, bool with_guard_points)
{
boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
boost::shared_ptr<ARDOUR::AutomationControl> ac = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(c);
std::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
std::shared_ptr<ARDOUR::AutomationControl> ac = std::dynamic_pointer_cast<ARDOUR::AutomationControl>(c);
timepos_t when (w); /* the non-const copy */
if (!_line) {
@ -196,9 +196,9 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou
if (c->list()->size () == 0) {
/* we need the MidiTrack::MidiControl, not the region's (midi model source) control */
boost::shared_ptr<ARDOUR::MidiTrack> mt = boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (view->parent_stripable ());
std::shared_ptr<ARDOUR::MidiTrack> mt = std::dynamic_pointer_cast<ARDOUR::MidiTrack> (view->parent_stripable ());
assert (mt);
boost::shared_ptr<Evoral::Control> mc = mt->control(_parameter);
std::shared_ptr<Evoral::Control> mc = mt->control(_parameter);
assert (mc);
y = mc->get_double ();
} else if (UIConfiguration::instance().get_new_automation_points_on_lane()) {
@ -231,12 +231,12 @@ bool
AutomationRegionView::paste (timepos_t const & pos,
unsigned paste_count,
float times,
boost::shared_ptr<const ARDOUR::AutomationList> slist)
std::shared_ptr<const ARDOUR::AutomationList> slist)
{
using namespace ARDOUR;
AutomationTimeAxisView* const view = automation_view();
boost::shared_ptr<ARDOUR::AutomationList> my_list = _line->the_list();
std::shared_ptr<ARDOUR::AutomationList> my_list = _line->the_list();
if (view->session()->transport_rolling() && my_list->automation_write()) {
/* do not paste if this control is in write mode and we're rolling */

12
gtk2_ardour/automation_region_view.h
View File

@ -40,9 +40,9 @@ class AutomationRegionView : public RegionView
public:
AutomationRegionView(ArdourCanvas::Container*,
AutomationTimeAxisView&,
boost::shared_ptr<ARDOUR::Region>,
std::shared_ptr<ARDOUR::Region>,
const Evoral::Parameter& parameter,
boost::shared_ptr<ARDOUR::AutomationList>,
std::shared_ptr<ARDOUR::AutomationList>,
double initial_samples_per_pixel,
uint32_t basic_color);
@ -53,12 +53,12 @@ public:
bool paste (Temporal::timepos_t const & pos,
unsigned paste_count,
float times,
boost::shared_ptr<const ARDOUR::AutomationList> slist);
std::shared_ptr<const ARDOUR::AutomationList> slist);
inline AutomationTimeAxisView* automation_view() const
{ return dynamic_cast<AutomationTimeAxisView*>(&trackview); }
boost::shared_ptr<AutomationLine> line() { return _line; }
std::shared_ptr<AutomationLine> line() { return _line; }
// We are a ghost. Meta ghosts? Crazy talk.
virtual GhostRegion* add_ghost(TimeAxisView&) { return 0; }
@ -71,7 +71,7 @@ public:
void tempo_map_changed ();
protected:
void create_line(boost::shared_ptr<ARDOUR::AutomationList> list);
void create_line(std::shared_ptr<ARDOUR::AutomationList> list);
bool set_position(Temporal::timepos_t const & pos, void* src, double* ignored);
void region_resized (const PBD::PropertyChange&);
bool canvas_group_event(GdkEvent* ev);
@ -83,7 +83,7 @@ protected:
private:
Evoral::Parameter _parameter;
boost::shared_ptr<AutomationLine> _line;
std::shared_ptr<AutomationLine> _line;
PBD::ScopedConnection _mouse_mode_connection;
};

2
gtk2_ardour/automation_selection.h
View File

@ -24,7 +24,7 @@
#include "ardour/automation_list.h"
#include "evoral/Parameter.h"
class AutomationSelection : public std::list<boost::shared_ptr<ARDOUR::AutomationList> > {
class AutomationSelection : public std::list<std::shared_ptr<ARDOUR::AutomationList> > {
public:
const_iterator
get_nth(const Evoral::Parameter& param, size_t nth) const {

42
gtk2_ardour/automation_streamview.cc
View File

@ -73,19 +73,19 @@ AutomationStreamView::~AutomationStreamView ()
RegionView*
AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region, bool /*wait_for_data*/, bool /*recording*/)
AutomationStreamView::add_region_view_internal (std::shared_ptr<Region> region, bool /*wait_for_data*/, bool /*recording*/)
{
if (!region) {
return 0;
}
const boost::shared_ptr<AutomationControl> control = boost::dynamic_pointer_cast<AutomationControl> (
const std::shared_ptr<AutomationControl> control = std::dynamic_pointer_cast<AutomationControl> (
region->control (_automation_view.parameter(), true)
);
boost::shared_ptr<AutomationList> list;
std::shared_ptr<AutomationList> list;
if (control) {
list = boost::dynamic_pointer_cast<AutomationList>(control->list());
list = std::dynamic_pointer_cast<AutomationList>(control->list());
if (control->list() && !list) {
error << _("unable to display automation region for control without list") << endmsg;
return 0;
@ -125,10 +125,10 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
display_region (region_view);
/* catch regionview going away */
region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)), gui_context());
region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, std::weak_ptr<Region>(region)), gui_context());
/* setup automation state for this region */
boost::shared_ptr<AutomationLine> line = region_view->line ();
std::shared_ptr<AutomationLine> line = region_view->line ();
if (line && line->the_list()) {
line->the_list()->set_automation_state (automation_state ());
}
@ -152,9 +152,9 @@ AutomationStreamView::set_automation_state (AutoState state)
if (region_views.empty()) {
_pending_automation_state = state;
} else {
list<boost::shared_ptr<AutomationLine> > lines = get_lines ();
list<std::shared_ptr<AutomationLine> > lines = get_lines ();
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
if ((*i)->the_list()) {
(*i)->the_list()->set_automation_state (state);
}
@ -207,7 +207,7 @@ AutomationStreamView::automation_state () const
return _pending_automation_state;
}
boost::shared_ptr<AutomationLine> line = ((AutomationRegionView*) region_views.front())->line ();
std::shared_ptr<AutomationLine> line = ((AutomationRegionView*) region_views.front())->line ();
if (!line || !line->the_list()) {
return Off;
}
@ -218,9 +218,9 @@ AutomationStreamView::automation_state () const
bool
AutomationStreamView::has_automation () const
{
list<boost::shared_ptr<AutomationLine> > lines = get_lines ();
list<std::shared_ptr<AutomationLine> > lines = get_lines ();
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
if ((*i)->npoints() > 0) {
return true;
}
@ -235,9 +235,9 @@ AutomationStreamView::has_automation () const
void
AutomationStreamView::set_interpolation (AutomationList::InterpolationStyle s)
{
list<boost::shared_ptr<AutomationLine> > lines = get_lines ();
list<std::shared_ptr<AutomationLine> > lines = get_lines ();
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
(*i)->the_list()->set_interpolation (s);
}
}
@ -260,9 +260,9 @@ AutomationStreamView::interpolation () const
void
AutomationStreamView::clear ()
{
list<boost::shared_ptr<AutomationLine> > lines = get_lines ();
list<std::shared_ptr<AutomationLine> > lines = get_lines ();
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
(*i)->clear ();
}
}
@ -288,17 +288,17 @@ AutomationStreamView::get_selectables (timepos_t const & start, timepos_t const
void
AutomationStreamView::set_selected_points (PointSelection& ps)
{
list<boost::shared_ptr<AutomationLine> > lines = get_lines ();
list<std::shared_ptr<AutomationLine> > lines = get_lines ();
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
(*i)->set_selected_points (ps);
}
}
list<boost::shared_ptr<AutomationLine> >
list<std::shared_ptr<AutomationLine> >
AutomationStreamView::get_lines () const
{
list<boost::shared_ptr<AutomationLine> > lines;
list<std::shared_ptr<AutomationLine> > lines;
for (list<RegionView*>::const_iterator i = region_views.begin(); i != region_views.end(); ++i) {
AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*i);
@ -314,7 +314,7 @@ bool
AutomationStreamView::paste (timepos_t const & pos,
unsigned paste_count,
float times,
boost::shared_ptr<ARDOUR::AutomationList> alist)
std::shared_ptr<ARDOUR::AutomationList> alist)
{
/* XXX: not sure how best to pick this; for now, just use the last region which starts before pos */
@ -333,7 +333,7 @@ AutomationStreamView::paste (timepos_t const & pos,
prev = i;
}
boost::shared_ptr<Region> r = (*prev)->region ();
std::shared_ptr<Region> r = (*prev)->region ();
/* If *prev doesn't cover pos, it's no good */
if (r->position() > pos || ((r->position() + r->length()) < pos)) {

6
gtk2_ardour/automation_streamview.h
View File

@ -66,17 +66,17 @@ public:
void get_selectables (Temporal::timepos_t const &, Temporal::timepos_t const &, double, double, std::list<Selectable*> &, bool within = false);
void set_selected_points (PointSelection &);
std::list<boost::shared_ptr<AutomationLine> > get_lines () const;
std::list<std::shared_ptr<AutomationLine> > get_lines () const;
bool paste (Temporal::timepos_t const & pos,
unsigned paste_count,
float times,
boost::shared_ptr<ARDOUR::AutomationList> list);
std::shared_ptr<ARDOUR::AutomationList> list);
private:
void setup_rec_box ();
RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false);
RegionView* add_region_view_internal (std::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false);
void display_region(AutomationRegionView* region_view);
void color_handler ();

30
gtk2_ardour/automation_time_axis.cc
View File

@ -91,9 +91,9 @@ bool AutomationTimeAxisView::have_name_font = false;
*/
AutomationTimeAxisView::AutomationTimeAxisView (
Session* s,
boost::shared_ptr<Stripable> strip,
boost::shared_ptr<Automatable> a,
boost::shared_ptr<AutomationControl> c,
std::shared_ptr<Stripable> strip,
std::shared_ptr<Automatable> a,
std::shared_ptr<AutomationControl> c,
Evoral::Parameter p,
PublicEditor& e,
TimeAxisView& parent,
@ -299,7 +299,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
assert (_control);
boost::shared_ptr<AutomationLine> line (
std::shared_ptr<AutomationLine> line (
new AutomationLine (
ARDOUR::EventTypeMap::instance().to_symbol(_parameter),
*this,
@ -579,7 +579,7 @@ AutomationTimeAxisView::update_name_from_param ()
* -> instrument_info().get_controller_name()
* It does not work with parent/plug_name for plugins.
*/
boost::shared_ptr<ARDOUR::Route> r = boost::dynamic_pointer_cast<ARDOUR::Route> (_stripable);
std::shared_ptr<ARDOUR::Route> r = std::dynamic_pointer_cast<ARDOUR::Route> (_stripable);
if (!r) {
return;
}
@ -758,7 +758,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, timepos_t const &
return;
}
boost::shared_ptr<AutomationList> list = _line->the_list ();
std::shared_ptr<AutomationList> list = _line->the_list ();
if (list->in_write_pass()) {
/* do not allow the GUI to add automation events during an
@ -834,7 +834,7 @@ AutomationTimeAxisView::paste (timepos_t const & pos, const Selection& selection
bool
AutomationTimeAxisView::paste_one (timepos_t const & pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts, bool greedy)
{
boost::shared_ptr<AutomationList> alist(_line->the_list());
std::shared_ptr<AutomationList> alist(_line->the_list());
if (_session->transport_rolling() && alist->automation_write()) {
/* do not paste if this control is in write mode and we're rolling */
@ -948,7 +948,7 @@ AutomationTimeAxisView::clear_lines ()
}
void
AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
AutomationTimeAxisView::add_line (std::shared_ptr<AutomationLine> line)
{
if (_control && line) {
assert(line->the_list() == _control->list());
@ -1038,10 +1038,10 @@ AutomationTimeAxisView::has_automation () const
return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) );
}
list<boost::shared_ptr<AutomationLine> >
list<std::shared_ptr<AutomationLine> >
AutomationTimeAxisView::lines () const
{
list<boost::shared_ptr<AutomationLine> > lines;
list<std::shared_ptr<AutomationLine> > lines;
if (_line) {
lines.push_back (_line);
@ -1121,14 +1121,14 @@ AutomationTimeAxisView::parse_state_id (
void
AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
{
list<boost::shared_ptr<AutomationLine> > lines;
list<std::shared_ptr<AutomationLine> > lines;
if (_line) {
lines.push_back (_line);
} else if (_view) {
lines = _view->get_lines ();
}
for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
for (list<std::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
cut_copy_clear_one (**i, selection, op);
}
}
@ -1136,8 +1136,8 @@ AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
void
AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
{
boost::shared_ptr<Evoral::ControlList> what_we_got;
boost::shared_ptr<AutomationList> alist (line.the_list());
std::shared_ptr<Evoral::ControlList> what_we_got;
std::shared_ptr<AutomationList> alist (line.the_list());
XMLNode &before = alist->get_state();
@ -1189,7 +1189,7 @@ AutomationTimeAxisView::presentation_info () const
return _stripable->presentation_info();
}
boost::shared_ptr<Stripable>
std::shared_ptr<Stripable>
AutomationTimeAxisView::stripable () const
{
return _stripable;

30
gtk2_ardour/automation_time_axis.h
View File

@ -64,9 +64,9 @@ class AutomationTimeAxisView : public TimeAxisView
{
public:
AutomationTimeAxisView (ARDOUR::Session*,
boost::shared_ptr<ARDOUR::Stripable>,
boost::shared_ptr<ARDOUR::Automatable>,
boost::shared_ptr<ARDOUR::AutomationControl>,
std::shared_ptr<ARDOUR::Stripable>,
std::shared_ptr<ARDOUR::Automatable>,
std::shared_ptr<ARDOUR::AutomationControl>,
Evoral::Parameter,
PublicEditor&,
TimeAxisView& parent,
@ -83,7 +83,7 @@ public:
Gdk::Color color () const;
void update_name_from_param ();
boost::shared_ptr<ARDOUR::Stripable> stripable() const;
std::shared_ptr<ARDOUR::Stripable> stripable() const;
ARDOUR::PresentationInfo const & presentation_info () const;
void add_automation_event (GdkEvent *, Temporal::timepos_t const &, double, bool with_guard_points);
@ -91,10 +91,10 @@ public:
void clear_lines ();
/** @return Our AutomationLine, if this view has one, or 0 if it uses AutomationRegionViews */
boost::shared_ptr<AutomationLine> line() { return _line; }
std::shared_ptr<AutomationLine> line() { return _line; }
/** @return All AutomationLines associated with this view */
std::list<boost::shared_ptr<AutomationLine> > lines () const;
std::list<std::shared_ptr<AutomationLine> > lines () const;
AutomationStreamView* automation_view() const { return _view; }
@ -115,8 +115,8 @@ public:
std::string state_id() const;
static bool parse_state_id (std::string const &, PBD::ID &, bool &, Evoral::Parameter &);
boost::shared_ptr<ARDOUR::AutomationControl> control() const { return _control; }
boost::shared_ptr<AutomationController> controller() const { return _controller; }
std::shared_ptr<ARDOUR::AutomationControl> control() const { return _control; }
std::shared_ptr<AutomationController> controller() const { return _controller; }
Evoral::Parameter parameter () const {
return _parameter;
}
@ -127,7 +127,7 @@ public:
bool has_automation () const;
boost::shared_ptr<ARDOUR::Stripable> parent_stripable () {
std::shared_ptr<ARDOUR::Stripable> parent_stripable () {
return _stripable;
}
@ -143,17 +143,17 @@ protected:
* controller will send immediate events out the route's MIDI port. */
/** parent strip */
boost::shared_ptr<ARDOUR::Stripable> _stripable;
std::shared_ptr<ARDOUR::Stripable> _stripable;
/** control */
boost::shared_ptr<ARDOUR::AutomationControl> _control;
std::shared_ptr<ARDOUR::AutomationControl> _control;
/** control owner; may be _stripable, something else (e.g. a pan control), or NULL */
boost::shared_ptr<ARDOUR::Automatable> _automatable;
std::shared_ptr<ARDOUR::Automatable> _automatable;
/** controller owner */
boost::shared_ptr<AutomationController> _controller;
std::shared_ptr<AutomationController> _controller;
Evoral::Parameter _parameter;
ArdourCanvas::Rectangle* _base_rect;
boost::shared_ptr<AutomationLine> _line;
std::shared_ptr<AutomationLine> _line;
std::string _name;
@ -180,7 +180,7 @@ protected:
bool _show_regions;
void add_line (boost::shared_ptr<AutomationLine>);
void add_line (std::shared_ptr<AutomationLine>);
void clear_clicked ();
void hide_clicked ();

4
gtk2_ardour/axis_provider.h
View File

@ -33,8 +33,8 @@ class AxisViewProvider
{
public:
virtual ~AxisViewProvider () {}
virtual AxisView* axis_view_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const = 0;
virtual AxisView* axis_view_by_control (boost::shared_ptr<ARDOUR::AutomationControl>) const = 0;
virtual AxisView* axis_view_by_stripable (std::shared_ptr<ARDOUR::Stripable>) const = 0;
virtual AxisView* axis_view_by_control (std::shared_ptr<ARDOUR::AutomationControl>) const = 0;
};
#endif /* __gtk2_ardour_axis_provider_h__ */

4
gtk2_ardour/axis_view.h
View File

@ -62,8 +62,8 @@ public:
sigc::signal<void> Hiding;
virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
virtual boost::shared_ptr<ARDOUR::AutomationControl> control() const { return boost::shared_ptr<ARDOUR::AutomationControl>(); }
virtual std::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
virtual std::shared_ptr<ARDOUR::AutomationControl> control() const { return std::shared_ptr<ARDOUR::AutomationControl>(); }
virtual std::string state_id() const = 0;
/* for now, we always return properties in string form.

6
gtk2_ardour/beatbox_gui.cc
View File

@ -67,7 +67,7 @@ using std::endl;
const double _step_dimen = 32;
BBGUI::BBGUI (boost::shared_ptr<BeatBox> bb)
BBGUI::BBGUI (std::shared_ptr<BeatBox> bb)
: ArdourDialog (_("BeatBox"))
, bbox (bb)
, horizontal_adjustment (0.0, 0.0, 800.0)
@ -178,7 +178,7 @@ void
BBGUI::export_as_region ()
{
std::string path = bbox->session().new_midi_source_path (bbox->owner()->name());
boost::shared_ptr<Source> src = bbox->sequencer().write_to_source (bbox->session(), path);
std::shared_ptr<Source> src = bbox->sequencer().write_to_source (bbox->session(), path);
if (!src) {
return;
@ -195,7 +195,7 @@ BBGUI::export_as_region ()
plist.add (ARDOUR::Properties::whole_file, true);
plist.add (ARDOUR::Properties::external, false);
boost::shared_ptr<Region> region = RegionFactory::create (src, plist, true);
std::shared_ptr<Region> region = RegionFactory::create (src, plist, true);
}
void

4
gtk2_ardour/beatbox_gui.h
View File

@ -252,7 +252,7 @@ class SequencerStepIndicator : public ArdourCanvas::Rectangle, public sigc::trac
class BBGUI : public ArdourDialog {
public:
BBGUI (boost::shared_ptr<ARDOUR::BeatBox> bb);
BBGUI (std::shared_ptr<ARDOUR::BeatBox> bb);
~BBGUI ();
double width() const { return _width; }
@ -263,7 +263,7 @@ class BBGUI : public ArdourDialog {
void on_unmap ();
private:
boost::shared_ptr<ARDOUR::BeatBox> bbox;
std::shared_ptr<ARDOUR::BeatBox> bbox;
double _width;
double _height;

40
gtk2_ardour/bundle_manager.cc
View File

@ -38,11 +38,11 @@ using namespace std;
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, std::shared_ptr<Bundle> bundle)
: PortMatrix (parent, session, DataType::NIL)
, _bundle (bundle)
{
_port_group = boost::shared_ptr<PortGroup> (new PortGroup (""));
_port_group = std::shared_ptr<PortGroup> (new PortGroup (""));
_port_group->add_bundle (_bundle);
setup_all_ports ();
@ -103,7 +103,7 @@ BundleEditorMatrix::get_state (BundleChannel c[2]) const
}
bool
BundleEditorMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
BundleEditorMatrix::can_add_channels (std::shared_ptr<Bundle> b) const
{
if (b == _bundle) {
return true;
@ -113,7 +113,7 @@ BundleEditorMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
}
bool
BundleEditorMatrix::can_add_port (boost::shared_ptr<Bundle> b, DataType t) const
BundleEditorMatrix::can_add_port (std::shared_ptr<Bundle> b, DataType t) const
{
#if 1
return true; // anything goes
@ -124,7 +124,7 @@ BundleEditorMatrix::can_add_port (boost::shared_ptr<Bundle> b, DataType t) const
}
void
BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
BundleEditorMatrix::add_channel (std::shared_ptr<Bundle> b, DataType t)
{
if (b == _bundle) {
@ -145,7 +145,7 @@ BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
}
bool
BundleEditorMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
BundleEditorMatrix::can_remove_channels (std::shared_ptr<Bundle> b) const
{
if (b != _bundle) {
return false;
@ -161,7 +161,7 @@ BundleEditorMatrix::remove_channel (BundleChannel bc)
}
bool
BundleEditorMatrix::can_rename_channels (boost::shared_ptr<Bundle> b) const
BundleEditorMatrix::can_rename_channels (std::shared_ptr<Bundle> b) const
{
if (b == _bundle) {
return true;
@ -194,7 +194,7 @@ BundleEditorMatrix::disassociation_verb () const
return _("Disassociate");
}
BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
BundleEditor::BundleEditor (Session* session, std::shared_ptr<UserBundle> bundle)
: ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
{
Gtk::Table* t = new Gtk::Table (3, 2);
@ -283,7 +283,7 @@ BundleManager::BundleManager (Session* session)
_tree_view.append_column (_("Name"), _list_model_columns.name);
_tree_view.set_headers_visible (false);
boost::shared_ptr<BundleList> bundles = _session->bundles ();
std::shared_ptr<BundleList> bundles = _session->bundles ();
for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) {
add_bundle (*i);
}
@ -338,7 +338,7 @@ BundleManager::set_button_sensitivity ()
void
BundleManager::new_clicked ()
{
boost::shared_ptr<UserBundle> b (new UserBundle (_("Bundle")));
std::shared_ptr<UserBundle> b (new UserBundle (_("Bundle")));
/* Start off with a single channel */
/* XXX: allow user to specify type */
@ -356,7 +356,7 @@ BundleManager::edit_clicked ()
{
Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
if (i) {
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
std::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
BundleEditor e (_session, b);
e.run ();
}
@ -367,16 +367,16 @@ BundleManager::delete_clicked ()
{
Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
if (i) {
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
std::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
_session->remove_bundle (b);
_list_model->erase (i);
}
}
void
BundleManager::add_bundle (boost::shared_ptr<Bundle> b)
BundleManager::add_bundle (std::shared_ptr<Bundle> b)
{
boost::shared_ptr<UserBundle> u = boost::dynamic_pointer_cast<UserBundle> (b);
std::shared_ptr<UserBundle> u = std::dynamic_pointer_cast<UserBundle> (b);
if (u == 0) {
return;
}
@ -385,20 +385,20 @@ BundleManager::add_bundle (boost::shared_ptr<Bundle> b)
(*i)[_list_model_columns.name] = u->name ();
(*i)[_list_model_columns.bundle] = u;
u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, boost::weak_ptr<UserBundle> (u)), gui_context());
u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, std::weak_ptr<UserBundle> (u)), gui_context());
}
void
BundleManager::bundle_changed (Bundle::Change c, boost::weak_ptr<UserBundle> wb)
BundleManager::bundle_changed (Bundle::Change c, std::weak_ptr<UserBundle> wb)
{
boost::shared_ptr<UserBundle> b = wb.lock ();
std::shared_ptr<UserBundle> b = wb.lock ();
if (!b || 0 == (c & Bundle::NameChanged)) {
return;
}
Gtk::TreeModel::iterator i = _list_model->children().begin ();
while (i != _list_model->children().end()) {
boost::shared_ptr<UserBundle> t = (*i)[_list_model_columns.bundle];
std::shared_ptr<UserBundle> t = (*i)[_list_model_columns.bundle];
if (t == b) {
break;
}
@ -418,7 +418,7 @@ BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColum
return;
}
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
std::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
BundleEditor e (_session, b);
e.run ();
}
@ -430,7 +430,7 @@ NameChannelDialog::NameChannelDialog ()
setup ();
}
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
NameChannelDialog::NameChannelDialog (std::shared_ptr<Bundle> b, uint32_t c)
: ArdourDialog (_("Rename Channel")),
_bundle (b),
_adding (false)

30
gtk2_ardour/bundle_manager.h
View File

@ -38,18 +38,18 @@ namespace ARDOUR {
class BundleEditorMatrix : public PortMatrix
{
public:
BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, boost::shared_ptr<ARDOUR::Bundle>);
BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, std::shared_ptr<ARDOUR::Bundle>);
void set_state (ARDOUR::BundleChannel c[2], bool s);
PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
bool can_add_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
bool can_add_port (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType t) const;
bool can_add_channels (std::shared_ptr<ARDOUR::Bundle>) const;
bool can_add_port (std::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType t) const;
void add_channel (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType);
bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
void add_channel (std::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType);
bool can_remove_channels (std::shared_ptr<ARDOUR::Bundle>) const;
void remove_channel (ARDOUR::BundleChannel);
bool can_rename_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
bool can_rename_channels (std::shared_ptr<ARDOUR::Bundle>) const;
void rename_channel (ARDOUR::BundleChannel);
void setup_ports (int);
bool list_is_global (int) const;
@ -62,14 +62,14 @@ private:
OURS = 1
};
boost::shared_ptr<PortGroup> _port_group;
boost::shared_ptr<ARDOUR::Bundle> _bundle;
std::shared_ptr<PortGroup> _port_group;
std::shared_ptr<ARDOUR::Bundle> _bundle;
};
class BundleEditor : public ArdourDialog
{
public:
BundleEditor (ARDOUR::Session *, boost::shared_ptr<ARDOUR::UserBundle>);
BundleEditor (ARDOUR::Session *, std::shared_ptr<ARDOUR::UserBundle>);
protected:
void on_map ();
@ -80,7 +80,7 @@ private:
void on_show ();
BundleEditorMatrix _matrix;
boost::shared_ptr<ARDOUR::UserBundle> _bundle;
std::shared_ptr<ARDOUR::UserBundle> _bundle;
Gtk::Entry _name;
Gtk::ComboBoxText _input_or_output;
};
@ -95,8 +95,8 @@ private:
void new_clicked ();
void edit_clicked ();
void delete_clicked ();
void add_bundle (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_changed (ARDOUR::Bundle::Change, boost::weak_ptr<ARDOUR::UserBundle>);
void add_bundle (std::shared_ptr<ARDOUR::Bundle>);
void bundle_changed (ARDOUR::Bundle::Change, std::weak_ptr<ARDOUR::UserBundle>);
void set_button_sensitivity ();
void row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn* c);
@ -109,7 +109,7 @@ private:
}
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
Gtk::TreeModelColumn<std::shared_ptr<ARDOUR::UserBundle> > bundle;
};
Gtk::TreeView _tree_view;
@ -124,7 +124,7 @@ class NameChannelDialog : public ArdourDialog
{
public:
NameChannelDialog ();
NameChannelDialog (boost::shared_ptr<ARDOUR::Bundle>, uint32_t);
NameChannelDialog (std::shared_ptr<ARDOUR::Bundle>, uint32_t);
std::string get_name () const;
@ -132,7 +132,7 @@ private:
void setup ();
boost::shared_ptr<ARDOUR::Bundle> _bundle;
std::shared_ptr<ARDOUR::Bundle> _bundle;
Gtk::Entry _name;
bool _adding;
};

16
gtk2_ardour/control_slave_ui.cc
View File

@ -67,14 +67,14 @@ ControlSlaveUI::~ControlSlaveUI ()
}
void
ControlSlaveUI::set_stripable (boost::shared_ptr<Stripable> s)
ControlSlaveUI::set_stripable (std::shared_ptr<Stripable> s)
{
connections.drop_connections ();
stripable = s;
if (stripable) {
boost::shared_ptr<GainControl> ac = stripable->gain_control();
std::shared_ptr<GainControl> ac = stripable->gain_control();
assert (ac);
ac->MasterStatusChange.connect (connections,
@ -82,7 +82,7 @@ ControlSlaveUI::set_stripable (boost::shared_ptr<Stripable> s)
boost::bind (&ControlSlaveUI::update_vca_display, this),
gui_context());
stripable->DropReferences.connect (connections, invalidator (*this), boost::bind (&ControlSlaveUI::set_stripable, this, boost::shared_ptr<Stripable>()), gui_context());
stripable->DropReferences.connect (connections, invalidator (*this), boost::bind (&ControlSlaveUI::set_stripable, this, std::shared_ptr<Stripable>()), gui_context());
}
update_vca_display ();
@ -121,13 +121,13 @@ ControlSlaveUI::update_vca_display ()
void
ControlSlaveUI::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
{
boost::shared_ptr<VCA> vca = _session->vca_manager().vca_by_number (n);
std::shared_ptr<VCA> vca = _session->vca_manager().vca_by_number (n);
if (!vca) {
return;
}
boost::shared_ptr<Slavable> sl = boost::dynamic_pointer_cast<Slavable> (stripable);
std::shared_ptr<Slavable> sl = std::dynamic_pointer_cast<Slavable> (stripable);
if (!sl) {
return;
@ -143,13 +143,13 @@ ControlSlaveUI::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n)
void
ControlSlaveUI::unassign_all ()
{
boost::shared_ptr<Slavable> sl = boost::dynamic_pointer_cast<Slavable> (stripable);
std::shared_ptr<Slavable> sl = std::dynamic_pointer_cast<Slavable> (stripable);
if (!sl) {
return;
}
sl->unassign (boost::shared_ptr<VCA>());
sl->unassign (std::shared_ptr<VCA>());
}
bool
@ -221,7 +221,7 @@ ControlSlaveUI::vca_button_release (GdkEventButton* ev, uint32_t n)
}
void
ControlSlaveUI::add_vca_button (boost::shared_ptr<VCA> vca)
ControlSlaveUI::add_vca_button (std::shared_ptr<VCA> vca)
{
ArdourButton* vca_button = manage (new ArdourButton (ArdourButton::default_elements));

6
gtk2_ardour/control_slave_ui.h
View File

@ -44,10 +44,10 @@ class ControlSlaveUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
public:
ControlSlaveUI (ARDOUR::Session*);
~ControlSlaveUI ();
void set_stripable (boost::shared_ptr<ARDOUR::Stripable>);
void set_stripable (std::shared_ptr<ARDOUR::Stripable>);
private:
boost::shared_ptr<ARDOUR::Stripable> stripable;
std::shared_ptr<ARDOUR::Stripable> stripable;
PBD::ScopedConnectionList connections;
PBD::ScopedConnectionList master_connections;
ArdourWidgets::ArdourButton initial_button;
@ -58,7 +58,7 @@ private:
bool specific_vca_button_release (GdkEventButton* ev, uint32_t n);
bool vca_event_box_release (GdkEventButton* ev);
bool vca_button_release (GdkEventButton* ev, uint32_t n);
void add_vca_button (boost::shared_ptr<ARDOUR::VCA>);
void add_vca_button (std::shared_ptr<ARDOUR::VCA>);
void unassign_all ();
Gtk::Menu* context_menu;

12
gtk2_ardour/crossfade_edit.h
View File

@ -57,7 +57,7 @@ namespace ArdourWaveview {
class CrossfadeEditor : public ArdourDialog
{
public:
CrossfadeEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
CrossfadeEditor (ARDOUR::Session*, std::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
~CrossfadeEditor ();
void apply ();
@ -94,7 +94,7 @@ protected:
bool on_key_release_event (GdkEventKey*);
private:
boost::shared_ptr<ARDOUR::Crossfade> xfade;
std::shared_ptr<ARDOUR::Crossfade> xfade;
Gtk::VBox vpacker;
@ -200,11 +200,11 @@ private:
PBD::ScopedConnection* _peaks_ready_connection;
PBD::ScopedConnection state_connection;
void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
void peaks_ready (boost::weak_ptr<ARDOUR::AudioRegion> r, WhichFade);
void make_waves (std::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
void peaks_ready (std::weak_ptr<ARDOUR::AudioRegion> r, WhichFade);
void _apply_to (boost::shared_ptr<ARDOUR::Crossfade> xf);
void setup (boost::shared_ptr<ARDOUR::Crossfade>);
void _apply_to (std::shared_ptr<ARDOUR::Crossfade> xf);
void setup (std::shared_ptr<ARDOUR::Crossfade>);
void cancel_audition ();
void audition_state_changed (bool);

4
gtk2_ardour/crossfade_view.h
View File

@ -41,7 +41,7 @@ class CrossfadeView : public TimeAxisViewItem
public:
CrossfadeView (ArdourCanvas::Container*,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::Crossfade>,
std::shared_ptr<ARDOUR::Crossfade>,
double initial_samples_per_pixel,
Gdk::Color& basic_color,
AudioRegionView& leftview,
@ -49,7 +49,7 @@ public:
~CrossfadeView ();
boost::shared_ptr<ARDOUR::Crossfade> crossfade; // ok, let 'em have it
std::shared_ptr<ARDOUR::Crossfade> crossfade; // ok, let 'em have it
AudioRegionView& left_view; // and these too
AudioRegionView& right_view;

8
gtk2_ardour/cuebox_ui.cc
View File

@ -304,10 +304,10 @@ CueBoxUI::context_menu (uint64_t idx)
void
CueBoxUI::get_slots (TriggerList &triggerlist, uint64_t idx)
{
boost::shared_ptr<RouteList> rl = _session->get_routes();
std::shared_ptr<RouteList> rl = _session->get_routes();
for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
boost::shared_ptr<Route> route = *r;
boost::shared_ptr<TriggerBox> box = route->triggerbox();
std::shared_ptr<Route> route = *r;
std::shared_ptr<TriggerBox> box = route->triggerbox();
#warning @Ben disambiguate processor *active* vs *visibility*
if (box /*&& box.active*/) {
TriggerPtr trigger = box->trigger(idx);
@ -322,7 +322,7 @@ CueBoxUI::clear_all_triggers (uint64_t idx)
TriggerList tl;
get_slots(tl, idx);
for (TriggerList::iterator t = tl.begin(); t != tl.end(); ++t) {
(*t)->set_region(boost::shared_ptr<Region>());
(*t)->set_region(std::shared_ptr<Region>());
}
}

2
gtk2_ardour/cursor_context.h
View File

@ -44,7 +44,7 @@ class CursorContext
{
public:
/** A smart handle for a cursor change context. */
typedef boost::shared_ptr<CursorContext> Handle;
typedef std::shared_ptr<CursorContext> Handle;
~CursorContext();

8
gtk2_ardour/duplicate_routes_dialog.cc
View File

@ -95,9 +95,9 @@ DuplicateRouteDialog::restart (Session* s)
continue;
}
boost::shared_ptr<Route> r (rui->route());
std::shared_ptr<Route> r (rui->route());
if (boost::dynamic_pointer_cast<Track> (r)) {
if (std::dynamic_pointer_cast<Track> (r)) {
ntracks++;
} else {
if (!r->is_master() && !r->is_monitor()) {
@ -178,9 +178,9 @@ DuplicateRouteDialog::on_response (int response)
for (StripableList::iterator s = sl.begin(); s != sl.end(); ++s) {
boost::shared_ptr<Route> r;
std::shared_ptr<Route> r;
if ((r = boost::dynamic_pointer_cast<Route> (*s)) == 0) {
if ((r = std::dynamic_pointer_cast<Route> (*s)) == 0) {
/* some other type of Stripable, not a route */
continue;
}

4
gtk2_ardour/edit_note_dialog.cc
View File

@ -98,7 +98,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
_time_clock.set_mode (AudioClock::BBT);
/* Calculate absolute position of the event on time timeline */
boost::shared_ptr<ARDOUR::Region> region (_region_view->region ());
std::shared_ptr<ARDOUR::Region> region (_region_view->region ());
timepos_t const pos = region->source_position() + timecnt_t ((*_events.begin())->note()->time ());
_time_clock.set (pos, true);
@ -201,7 +201,7 @@ EditNoteDialog::done (int r)
}
}
boost::shared_ptr<ARDOUR::Region> region (_region_view->region ());
std::shared_ptr<ARDOUR::Region> region (_region_view->region ());
/* convert current clock time into an offset from the start of the source */
timecnt_t const time_clock_source_relative = region->source_position ().distance (_time_clock.last_when ());

100
gtk2_ardour/editor.cc
View File

@ -1706,8 +1706,8 @@ Editor::build_track_region_context_menu ()
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) {
boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
std::shared_ptr<Track> tr;
std::shared_ptr<Playlist> pl;
if ((tr = rtv->track())) {
add_region_context_items (edit_items, tr);
@ -1735,7 +1735,7 @@ Editor::loudness_analyze_region_selection ()
if (!arv) {
continue;
}
if (!boost::dynamic_pointer_cast<AudioRegion> (arv->region ())) {
if (!std::dynamic_pointer_cast<AudioRegion> (arv->region ())) {
continue;
}
assert (dynamic_cast<RouteTimeAxisView *> (&arv->get_time_axis_view ()));
@ -1753,7 +1753,7 @@ Editor::loudness_analyze_region_selection ()
if (!arv) {
continue;
}
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (arv->region ());
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (arv->region ());
if (!ar) {
continue;
}
@ -1778,7 +1778,7 @@ Editor::loudness_analyze_range_selection ()
samplecnt_t total_work = 0;
for (TrackSelection::iterator i = s.tracks.begin (); i != s.tracks.end (); ++i) {
boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
std::shared_ptr<AudioPlaylist> pl = std::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
if (!pl) {
continue;
}
@ -1798,7 +1798,7 @@ Editor::loudness_analyze_range_selection ()
spd.show();
for (TrackSelection::iterator i = s.tracks.begin (); i != s.tracks.end (); ++i) {
boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
std::shared_ptr<AudioPlaylist> pl = std::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
if (!pl) {
continue;
}
@ -1866,7 +1866,7 @@ Editor::build_track_selection_context_menu ()
}
void
Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::shared_ptr<Track> track)
Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, std::shared_ptr<Track> track)
{
using namespace Menu_Helpers;
@ -4469,7 +4469,7 @@ Editor::get_nudge_distance (timepos_t const & pos, timecnt_t& next)
}
int
Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
Editor::playlist_deletion_dialog (std::shared_ptr<Playlist> pl)
{
ArdourDialog dialog (_("Playlist Deletion"));
Label label (string_compose (_("Playlist %1 is currently unused.\n"
@ -4520,7 +4520,7 @@ Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
}
int
Editor::plugin_setup (boost::shared_ptr<Route> r, boost::shared_ptr<PluginInsert> pi, ARDOUR::Route::PluginSetupOptions flags)
Editor::plugin_setup (std::shared_ptr<Route> r, std::shared_ptr<PluginInsert> pi, ARDOUR::Route::PluginSetupOptions flags)
{
PluginSetupDialog psd (r, pi, flags);
int rv = psd.run ();
@ -4687,20 +4687,20 @@ void
Editor::clear_grouped_playlists (RouteUI* rui)
{
begin_reversible_command (_("clear playlists"));
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
vector<std::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists()->get (playlists);
mapover_grouped_routes (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), rui, ARDOUR::Properties::group_select.property_id);
commit_reversible_command ();
}
void
Editor::mapped_select_playlist_matching (RouteUI& rui, boost::weak_ptr<ARDOUR::Playlist> pl)
Editor::mapped_select_playlist_matching (RouteUI& rui, std::weak_ptr<ARDOUR::Playlist> pl)
{
rui.select_playlist_matching (pl);
}
void
Editor::mapped_use_new_playlist (RouteUI& rui, std::string name, string gid, bool copy, vector<boost::shared_ptr<ARDOUR::Playlist> > const & playlists)
Editor::mapped_use_new_playlist (RouteUI& rui, std::string name, string gid, bool copy, vector<std::shared_ptr<ARDOUR::Playlist> > const & playlists)
{
rui.use_new_playlist (name, gid, playlists, copy);
}
@ -4710,7 +4710,7 @@ Editor::new_playlists_for_all_tracks (bool copy)
{
string name, gid;
if (stamp_new_playlist( copy ? _("Copy Playlist for ALL Tracks") : _("New Playlist for ALL Tracks"), name,gid,copy)) {
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
vector<std::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists()->get (playlists);
mapover_all_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists));
}
@ -4721,7 +4721,7 @@ Editor::new_playlists_for_grouped_tracks (RouteUI* rui, bool copy)
{
string name, gid;
if (stamp_new_playlist( copy ? _("Copy Playlist for this track/group") : _("New Playlist for this track/group"), name,gid,copy)) {
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
vector<std::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists()->get (playlists);
mapover_grouped_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists), rui, ARDOUR::Properties::group_select.property_id);
}
@ -4732,7 +4732,7 @@ Editor::new_playlists_for_selected_tracks (bool copy)
{
string name, gid;
if (stamp_new_playlist( copy ? _("Copy Playlist for Selected Tracks") : _("New Playlist for Selected Tracks"), name,gid,copy)) {
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
vector<std::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists()->get (playlists);
mapover_selected_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists));
}
@ -4743,7 +4743,7 @@ Editor::new_playlists_for_armed_tracks (bool copy)
{
string name, gid;
if (stamp_new_playlist( copy ? _("Copy Playlist for Armed Tracks") : _("New Playlist for Armed Tracks"), name,gid,copy)) {
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
vector<std::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists()->get (playlists);
mapover_armed_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists));
}
@ -5247,12 +5247,12 @@ Editor::get_regions_at (RegionSelection& rs, timepos_t const & where, const Trac
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
std::shared_ptr<Track> tr;
std::shared_ptr<Playlist> pl;
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
boost::shared_ptr<RegionList> regions = pl->regions_at (where);
std::shared_ptr<RegionList> regions = pl->regions_at (where);
for (RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
RegionView* rv = rtv->view()->find_view (*i);
@ -5279,12 +5279,12 @@ Editor::get_regions_after (RegionSelection& rs, timepos_t const & where, const T
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
std::shared_ptr<Track> tr;
std::shared_ptr<Playlist> pl;
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
boost::shared_ptr<RegionList> regions = pl->regions_touched (where, timepos_t::max (where.time_domain()));
std::shared_ptr<RegionList> regions = pl->regions_touched (where, timepos_t::max (where.time_domain()));
for (RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
@ -5400,9 +5400,9 @@ Editor::get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) cons
RouteTimeAxisView* rtav;
if ((rtav = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
boost::shared_ptr<Playlist> pl;
std::vector<boost::shared_ptr<Region> > results;
boost::shared_ptr<Track> tr;
std::shared_ptr<Playlist> pl;
std::vector<std::shared_ptr<Region> > results;
std::shared_ptr<Track> tr;
if ((tr = rtav->track()) == 0) {
/* bus */
@ -5410,7 +5410,7 @@ Editor::get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) cons
}
if ((pl = (tr->playlist())) != 0) {
boost::shared_ptr<Region> r = pl->region_by_id (id);
std::shared_ptr<Region> r = pl->region_by_id (id);
if (r) {
RegionView* rv = rtav->view()->find_view (r);
if (rv) {
@ -5423,7 +5423,7 @@ Editor::get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) cons
}
void
Editor::get_per_region_note_selection (list<pair<PBD::ID, set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > &selection) const
Editor::get_per_region_note_selection (list<pair<PBD::ID, set<std::shared_ptr<Evoral::Note<Temporal::Beats> > > > > &selection) const
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
@ -5438,7 +5438,7 @@ Editor::get_per_region_note_selection (list<pair<PBD::ID, set<boost::shared_ptr<
}
void
Editor::get_regionview_corresponding_to (boost::shared_ptr<Region> region, vector<RegionView*>& regions)
Editor::get_regionview_corresponding_to (std::shared_ptr<Region> region, vector<RegionView*>& regions)
{
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
@ -5446,9 +5446,9 @@ Editor::get_regionview_corresponding_to (boost::shared_ptr<Region> region, vecto
if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
boost::shared_ptr<Playlist> pl;
std::shared_ptr<Playlist> pl;
RegionView* marv;
boost::shared_ptr<Track> tr;
std::shared_ptr<Track> tr;
if ((tr = tatv->track()) == 0) {
/* bus */
@ -5463,7 +5463,7 @@ Editor::get_regionview_corresponding_to (boost::shared_ptr<Region> region, vecto
}
RegionView*
Editor::regionview_from_region (boost::shared_ptr<Region> region) const
Editor::regionview_from_region (std::shared_ptr<Region> region) const
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* tatv;
@ -5481,7 +5481,7 @@ Editor::regionview_from_region (boost::shared_ptr<Region> region) const
}
RouteTimeAxisView*
Editor::rtav_from_route (boost::shared_ptr<Route> route) const
Editor::rtav_from_route (std::shared_ptr<Route> route) const
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* rtav;
@ -5665,7 +5665,7 @@ Editor::region_view_removed ()
}
AxisView*
Editor::axis_view_by_stripable (boost::shared_ptr<Stripable> s) const
Editor::axis_view_by_stripable (std::shared_ptr<Stripable> s) const
{
for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
if ((*j)->stripable() == s) {
@ -5677,7 +5677,7 @@ Editor::axis_view_by_stripable (boost::shared_ptr<Stripable> s) const
}
AxisView*
Editor::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
Editor::axis_view_by_control (std::shared_ptr<AutomationControl> c) const
{
for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
if ((*j)->control() == c) {
@ -5697,7 +5697,7 @@ Editor::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
}
TrackViewList
Editor::axis_views_from_routes (boost::shared_ptr<RouteList> r) const
Editor::axis_views_from_routes (std::shared_ptr<RouteList> r) const
{
TrackViewList t;
@ -5760,7 +5760,7 @@ Editor::add_vcas (VCAList& vlist)
StripableList sl;
for (VCAList::iterator v = vlist.begin(); v != vlist.end(); ++v) {
sl.push_back (boost::dynamic_pointer_cast<Stripable> (*v));
sl.push_back (std::dynamic_pointer_cast<Stripable> (*v));
}
add_stripables (sl);
@ -5781,8 +5781,8 @@ Editor::add_routes (RouteList& rlist)
void
Editor::add_stripables (StripableList& sl)
{
boost::shared_ptr<VCA> v;
boost::shared_ptr<Route> r;
std::shared_ptr<VCA> v;
std::shared_ptr<Route> r;
TrackViewList new_selection;
bool changed = false;
bool from_scratch = (track_views.size() == 0);
@ -5797,7 +5797,7 @@ Editor::add_stripables (StripableList& sl)
continue;
}
if ((v = boost::dynamic_pointer_cast<VCA> (*s)) != 0) {
if ((v = std::dynamic_pointer_cast<VCA> (*s)) != 0) {
VCATimeAxisView* vtv = new VCATimeAxisView (*this, _session, *_track_canvas);
vtv->set_vca (v);
@ -5806,7 +5806,7 @@ Editor::add_stripables (StripableList& sl)
(*s)->gui_changed.connect (*this, invalidator (*this), boost::bind (&Editor::handle_gui_changes, this, _1, _2), gui_context());
changed = true;
} else if ((r = boost::dynamic_pointer_cast<Route> (*s)) != 0) {
} else if ((r = std::dynamic_pointer_cast<Route> (*s)) != 0) {
if (r->is_auditioner() || r->is_monitor()) {
continue;
@ -5900,7 +5900,7 @@ Editor::timeaxisview_deleted (TimeAxisView *tv)
return;
}
boost::shared_ptr<Route> route = rtav->route ();
std::shared_ptr<Route> route = rtav->route ();
if (current_mixer_strip && current_mixer_strip->route() == route) {
TimeAxisView* next_tv;
@ -5986,7 +5986,7 @@ Editor::show_track_in_display (TimeAxisView* tv, bool move_into_view)
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
RouteGroup* rg = rtv->route ()->route_group ();
if (rg && rg->is_active () && rg->is_hidden () && !rg->is_select ()) {
boost::shared_ptr<RouteList> rl (rg->route_list ());
std::shared_ptr<RouteList> rl (rg->route_list ());
for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
(*i)->presentation_info().set_hidden (false);
}
@ -6006,8 +6006,8 @@ struct TrackViewStripableSorter
StripableTimeAxisView const* stav_b = dynamic_cast<StripableTimeAxisView const*>(tav_b);
assert (stav_a && stav_b);
boost::shared_ptr<ARDOUR::Stripable> const& a = stav_a->stripable ();
boost::shared_ptr<ARDOUR::Stripable> const& b = stav_b->stripable ();
std::shared_ptr<ARDOUR::Stripable> const& a = stav_a->stripable ();
std::shared_ptr<ARDOUR::Stripable> const& b = stav_b->stripable ();
return ARDOUR::Stripable::Sorter () (a, b);
}
};
@ -6105,9 +6105,9 @@ Editor::fit_route_group (RouteGroup *g)
}
void
Editor::consider_auditioning (boost::shared_ptr<Region> region)
Editor::consider_auditioning (std::shared_ptr<Region> region)
{
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
std::shared_ptr<AudioRegion> r = std::dynamic_pointer_cast<AudioRegion> (region);
if (r == 0) {
_session->cancel_audition ();
@ -6126,13 +6126,13 @@ Editor::consider_auditioning (boost::shared_ptr<Region> region)
}
void
Editor::hide_a_region (boost::shared_ptr<Region> r)
Editor::hide_a_region (std::shared_ptr<Region> r)
{
r->set_hidden (true);
}
void
Editor::show_a_region (boost::shared_ptr<Region> r)
Editor::show_a_region (std::shared_ptr<Region> r)
{
r->set_hidden (false);
}
@ -6531,13 +6531,13 @@ Editor::change_region_layering_order (bool from_context_menu)
return;
}
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (clicked_routeview->route());
std::shared_ptr<Track> track = std::dynamic_pointer_cast<Track> (clicked_routeview->route());
if (!track) {
return;
}
boost::shared_ptr<Playlist> pl = track->playlist();
std::shared_ptr<Playlist> pl = track->playlist();
if (!pl) {
return;

116
gtk2_ardour/editor.h
View File

@ -224,9 +224,9 @@ public:
StripableTimeAxisView* get_stripable_time_axis_by_id (const PBD::ID& id) const;
void consider_auditioning (boost::shared_ptr<ARDOUR::Region>);
void hide_a_region (boost::shared_ptr<ARDOUR::Region>);
void show_a_region (boost::shared_ptr<ARDOUR::Region>);
void consider_auditioning (std::shared_ptr<ARDOUR::Region>);
void hide_a_region (std::shared_ptr<ARDOUR::Region>);
void show_a_region (std::shared_ptr<ARDOUR::Region>);
#ifdef USE_RUBBERBAND
std::vector<std::string> rb_opt_strings;
@ -307,7 +307,7 @@ public:
void deselect_all ();
long select_range (Temporal::timepos_t const & , Temporal::timepos_t const &);
void set_selected_regionview_from_region_list (boost::shared_ptr<ARDOUR::Region> region, Selection::Operation op = Selection::Set);
void set_selected_regionview_from_region_list (std::shared_ptr<ARDOUR::Region> region, Selection::Operation op = Selection::Set);
void remove_tracks ();
@ -337,7 +337,7 @@ public:
void loudness_assistant_marker ();
void measure_master_loudness (samplepos_t start, samplepos_t end, bool);
bool process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr<ARDOUR::MidiRegion> midi_region);
bool process_midi_export_dialog (MidiExportDialog& dialog, std::shared_ptr<ARDOUR::MidiRegion> midi_region);
void set_zoom_focus (Editing::ZoomFocus);
Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; }
@ -353,7 +353,7 @@ public:
/* stuff that AudioTimeAxisView and related classes use */
void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>);
void clear_playlist (std::shared_ptr<ARDOUR::Playlist>);
void clear_grouped_playlists (RouteUI* v);
@ -472,25 +472,25 @@ public:
ARDOUR::MidiTrackNameSource mts,
ARDOUR::MidiTempoMapDisposition mtd,
Temporal::timepos_t& pos,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>(),
boost::shared_ptr<ARDOUR::Track> track = boost::shared_ptr<ARDOUR::Track>(),
std::shared_ptr<ARDOUR::PluginInfo> instrument = std::shared_ptr<ARDOUR::PluginInfo>(),
std::shared_ptr<ARDOUR::Track> track = std::shared_ptr<ARDOUR::Track>(),
bool with_markers = false);
void do_embed (std::vector<std::string> paths,
Editing::ImportDisposition disposition,
Editing::ImportMode mode,
Temporal::timepos_t& pos,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>(),
boost::shared_ptr<ARDOUR::Track> track = boost::shared_ptr<ARDOUR::Track>());
std::shared_ptr<ARDOUR::PluginInfo> instrument = std::shared_ptr<ARDOUR::PluginInfo>(),
std::shared_ptr<ARDOUR::Track> track = std::shared_ptr<ARDOUR::Track>());
void get_regionview_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
void get_regionview_corresponding_to (std::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
void get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const;
void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >&) const;
void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<std::shared_ptr<Evoral::Note<Temporal::Beats> > > > >&) const;
void center_screen (samplepos_t);
TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
TrackViewList axis_views_from_routes (std::shared_ptr<ARDOUR::RouteList>) const;
void snap_to (Temporal::timepos_t & first,
Temporal::RoundMode direction = Temporal::RoundNearest,
@ -533,8 +533,8 @@ public:
Gdk::Cursor* get_canvas_cursor () const;
void set_current_trimmable (boost::shared_ptr<ARDOUR::Trimmable>);
void set_current_movable (boost::shared_ptr<ARDOUR::Movable>);
void set_current_trimmable (std::shared_ptr<ARDOUR::Trimmable>);
void set_current_movable (std::shared_ptr<ARDOUR::Movable>);
MouseCursors const* cursors () const {
return _cursors;
@ -552,7 +552,7 @@ public:
/** Context for mouse entry (stored in a stack). */
struct EnterContext {
ItemType item_type;
boost::shared_ptr<CursorContext> cursor_ctx;
std::shared_ptr<CursorContext> cursor_ctx;
};
/** Get the topmost enter context for the given item type.
@ -591,7 +591,7 @@ public:
/* editing operations that need to be public */
void mouse_add_new_marker (Temporal::timepos_t where, ARDOUR::Location::Flags extra_flags = ARDOUR::Location::Flags (0), int32_t cue_id = 0);
void split_regions_at (Temporal::timepos_t const & , RegionSelection&);
void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false);
void split_region_at_points (std::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false);
RegionSelection get_regions_from_selection_and_mouse (Temporal::timepos_t const &);
void do_remove_gaps ();
void remove_gaps (Temporal::timecnt_t const & threshold, Temporal::timecnt_t const & leave, bool markers_too);
@ -609,11 +609,11 @@ public:
bool should_ripple () const;
bool should_ripple_all () const; /* RippleAll will ripple all similar regions and the timeline markers */
void do_ripple (boost::shared_ptr<ARDOUR::Playlist>, Temporal::timepos_t const &, Temporal::timecnt_t const &, ARDOUR::RegionList* exclude, bool add_to_command);
void do_ripple (boost::shared_ptr<ARDOUR::Playlist>, Temporal::timepos_t const &, Temporal::timecnt_t const &, boost::shared_ptr<ARDOUR::Region> exclude, bool add_to_command);
void ripple_marks (boost::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t at, Temporal::timecnt_t const & distance);
void get_markers_to_ripple (boost::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t const & pos, std::vector<ArdourMarker*>& markers);
Temporal::timepos_t effective_ripple_mark_start (boost::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t pos);
void do_ripple (std::shared_ptr<ARDOUR::Playlist>, Temporal::timepos_t const &, Temporal::timecnt_t const &, ARDOUR::RegionList* exclude, bool add_to_command);
void do_ripple (std::shared_ptr<ARDOUR::Playlist>, Temporal::timepos_t const &, Temporal::timecnt_t const &, std::shared_ptr<ARDOUR::Region> exclude, bool add_to_command);
void ripple_marks (std::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t at, Temporal::timecnt_t const & distance);
void get_markers_to_ripple (std::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t const & pos, std::vector<ArdourMarker*>& markers);
Temporal::timepos_t effective_ripple_mark_start (std::shared_ptr<ARDOUR::Playlist> target_playlist, Temporal::timepos_t pos);
void add_region_marker ();
void clear_region_markers ();
@ -807,8 +807,8 @@ private:
void get_equivalent_regions (RegionView* rv, std::vector<RegionView*> &, PBD::PropertyID) const;
void get_all_equivalent_regions (RegionView* rv, std::vector<RegionView*> &) const;
RegionSelection get_equivalent_regions (RegionSelection &, PBD::PropertyID) const;
RegionView* regionview_from_region (boost::shared_ptr<ARDOUR::Region>) const;
RouteTimeAxisView* rtav_from_route (boost::shared_ptr<ARDOUR::Route>) const;
RegionView* regionview_from_region (std::shared_ptr<ARDOUR::Region>) const;
RouteTimeAxisView* rtav_from_route (std::shared_ptr<ARDOUR::Route>) const;
void mapover_tracks_with_unique_playlists (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*, PBD::PropertyID) const;
void mapover_all_tracks_with_unique_playlists (sigc::slot<void,RouteTimeAxisView&,uint32_t>) const;
@ -819,8 +819,8 @@ private:
void mapover_selected_routes (sigc::slot<void, RouteUI&> sl) const;
void mapover_all_routes (sigc::slot<void, RouteUI&> sl) const;
void mapped_select_playlist_matching (RouteUI&, boost::weak_ptr<ARDOUR::Playlist> pl);
void mapped_use_new_playlist (RouteUI&, std::string name, std::string gid, bool copy, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_select_playlist_matching (RouteUI&, std::weak_ptr<ARDOUR::Playlist> pl);
void mapped_use_new_playlist (RouteUI&, std::string name, std::string gid, bool copy, std::vector<std::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_clear_playlist (RouteUI&);
void new_playlists_for_all_tracks(bool copy);
@ -844,7 +844,7 @@ private:
void set_selected_track_as_side_effect (Selection::Operation op, PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup);
bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set);
bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>);
bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, std::weak_ptr<ARDOUR::Region>);
void collect_new_region_view (RegionView*);
void collect_and_select_new_region_view (RegionView*);
@ -861,7 +861,7 @@ private:
Gtk::Menu* build_track_selection_context_menu ();
void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&);
void add_bus_context_items (Gtk::Menu_Helpers::MenuList&);
void add_region_context_items (Gtk::Menu_Helpers::MenuList&, boost::shared_ptr<ARDOUR::Track>);
void add_region_context_items (Gtk::Menu_Helpers::MenuList&, std::shared_ptr<ARDOUR::Track>);
void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
Gtk::MenuItem* _popup_region_menu_item;
@ -1124,7 +1124,7 @@ private:
void select_all_selectables_between (bool within);
void select_range_between ();
boost::shared_ptr<ARDOUR::Region> find_next_region (Temporal::timepos_t const &, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView** = 0);
std::shared_ptr<ARDOUR::Region> find_next_region (Temporal::timepos_t const &, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView** = 0);
Temporal::timepos_t find_next_region_boundary (Temporal::timepos_t const &, int32_t dir, const TrackViewList&);
std::vector<Temporal::timepos_t> region_boundary_cache;
@ -1231,10 +1231,10 @@ private:
std::pair<TimeAxisView*, double> trackview_by_y_position (double, bool trackview_relative_offset = true) const;
AxisView* axis_view_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
AxisView* axis_view_by_control (boost::shared_ptr<ARDOUR::AutomationControl>) const;
AxisView* axis_view_by_stripable (std::shared_ptr<ARDOUR::Stripable>) const;
AxisView* axis_view_by_control (std::shared_ptr<ARDOUR::AutomationControl>) const;
TimeAxisView* time_axis_view_from_stripable (boost::shared_ptr<ARDOUR::Stripable> s) const {
TimeAxisView* time_axis_view_from_stripable (std::shared_ptr<ARDOUR::Stripable> s) const {
return dynamic_cast<TimeAxisView*> (axis_view_by_stripable (s));
}
@ -1263,10 +1263,10 @@ private:
samplepos_t cut_buffer_start;
samplecnt_t cut_buffer_length;
boost::shared_ptr<CursorContext> _press_cursor_ctx; ///< Button press cursor context
std::shared_ptr<CursorContext> _press_cursor_ctx; ///< Button press cursor context
boost::weak_ptr<ARDOUR::Trimmable> _trimmable;
boost::weak_ptr<ARDOUR::Movable> _movable;
std::weak_ptr<ARDOUR::Trimmable> _trimmable;
std::weak_ptr<ARDOUR::Movable> _movable;
bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
@ -1342,8 +1342,8 @@ private:
void remove_region_sync();
void align_regions (ARDOUR::RegionPoint);
void align_regions_relative (ARDOUR::RegionPoint point);
void align_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, Temporal::timepos_t const & position);
void align_region_internal (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, Temporal::timepos_t const & position);
void align_region (std::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, Temporal::timepos_t const & position);
void align_region_internal (std::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, Temporal::timepos_t const & position);
void recover_regions (ARDOUR::RegionList);
void remove_selected_regions ();
void remove_regions (const RegionSelection&, bool can_ripple, bool as_part_of_other_command);
@ -1358,7 +1358,7 @@ private:
void uncombine_regions ();
void region_fill_track ();
void audition_playlist_region_standalone (boost::shared_ptr<ARDOUR::Region>);
void audition_playlist_region_standalone (std::shared_ptr<ARDOUR::Region>);
void split_multichannel_region();
void reverse_region ();
void strip_region_silence ();
@ -1414,7 +1414,7 @@ private:
void keyboard_paste ();
void region_from_selection ();
void create_region_from_selection (std::vector<boost::shared_ptr<ARDOUR::Region> >&);
void create_region_from_selection (std::vector<std::shared_ptr<ARDOUR::Region> >&);
void play_from_start ();
void play_from_edit_point ();
@ -1455,11 +1455,11 @@ private:
Temporal::timepos_t& pos,
int target_regions,
int target_tracks,
boost::shared_ptr<ARDOUR::Track>& track,
std::shared_ptr<ARDOUR::Track>& track,
std::string const& pgroup_id,
bool replace,
bool with_markers,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
std::shared_ptr<ARDOUR::PluginInfo> instrument = std::shared_ptr<ARDOUR::PluginInfo>());
int embed_sndfiles (std::vector<std::string> paths,
bool multiple_files,
@ -1469,9 +1469,9 @@ private:
Temporal::timepos_t& pos,
int target_regions,
int target_tracks,
boost::shared_ptr<ARDOUR::Track>& track,
std::shared_ptr<ARDOUR::Track>& track,
std::string const& pgroup_id,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
std::shared_ptr<ARDOUR::PluginInfo> instrument = std::shared_ptr<ARDOUR::PluginInfo>());
int add_sources (std::vector<std::string> paths,
ARDOUR::SourceList& sources,
@ -1480,23 +1480,23 @@ private:
Editing::ImportMode mode,
int target_regions,
int target_tracks,
boost::shared_ptr<ARDOUR::Track>& track,
std::shared_ptr<ARDOUR::Track>& track,
std::string const& pgroup_id,
bool add_channel_suffix,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
std::shared_ptr<ARDOUR::PluginInfo> instrument = std::shared_ptr<ARDOUR::PluginInfo>());
int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region,
int finish_bringing_in_material (std::shared_ptr<ARDOUR::Region> region,
uint32_t in_chans,
uint32_t out_chans,
Temporal::timepos_t& pos,
Editing::ImportMode mode,
boost::shared_ptr<ARDOUR::Track>& existing_track,
std::shared_ptr<ARDOUR::Track>& existing_track,
std::string const& new_track_name,
std::string const& pgroup_id,
boost::shared_ptr<ARDOUR::PluginInfo> instrument);
std::shared_ptr<ARDOUR::PluginInfo> instrument);
boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
std::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
std::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
void toggle_midi_input_active (bool flip_others);
@ -1527,7 +1527,7 @@ private:
Temporal::timepos_t pos;
int target_tracks;
int target_regions;
boost::shared_ptr<ARDOUR::Track> track;
std::shared_ptr<ARDOUR::Track> track;
bool replace;
};
@ -1669,7 +1669,7 @@ private:
void fade_range ();
std::set<boost::shared_ptr<ARDOUR::Playlist> > motion_frozen_playlists;
std::set<std::shared_ptr<ARDOUR::Playlist> > motion_frozen_playlists;
bool _dragging_playhead;
@ -2175,7 +2175,7 @@ private:
};
int write_region_selection(RegionSelection&);
bool write_region (std::string path, boost::shared_ptr<ARDOUR::AudioRegion>);
bool write_region (std::string path, std::shared_ptr<ARDOUR::AudioRegion>);
void bounce_region_selection (bool with_processing);
void bounce_range_selection (BounceTarget, bool enable_processing);
void external_edit_region ();
@ -2197,7 +2197,7 @@ private:
void instant_save ();
bool no_save_instant;
boost::shared_ptr<ARDOUR::AudioRegion> last_audition_region;
std::shared_ptr<ARDOUR::AudioRegion> last_audition_region;
/* freeze operations */
@ -2247,7 +2247,7 @@ private:
MixerStrip *current_mixer_strip;
bool show_editor_mixer_when_tracks_arrive;
Gtk::VBox current_mixer_strip_vbox;
void cms_new (boost::shared_ptr<ARDOUR::Route>);
void cms_new (std::shared_ptr<ARDOUR::Route>);
void current_mixer_strip_hidden ();
#ifdef __APPLE__
@ -2278,11 +2278,11 @@ private:
Command* apply_midi_note_edit_op_to_region (ARDOUR::MidiOperator& op, MidiRegionView& mrv);
/* plugin setup */
int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
int plugin_setup (std::shared_ptr<ARDOUR::Route>, std::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
/* handling cleanup */
int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
int playlist_deletion_dialog (std::shared_ptr<ARDOUR::Playlist>);
PBD::ScopedConnectionList session_connections;
PBD::ScopedConnection tempo_map_connection;
@ -2513,7 +2513,7 @@ private:
}
template<typename T>
Temporal::TimeDomain drag_time_domain (boost::shared_ptr<T> thing_with_time_domain) {
Temporal::TimeDomain drag_time_domain (std::shared_ptr<T> thing_with_time_domain) {
return thing_with_time_domain ? thing_with_time_domain->time_domain() : Temporal::AudioTime;
}

76
gtk2_ardour/editor_audio_import.cc
View File

@ -153,7 +153,7 @@ Editor::session_import_dialog ()
dialog.run ();
}
typedef std::map<PBD::ID,boost::shared_ptr<ARDOUR::Source> > SourceMap;
typedef std::map<PBD::ID,std::shared_ptr<ARDOUR::Source> > SourceMap;
/**
* Updating is still disabled, see note in libs/ardour/import.cc Session::import_files()
@ -212,7 +212,7 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
return function;
}
boost::shared_ptr<AudioTrack>
std::shared_ptr<AudioTrack>
Editor::get_nth_selected_audio_track (int nth) const
{
AudioTimeAxisView* atv;
@ -236,13 +236,13 @@ Editor::get_nth_selected_audio_track (int nth) const
}
if (!atv || !atv->is_audio_track()) {
return boost::shared_ptr<AudioTrack>();
return std::shared_ptr<AudioTrack>();
}
return atv->audio_track();
}
boost::shared_ptr<MidiTrack>
std::shared_ptr<MidiTrack>
Editor::get_nth_selected_midi_track (int nth) const
{
MidiTimeAxisView* mtv;
@ -266,7 +266,7 @@ Editor::get_nth_selected_midi_track (int nth) const
}
if (!mtv || !mtv->is_midi_track()) {
return boost::shared_ptr<MidiTrack>();
return std::shared_ptr<MidiTrack>();
}
return mtv->midi_track();
@ -342,7 +342,7 @@ Editor::do_import (vector<string> paths,
MidiTempoMapDisposition smf_tempo_disposition,
timepos_t& pos,
ARDOUR::PluginInfoPtr instrument,
boost::shared_ptr<Track> track,
std::shared_ptr<Track> track,
bool with_markers)
{
vector<string> to_import;
@ -495,7 +495,7 @@ Editor::do_embed (vector<string> paths,
ImportMode mode,
timepos_t& pos,
ARDOUR::PluginInfoPtr instrument,
boost::shared_ptr<Track> track)
std::shared_ptr<Track> track)
{
bool check_sample_rate = true;
vector<string> to_embed;
@ -580,7 +580,7 @@ Editor::import_sndfiles (vector<string> paths,
timepos_t& pos,
int target_regions,
int target_tracks,
boost::shared_ptr<Track>& track,
std::shared_ptr<Track>& track,
std::string const& pgroup_id,
bool replace,
bool with_markers,
@ -655,11 +655,11 @@ Editor::embed_sndfiles (vector<string> paths,
timepos_t& pos,
int target_regions,
int target_tracks,
boost::shared_ptr<Track>& track,
std::shared_ptr<Track>& track,
std::string const& pgroup_id,
ARDOUR::PluginInfoPtr instrument)
{
boost::shared_ptr<AudioFileSource> source;
std::shared_ptr<AudioFileSource> source;
SourceList sources;
string linked_path;
SoundFileInfo finfo;
@ -747,17 +747,17 @@ Editor::embed_sndfiles (vector<string> paths,
/* check if we have this thing embedded already */
boost::shared_ptr<Source> s;
std::shared_ptr<Source> s;
if ((s = _session->audio_source_by_path_and_channel (path, n)) == 0) {
source = boost::dynamic_pointer_cast<AudioFileSource> (
source = std::dynamic_pointer_cast<AudioFileSource> (
SourceFactory::createExternal (DataType::AUDIO, *_session,
path, n,
Source::Flag (0),
true, true));
} else {
source = boost::dynamic_pointer_cast<AudioFileSource> (s);
source = std::dynamic_pointer_cast<AudioFileSource> (s);
}
sources.push_back(source);
@ -787,12 +787,12 @@ Editor::add_sources (vector<string> paths,
ImportMode mode,
int target_regions,
int target_tracks,
boost::shared_ptr<Track>& track,
std::shared_ptr<Track>& track,
std::string const& pgroup_id,
bool /*add_channel_suffix*/,
ARDOUR::PluginInfoPtr instrument)
{
vector<boost::shared_ptr<Region> > regions;
vector<std::shared_ptr<Region> > regions;
string region_name;
uint32_t input_chan = 0;
uint32_t output_chan = 0;
@ -828,10 +828,10 @@ Editor::add_sources (vector<string> paths,
plist.add (ARDOUR::Properties::external, true);
plist.add (ARDOUR::Properties::opaque, true);
boost::shared_ptr<Region> r = RegionFactory::create (sources, plist);
std::shared_ptr<Region> r = RegionFactory::create (sources, plist);
if (boost::dynamic_pointer_cast<AudioRegion>(r)) {
boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position(sources[0]->natural_position());
if (std::dynamic_pointer_cast<AudioRegion>(r)) {
std::dynamic_pointer_cast<AudioRegion>(r)->special_set_position(sources[0]->natural_position());
}
regions.push_back (r);
@ -855,7 +855,7 @@ Editor::add_sources (vector<string> paths,
just_one.clear ();
just_one.push_back (*x);
boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (*x);
std::shared_ptr<FileSource> fs = std::dynamic_pointer_cast<FileSource> (*x);
if (sources.size() > 1 && disposition == ImportDistinctChannels) {
@ -922,10 +922,10 @@ Editor::add_sources (vector<string> paths,
plist.add (ARDOUR::Properties::external, true);
plist.add (ARDOUR::Properties::opaque, true);
boost::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
std::shared_ptr<Region> r = RegionFactory::create (just_one, plist);
if (boost::dynamic_pointer_cast<AudioRegion>(r)) {
boost::dynamic_pointer_cast<AudioRegion>(r)->special_set_position((*x)->natural_position());
if (std::dynamic_pointer_cast<AudioRegion>(r)) {
std::dynamic_pointer_cast<AudioRegion>(r)->special_set_position((*x)->natural_position());
}
regions.push_back (r);
@ -966,16 +966,16 @@ Editor::add_sources (vector<string> paths,
*/
assert (regions.size() == track_names.size());
for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
for (vector<std::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (*r);
if (use_timestamp) {
if (ar) {
/* get timestamp for this region */
const boost::shared_ptr<Source> s (ar->sources().front());
const boost::shared_ptr<AudioSource> as = boost::dynamic_pointer_cast<AudioSource> (s);
const std::shared_ptr<Source> s (ar->sources().front());
const std::shared_ptr<AudioSource> as = std::dynamic_pointer_cast<AudioSource> (s);
assert (as);
@ -1024,18 +1024,18 @@ Editor::add_sources (vector<string> paths,
}
int
Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
Editor::finish_bringing_in_material (std::shared_ptr<Region> region,
uint32_t in_chans,
uint32_t out_chans,
timepos_t& pos,
ImportMode mode,
boost::shared_ptr<Track>& existing_track,
std::shared_ptr<Track>& existing_track,
string const& new_track_name,
string const& pgroup_id,
ARDOUR::PluginInfoPtr instrument)
{
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion>(region);
std::shared_ptr<MidiRegion> mr = std::dynamic_pointer_cast<MidiRegion>(region);
switch (mode) {
case ImportAsRegion:
@ -1057,8 +1057,8 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
}
}
boost::shared_ptr<Playlist> playlist = existing_track->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
std::shared_ptr<Playlist> playlist = existing_track->playlist();
std::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
playlist->clear_changes ();
playlist->clear_owned_changes ();
playlist->add_region (copy, pos);
@ -1078,7 +1078,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
{
if (!existing_track) {
if (ar) {
list<boost::shared_ptr<AudioTrack> > at (
list<std::shared_ptr<AudioTrack> > at (
_session->new_audio_track (in_chans, out_chans,
0, 1, string(),
PresentationInfo::max_order,
@ -1089,7 +1089,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
if (at.empty()) {
return -1;
}
for (list<boost::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
for (list<std::shared_ptr<AudioTrack> >::iterator i = at.begin(); i != at.end(); ++i) {
if (Config->get_strict_io ()) {
(*i)->set_strict_io (true);
}
@ -1098,7 +1098,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
existing_track = at.front();
} else if (mr) {
list<boost::shared_ptr<MidiTrack> > mt (
list<std::shared_ptr<MidiTrack> > mt (
_session->new_midi_track (ChanCount (DataType::MIDI, 1),
ChanCount (DataType::MIDI, 1),
Config->get_strict_io () || Profile->get_mixbus (),
@ -1116,7 +1116,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
return -1;
}
for (list<boost::shared_ptr<MidiTrack> >::iterator i = mt.begin(); i != mt.end(); ++i) {
for (list<std::shared_ptr<MidiTrack> >::iterator i = mt.begin(); i != mt.end(); ++i) {
if (Config->get_strict_io ()) {
(*i)->set_strict_io (true);
}
@ -1134,7 +1134,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
}
if (mode == ImportAsTrigger) {
boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
std::shared_ptr<Region> copy (RegionFactory::create (region, true));
for (int s = 0; s < TriggerBox::default_triggers_per_box; ++s) {
if (!existing_track->triggerbox ()->trigger (s)->region ()) {
existing_track->triggerbox ()->set_from_selection (s, copy);
@ -1145,7 +1145,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region,
}
}
} else {
boost::shared_ptr<Playlist> playlist = existing_track->playlist();
std::shared_ptr<Playlist> playlist = existing_track->playlist();
playlist->clear_changes ();
playlist->add_region (region, pos);
_session->add_command (new StatefulDiffCommand (playlist));

10
gtk2_ardour/editor_canvas.cc
View File

@ -455,13 +455,13 @@ Editor::drop_paths_part_two (const vector<string>& paths, timepos_t const & p, d
if (tv->track()) {
do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack,
SrcBest, SMFTrackNumber, SMFTempoIgnore, pos, boost::shared_ptr<ARDOUR::PluginInfo>(), tv->track ());
SrcBest, SMFTrackNumber, SMFTempoIgnore, pos, std::shared_ptr<ARDOUR::PluginInfo>(), tv->track ());
if (UIConfiguration::instance().get_only_copy_imported_files() || copy) {
do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack,
SrcBest, SMFTrackName, SMFTempoIgnore, pos, boost::shared_ptr<PluginInfo>(), tv->track ());
SrcBest, SMFTrackName, SMFTempoIgnore, pos, std::shared_ptr<PluginInfo>(), tv->track ());
} else {
do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, pos, boost::shared_ptr<ARDOUR::PluginInfo>(), tv->track ());
do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, pos, std::shared_ptr<ARDOUR::PluginInfo>(), tv->track ());
}
}
}
@ -629,9 +629,9 @@ Editor::session_gui_extents (bool use_extra) const
* NOTE: we should listen to playlists, and cache these values so we don't calculate them every time.
*/
{
boost::shared_ptr<RouteList> rl = _session->get_routes();
std::shared_ptr<RouteList> rl = _session->get_routes();
for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*r);
std::shared_ptr<Track> tr = std::dynamic_pointer_cast<Track> (*r);
if (!tr) {
continue;

24
gtk2_ardour/editor_canvas_events.cc
View File

@ -647,7 +647,7 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
}
struct DescendingRegionLayerSorter {
bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
bool operator()(std::shared_ptr<Region> a, std::shared_ptr<Region> b) {
return a->layer() > b->layer();
}
};
@ -1152,8 +1152,8 @@ Editor::canvas_drop_zone_event (GdkEvent* event)
bool
Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context, int x, int y, guint time)
{
boost::shared_ptr<Region> region;
boost::shared_ptr<Region> region_copy;
std::shared_ptr<Region> region;
std::shared_ptr<Region> region_copy;
RouteTimeAxisView* rtav;
GdkEvent event;
double px;
@ -1250,7 +1250,7 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
samplepos_t const pos = window_event_sample (&event, &px, &py);
PBD::ID rid (data.get_data_as_string ());
boost::shared_ptr<Region> region = RegionFactory::region_by_id (rid);
std::shared_ptr<Region> region = RegionFactory::region_by_id (rid);
if (!region) { return; }
@ -1261,20 +1261,20 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
rtav = dynamic_cast<RouteTimeAxisView*> (tv.first);
} else {
try {
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
if (std::dynamic_pointer_cast<AudioRegion> (region)) {
uint32_t output_chan = region->sources().size();
if ((Config->get_output_auto_connect() & AutoConnectMaster) && session()->master_out()) {
output_chan = session()->master_out()->n_inputs().n_audio();
}
list<boost::shared_ptr<AudioTrack> > audio_tracks;
list<std::shared_ptr<AudioTrack> > audio_tracks;
audio_tracks = session()->new_audio_track (region->sources().size(), output_chan, 0, 1, region->name(), PresentationInfo::max_order);
rtav = dynamic_cast<RouteTimeAxisView*> (time_axis_view_from_stripable (audio_tracks.front()));
} else if (boost::dynamic_pointer_cast<MidiRegion> (region)) {
} else if (std::dynamic_pointer_cast<MidiRegion> (region)) {
ChanCount one_midi_port (DataType::MIDI, 1);
list<boost::shared_ptr<MidiTrack> > midi_tracks;
list<std::shared_ptr<MidiTrack> > midi_tracks;
midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port,
Config->get_strict_io () || Profile->get_mixbus (),
boost::shared_ptr<ARDOUR::PluginInfo>(),
std::shared_ptr<ARDOUR::PluginInfo>(),
(ARDOUR::Plugin::PresetRecord*) 0,
(ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true);
rtav = dynamic_cast<RouteTimeAxisView*> (time_axis_view_from_stripable (midi_tracks.front()));
@ -1288,10 +1288,10 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
}
if (rtav != 0 && rtav->is_track ()) {
boost::shared_ptr<Region> region_copy = RegionFactory::create (region, true);
std::shared_ptr<Region> region_copy = RegionFactory::create (region, true);
if ((boost::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 && dynamic_cast<AudioTimeAxisView*> (rtav) != 0) ||
(boost::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 && dynamic_cast<MidiTimeAxisView*> (rtav) != 0)) {
if ((std::dynamic_pointer_cast<AudioRegion> (region_copy) != 0 && dynamic_cast<AudioTimeAxisView*> (rtav) != 0) ||
(std::dynamic_pointer_cast<MidiRegion> (region_copy) != 0 && dynamic_cast<MidiTimeAxisView*> (rtav) != 0)) {
_drags->set (new RegionInsertDrag (this, region_copy, rtav, timepos_t (pos), drag_time_domain (region_copy.get())), &event);
_drags->end_grab (&event);
}

128
gtk2_ardour/editor_drag.cc
View File

@ -587,7 +587,7 @@ Drag::show_view_preview (timepos_t const & pos)
}
}
boost::shared_ptr<Region>
std::shared_ptr<Region>
Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
{
if (_editor->session()) {
@ -596,13 +596,13 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
return view->add_region (pos, len, commit);
}
return boost::shared_ptr<Region>();
return std::shared_ptr<Region>();
}
struct TimeAxisViewStripableSorter {
bool operator() (TimeAxisView* tav_a, TimeAxisView* tav_b) {
boost::shared_ptr<ARDOUR::Stripable> const& a = tav_a->stripable ();
boost::shared_ptr<ARDOUR::Stripable> const& b = tav_b->stripable ();
std::shared_ptr<ARDOUR::Stripable> const& a = tav_a->stripable ();
std::shared_ptr<ARDOUR::Stripable> const& b = tav_b->stripable ();
return ARDOUR::Stripable::Sorter () (a, b);
}
};
@ -1251,7 +1251,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
return;
}
typedef map<boost::shared_ptr<Playlist>, double> PlaylistDropzoneMap;
typedef map<std::shared_ptr<Playlist>, double> PlaylistDropzoneMap;
PlaylistDropzoneMap playlist_dropzone_map;
_ndropzone = 0; // number of elements currently in the dropzone
@ -1548,8 +1548,8 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move)
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv);
const boost::shared_ptr<const Region> original = rv->region();
boost::shared_ptr<Region> region_copy;
const std::shared_ptr<const Region> original = rv->region();
std::shared_ptr<Region> region_copy;
region_copy = RegionFactory::create (original, true);
@ -1561,13 +1561,13 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move)
RegionView* nrv;
if (arv) {
boost::shared_ptr<AudioRegion> audioregion_copy
= boost::dynamic_pointer_cast<AudioRegion>(region_copy);
std::shared_ptr<AudioRegion> audioregion_copy
= std::dynamic_pointer_cast<AudioRegion>(region_copy);
nrv = new AudioRegionView (*arv, audioregion_copy);
} else if (mrv) {
boost::shared_ptr<MidiRegion> midiregion_copy
= boost::dynamic_pointer_cast<MidiRegion>(region_copy);
std::shared_ptr<MidiRegion> midiregion_copy
= std::dynamic_pointer_cast<MidiRegion>(region_copy);
nrv = new MidiRegionView (*mrv, midiregion_copy);
} else {
continue;
@ -1692,7 +1692,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
}
RouteTimeAxisView*
RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region, TimeAxisView* original)
RegionMoveDrag::create_destination_time_axis (std::shared_ptr<Region> region, TimeAxisView* original)
{
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
return NULL;
@ -1703,8 +1703,8 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
*/
TimeAxisView* tav = 0;
try {
if (boost::dynamic_pointer_cast<AudioRegion> (region)) {
list<boost::shared_ptr<AudioTrack> > audio_tracks;
if (std::dynamic_pointer_cast<AudioRegion> (region)) {
list<std::shared_ptr<AudioTrack> > audio_tracks;
uint32_t output_chan = region->sources().size();
if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) {
output_chan = _editor->session()->master_out()->n_inputs().n_audio();
@ -1713,10 +1713,10 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
tav =_editor->time_axis_view_from_stripable (audio_tracks.front());
} else {
ChanCount one_midi_port (DataType::MIDI, 1);
list<boost::shared_ptr<MidiTrack> > midi_tracks;
list<std::shared_ptr<MidiTrack> > midi_tracks;
midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port,
Config->get_strict_io () || Profile->get_mixbus (),
boost::shared_ptr<ARDOUR::PluginInfo>(),
std::shared_ptr<ARDOUR::PluginInfo>(),
(ARDOUR::Plugin::PresetRecord*) 0,
(ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true);
tav = _editor->time_axis_view_from_stripable (midi_tracks.front());
@ -1761,7 +1761,7 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const changed_t
return;
}
typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
typedef map<std::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
PlaylistMapping playlist_mapping;
/* determine boundaries of dragged regions, across all playlists */
@ -1880,13 +1880,13 @@ RegionMoveDrag::finished_no_copy (
timecnt_t const drag_delta = last_position.distance (_primary->region()->position());
RegionList ripple_exclude;
typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
typedef map<std::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping;
PlaylistMapping playlist_mapping;
/* determine earliest position affected by the drag, across all playlists */
timepos_t extent_min = timepos_t::max (Temporal::AudioTime); /* NUTEMPO fix domain */
std::set<boost::shared_ptr<const Region> > uniq;
std::set<std::shared_ptr<const Region> > uniq;
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) {
RegionView* rv = i->view;
@ -1981,7 +1981,7 @@ RegionMoveDrag::finished_no_copy (
} else {
boost::shared_ptr<Playlist> playlist = dest_rtv->playlist();
std::shared_ptr<Playlist> playlist = dest_rtv->playlist();
/* this movement may result in a crossfade being modified, or a layering change,
so we need to get undo data from the playlist as well as the region.
@ -2055,7 +2055,7 @@ RegionMoveDrag::finished_no_copy (
}
}
for (set<boost::shared_ptr<Playlist> >::iterator p = frozen_playlists.begin(); p != frozen_playlists.end(); ++p) {
for (set<std::shared_ptr<Playlist> >::iterator p = frozen_playlists.begin(); p != frozen_playlists.end(); ++p) {
(*p)->thaw();
}
@ -2096,12 +2096,12 @@ RegionMoveDrag::finished_no_copy (
*/
void
RegionMoveDrag::remove_region_from_playlist (
boost::shared_ptr<Region> region,
boost::shared_ptr<Playlist> playlist,
std::shared_ptr<Region> region,
std::shared_ptr<Playlist> playlist,
PlaylistSet& modified_playlists
)
{
pair<set<boost::shared_ptr<Playlist> >::iterator, bool> r = modified_playlists.insert (playlist);
pair<set<std::shared_ptr<Playlist> >::iterator, bool> r = modified_playlists.insert (playlist);
if (r.second) {
playlist->clear_changes ();
@ -2125,14 +2125,14 @@ RegionMoveDrag::remove_region_from_playlist (
*/
RegionView *
RegionMoveDrag::insert_region_into_playlist (
boost::shared_ptr<Region> region,
std::shared_ptr<Region> region,
RouteTimeAxisView* dest_rtv,
layer_t dest_layer,
timepos_t const & where,
PlaylistSet& modified_playlists
)
{
boost::shared_ptr<Playlist> dest_playlist = dest_rtv->playlist ();
std::shared_ptr<Playlist> dest_playlist = dest_rtv->playlist ();
if (!dest_playlist) {
return 0;
}
@ -2229,13 +2229,13 @@ RegionMoveDrag::setup_pointer_offset ()
_pointer_offset = timecnt_t (_last_position.distance (raw_grab_time()), _last_position);
}
RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr<Region> r, RouteTimeAxisView* v, timepos_t const & pos, Temporal::TimeDomain td)
RegionInsertDrag::RegionInsertDrag (Editor* e, std::shared_ptr<Region> r, RouteTimeAxisView* v, timepos_t const & pos, Temporal::TimeDomain td)
: RegionMotionDrag (e, 0, 0, list<RegionView*> (), td)
{
DEBUG_TRACE (DEBUG::Drags, "New RegionInsertDrag\n");
assert ((boost::dynamic_pointer_cast<AudioRegion> (r) && dynamic_cast<AudioTimeAxisView*> (v)) ||
(boost::dynamic_pointer_cast<MidiRegion> (r) && dynamic_cast<MidiTimeAxisView*> (v)));
assert ((std::dynamic_pointer_cast<AudioRegion> (r) && dynamic_cast<AudioTimeAxisView*> (v)) ||
(std::dynamic_pointer_cast<MidiRegion> (r) && dynamic_cast<MidiTimeAxisView*> (v)));
_primary = v->view()->create_region_view (r, false, false);
@ -2259,7 +2259,7 @@ RegionInsertDrag::finished (GdkEvent * event, bool)
_primary->get_canvas_group()->reparent (dest_rtv->view()->region_canvas());
_primary->get_canvas_group()->set_y_position (0);
boost::shared_ptr<Playlist> playlist = dest_rtv->playlist();
std::shared_ptr<Playlist> playlist = dest_rtv->playlist();
_editor->begin_reversible_command (Operations::insert_region);
playlist->clear_changes ();
@ -2771,7 +2771,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
{
RegionView* rv = _primary;
pair<set<boost::shared_ptr<Playlist> >::iterator,bool> insert_result;
pair<set<std::shared_ptr<Playlist> >::iterator,bool> insert_result;
timecnt_t delta;
timepos_t adj_time = adjusted_time (_drags->current_pointer_time () + snap_delta (event->button.state), event, true);
timecnt_t dt = raw_grab_time().distance (adj_time) + _pointer_offset - snap_delta (event->button.state);
@ -2809,7 +2809,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
arv->drag_start ();
}
boost::shared_ptr<Playlist> pl = rv->region()->playlist();
std::shared_ptr<Playlist> pl = rv->region()->playlist();
insert_result = _editor->motion_frozen_playlists.insert (pl);
if (insert_result.second) {
@ -2819,9 +2819,9 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (rv);
/* a MRV start trim may change the source length. ensure we cover all playlists here */
if (mrv && _operation == StartTrim) {
vector<boost::shared_ptr<Playlist> > all_playlists;
vector<std::shared_ptr<Playlist> > all_playlists;
_editor->session()->playlists()->get (all_playlists);
for (vector<boost::shared_ptr<Playlist> >::iterator x = all_playlists.begin(); x != all_playlists.end(); ++x) {
for (vector<std::shared_ptr<Playlist> >::iterator x = all_playlists.begin(); x != all_playlists.end(); ++x) {
if ((*x)->uses_source (rv->region()->source(0))) {
insert_result = _editor->motion_frozen_playlists.insert (*x);
@ -2854,7 +2854,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (!arv) continue;
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
if (ar->locked()) continue;
samplecnt_t len = ar->fade_in()->back()->when.samples();
if (len < dts) dts = min(dts, len);
@ -2864,7 +2864,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (!arv) continue;
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
if (ar->locked()) continue;
samplecnt_t len = ar->fade_out()->back()->when.samples();
if (len < -dts) dts = max(dts, -len);
@ -2882,7 +2882,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
if (changed && _preserve_fade_anchor) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (arv) {
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
samplecnt_t len = ar->fade_in()->back()->when.samples();
samplecnt_t diff = ar->first_sample() - i->initial_position.samples();
samplepos_t new_length = len - diff;
@ -2901,7 +2901,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
if (changed && _preserve_fade_anchor) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (arv) {
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
samplecnt_t len = ar->fade_out()->back()->when.samples();
samplecnt_t diff = 1 + ar->last_sample() - i->initial_end.samples();
samplepos_t new_length = len + diff;
@ -2944,7 +2944,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
if (_preserve_fade_anchor && i->anchored_fade_length) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (arv) {
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
arv->reset_fade_in_shape_width (ar, i->anchored_fade_length);
ar->set_fade_in_length(i->anchored_fade_length);
ar->set_fade_in_active(true);
@ -2959,7 +2959,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
if (_preserve_fade_anchor && i->anchored_fade_length) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
if (arv) {
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
arv->reset_fade_out_shape_width (ar, i->anchored_fade_length);
ar->set_fade_out_length(i->anchored_fade_length);
ar->set_fade_out_active(true);
@ -2979,7 +2979,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
}
}
for (set<boost::shared_ptr<Playlist> >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) {
for (set<std::shared_ptr<Playlist> >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) {
/* Trimming one region may affect others on the playlist, so we need
to get undo Commands from the whole playlist rather than just the
region. Use motion_frozen_playlists (a set) to make sure we don't
@ -4030,7 +4030,7 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
Drag::start_grab (event, cursor);
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (_primary);
boost::shared_ptr<AudioRegion> const r = arv->audio_region ();
std::shared_ptr<AudioRegion> const r = arv->audio_region ();
setup_snap_delta (r->position());
show_verbose_cursor_duration (r->position(), r->position() + r->fade_in()->back()->when, 32);
@ -4041,7 +4041,7 @@ void
FadeInDrag::setup_pointer_offset ()
{
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (_primary);
boost::shared_ptr<AudioRegion> const r = arv->audio_region ();
std::shared_ptr<AudioRegion> const r = arv->audio_region ();
_pointer_offset = (r->fade_in()->back()->when + r->position()).distance (raw_grab_time());
}
@ -4055,7 +4055,7 @@ FadeInDrag::motion (GdkEvent* event, bool first_motion)
samplepos_t pos = tpos.samples ();
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (_primary->region ());
samplecnt_t fade_length;
@ -4100,7 +4100,7 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred)
samplepos_t pos = tpos.samples ();
samplecnt_t fade_length;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (_primary->region ());
if (pos < (region->position_sample() + 64)) {
fade_length = 64; // this should be a minimum defined somewhere
@ -4122,7 +4122,7 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred)
tmp->drag_end ();
boost::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_in();
std::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_in();
XMLNode &before = alist->get_state();
tmp->audio_region()->set_fade_in_length (fade_length);
@ -4169,7 +4169,7 @@ FadeOutDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
Drag::start_grab (event, cursor);
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (_primary);
boost::shared_ptr<AudioRegion> r = arv->audio_region ();
std::shared_ptr<AudioRegion> r = arv->audio_region ();
setup_snap_delta (r->nt_last());
show_verbose_cursor_duration (r->nt_last().earlier (r->fade_out()->back()->when), r->nt_last());
@ -4180,7 +4180,7 @@ void
FadeOutDrag::setup_pointer_offset ()
{
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (_primary);
boost::shared_ptr<AudioRegion> r = arv->audio_region ();
std::shared_ptr<AudioRegion> r = arv->audio_region ();
_pointer_offset = (r->position() + (r->length() - r->fade_out()->back()->when)).distance (raw_grab_time());
}
@ -4195,7 +4195,7 @@ FadeOutDrag::motion (GdkEvent* event, bool first_motion)
samplepos_t pos (tpos.samples());
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (_primary->region ());
if (pos > (region->last_sample() - 64)) {
fade_length = 64; // this should really be a minimum fade defined somewhere
@ -4239,7 +4239,7 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred)
samplecnt_t fade_length;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (_primary->region ());
if (pos > (region->last_sample() - 64)) {
fade_length = 64; // this should really be a minimum fade defined somewhere
@ -4261,7 +4261,7 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred)
tmp->drag_end ();
boost::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_out();
std::shared_ptr<AutomationList> alist = tmp->audio_region()->fade_out();
XMLNode &before = alist->get_state();
tmp->audio_region()->set_fade_out_length (fade_length);
@ -6298,7 +6298,7 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, list<RegionView*> cons
{
DEBUG_TRACE (DEBUG::Drags, "New AutomationRangeDrag\n");
list<boost::shared_ptr<AutomationLine> > lines;
list<std::shared_ptr<AutomationLine> > lines;
for (list<RegionView*>::const_iterator i = v.begin(); i != v.end(); ++i) {
if (AudioRegionView* audio_view = dynamic_cast<AudioRegionView*>(*i)) {
@ -6317,12 +6317,12 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, list<RegionView*> cons
* @param offset Offset from the session start to the points in the AutomationLines.
*/
void
AutomationRangeDrag::setup (list<boost::shared_ptr<AutomationLine> > const & lines)
AutomationRangeDrag::setup (list<std::shared_ptr<AutomationLine> > const & lines)
{
/* find the lines that overlap the ranges being dragged */
list<boost::shared_ptr<AutomationLine> >::const_iterator i = lines.begin ();
list<std::shared_ptr<AutomationLine> >::const_iterator i = lines.begin ();
while (i != lines.end ()) {
list<boost::shared_ptr<AutomationLine> >::const_iterator j = i;
list<std::shared_ptr<AutomationLine> >::const_iterator j = i;
++j;
pair<timepos_t, timepos_t> r = (*i)->get_point_x_range ();
@ -6367,7 +6367,7 @@ AutomationRangeDrag::y_fraction (double global_y) const
}
double
AutomationRangeDrag::value (boost::shared_ptr<AutomationList> list, timepos_t const & x) const
AutomationRangeDrag::value (std::shared_ptr<AutomationList> list, timepos_t const & x) const
{
if (list->size () == 0) {
return _initial_value;
@ -6426,7 +6426,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move)
continue;
}
boost::shared_ptr<AutomationList> the_list = j->line->the_list ();
std::shared_ptr<AutomationList> the_list = j->line->the_list ();
/* j is the line that this audio range starts in; fade into it;
* 64 samples length plucked out of thin air.
@ -6471,7 +6471,7 @@ AutomationRangeDrag::motion (GdkEvent*, bool first_move)
continue;
}
boost::shared_ptr<AutomationList> the_list = j->line->the_list ();
std::shared_ptr<AutomationList> the_list = j->line->the_list ();
/* j is the line that this audio range starts in; fade out of it;
* 64 samples length plucked out of thin air.
@ -6606,7 +6606,7 @@ void
PatchChangeDrag::motion (GdkEvent* ev, bool)
{
timepos_t f = adjusted_current_time (ev);
boost::shared_ptr<Region> r = _region_view->region ();
std::shared_ptr<Region> r = _region_view->region ();
f = max (f, r->position ());
f = min (f, r->nt_last ());
@ -6626,7 +6626,7 @@ PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred)
return;
}
boost::shared_ptr<Region> r (_region_view->region ());
std::shared_ptr<Region> r (_region_view->region ());
timepos_t f = adjusted_current_time (ev);
f = max (f, r->position ());
f = min (f, r->nt_last ());
@ -6643,7 +6643,7 @@ PatchChangeDrag::aborted (bool)
void
PatchChangeDrag::setup_pointer_offset ()
{
boost::shared_ptr<Region> region = _region_view->region ();
std::shared_ptr<Region> region = _region_view->region ();
_pointer_offset = region->source_beats_to_absolute_time (_patch_change->patch()->time()).distance (raw_grab_time());
}
@ -6861,7 +6861,7 @@ HitCreateDrag::finished (GdkEvent* event, bool had_movement)
return;
}
boost::shared_ptr<MidiRegion> mr = _region_view->midi_region();
std::shared_ptr<MidiRegion> mr = _region_view->midi_region();
timepos_t pos (_drags->current_pointer_time());
_editor->snap_to (pos, RoundNearest, SnapToGrid_Scaled);
@ -6914,7 +6914,7 @@ CrossfadeEdgeDrag::motion (GdkEvent*, bool)
timecnt_t new_length;
timecnt_t len;
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
if (start) {
distance = _drags->current_pointer_x() - grab_x();
@ -6946,7 +6946,7 @@ CrossfadeEdgeDrag::finished (GdkEvent*, bool)
timecnt_t new_length;
timecnt_t len;
boost::shared_ptr<AudioRegion> ar (arv->audio_region());
std::shared_ptr<AudioRegion> ar (arv->audio_region());
if (start) {
distance = _drags->current_pointer_x() - grab_x();

24
gtk2_ardour/editor_drag.h
View File

@ -296,7 +296,7 @@ protected:
/* sets snap delta from unsnapped pos */
void setup_snap_delta (Temporal::timepos_t const & pos);
boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*, bool commit);
std::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*, bool commit);
void show_verbose_cursor_time (Temporal::timepos_t const &);
void show_verbose_cursor_duration (Temporal::timepos_t const & , Temporal::timepos_t const & , double xoffset = 0);
@ -363,7 +363,7 @@ public:
Temporal::timepos_t initial_position; ///< initial position of the region
Temporal::timepos_t initial_end; ///< initial end position of the region
samplepos_t anchored_fade_length; ///< fade_length when anchored during drag
boost::shared_ptr<ARDOUR::Playlist> initial_playlist;
std::shared_ptr<ARDOUR::Playlist> initial_playlist;
TimeAxisView* initial_time_axis_view;
};
@ -393,7 +393,7 @@ protected:
friend class DraggingView;
protected:
typedef std::set<boost::shared_ptr<ARDOUR::Playlist> > PlaylistSet;
typedef std::set<std::shared_ptr<ARDOUR::Playlist> > PlaylistSet;
void add_stateful_diff_commands_for_playlists (PlaylistSet const &);
private:
@ -511,7 +511,7 @@ private:
);
RegionView* insert_region_into_playlist (
boost::shared_ptr<ARDOUR::Region>,
std::shared_ptr<ARDOUR::Region>,
RouteTimeAxisView*,
ARDOUR::layer_t,
Temporal::timepos_t const &,
@ -519,14 +519,14 @@ private:
);
void remove_region_from_playlist (
boost::shared_ptr<ARDOUR::Region>,
boost::shared_ptr<ARDOUR::Playlist>,
std::shared_ptr<ARDOUR::Region>,
std::shared_ptr<ARDOUR::Playlist>,
PlaylistSet& modified_playlists
);
void collect_new_region_view (RegionView *);
RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr<ARDOUR::Region>, TimeAxisView* original);
RouteTimeAxisView* create_destination_time_axis (std::shared_ptr<ARDOUR::Region>, TimeAxisView* original);
bool _copy;
RegionView* _new_region_view;
@ -536,7 +536,7 @@ private:
class RegionInsertDrag : public RegionMotionDrag
{
public:
RegionInsertDrag (Editor *, boost::shared_ptr<ARDOUR::Region>, RouteTimeAxisView*, Temporal::timepos_t const &, Temporal::TimeDomain);
RegionInsertDrag (Editor *, std::shared_ptr<ARDOUR::Region>, RouteTimeAxisView*, Temporal::timepos_t const &, Temporal::TimeDomain);
void finished (GdkEvent *, bool);
void aborted (bool);
@ -573,7 +573,7 @@ public:
private:
MidiTimeAxisView* _view;
boost::shared_ptr<ARDOUR::Region> _region;
std::shared_ptr<ARDOUR::Region> _region;
};
/** Drags to resize MIDI notes */
@ -1401,15 +1401,15 @@ public:
}
private:
void setup (std::list<boost::shared_ptr<AutomationLine> > const &);
void setup (std::list<std::shared_ptr<AutomationLine> > const &);
double y_fraction (double global_y_position) const;
double value (boost::shared_ptr<ARDOUR::AutomationList> list, Temporal::timepos_t const & x) const;
double value (std::shared_ptr<ARDOUR::AutomationList> list, Temporal::timepos_t const & x) const;
std::list<ARDOUR::TimelineRange> _ranges;
/** A line that is part of the drag */
struct Line {
boost::shared_ptr<AutomationLine> line; ///< the line
std::shared_ptr<AutomationLine> line; ///< the line
std::list<ControlPoint*> points; ///< points to drag on the line
std::pair<Temporal::timepos_t, Temporal::timepos_t> range; ///< the range of all points on the line, in session time
XMLNode* state; ///< the XML state node before the drag

52
gtk2_ardour/editor_export_audio.cc
View File

@ -202,7 +202,7 @@ Editor::export_range ()
}
bool
Editor::process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr<MidiRegion> midi_region)
Editor::process_midi_export_dialog (MidiExportDialog& dialog, std::shared_ptr<MidiRegion> midi_region)
{
string path = dialog.get_path ();
@ -233,9 +233,9 @@ Editor::export_region ()
return;
}
boost::shared_ptr<Region> r = selection->regions.front()->region();
boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion>(r);
boost::shared_ptr<MidiRegion> midi_region = boost::dynamic_pointer_cast<MidiRegion>(r);
std::shared_ptr<Region> r = selection->regions.front()->region();
std::shared_ptr<AudioRegion> audio_region = std::dynamic_pointer_cast<AudioRegion>(r);
std::shared_ptr<MidiRegion> midi_region = std::dynamic_pointer_cast<MidiRegion>(r);
if (audio_region) {
@ -295,7 +295,7 @@ Editor::bounce_region_selection (bool with_processing)
bool multiple_per_track = false;
if (multiple_selected) {
std::set<boost::shared_ptr<Route>> route_set;
std::set<std::shared_ptr<Route>> route_set;
for (auto const& i: selection->regions) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&i->get_time_axis_view());
auto rv = route_set.insert (rtv->route ());
@ -325,7 +325,7 @@ Editor::bounce_region_selection (bool with_processing)
dialog.set_initial_text ("");
dialog.set_allow_empty ();
} else {
boost::shared_ptr<Region> region (selection->regions.front()->region ());
std::shared_ptr<Region> region (selection->regions.front()->region ());
dialog.set_prompt (_("Name for Bounced Region:"));
dialog.set_initial_text (region->name());
}
@ -399,9 +399,9 @@ Editor::bounce_region_selection (bool with_processing)
if (copy_to_trigger) {
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
boost::shared_ptr<Region> region ((*i)->region());
std::shared_ptr<Region> region ((*i)->region());
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&(*i)->get_time_axis_view());
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (rtv->route());
std::shared_ptr<Track> track = std::dynamic_pointer_cast<Track> (rtv->route());
if (!track) {
continue;
}
@ -421,9 +421,9 @@ Editor::bounce_region_selection (bool with_processing)
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
boost::shared_ptr<Region> region ((*i)->region());
std::shared_ptr<Region> region ((*i)->region());
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&(*i)->get_time_axis_view());
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (rtv->route());
std::shared_ptr<Track> track = std::dynamic_pointer_cast<Track> (rtv->route());
InterThreadInfo itt;
@ -434,12 +434,12 @@ Editor::bounce_region_selection (bool with_processing)
name = bounce_name;
}
boost::shared_ptr<Region> r;
std::shared_ptr<Region> r;
if (with_processing) {
r = track->bounce_range (region->position_sample(), region->position_sample() + region->length_samples(), itt, track->main_outs(), false, name);
} else {
r = track->bounce_range (region->position_sample(), region->position_sample() + region->length_samples(), itt, boost::shared_ptr<Processor>(), false, name);
r = track->bounce_range (region->position_sample(), region->position_sample() + region->length_samples(), itt, std::shared_ptr<Processor>(), false, name);
}
if (copy_to_clip_library) {
@ -447,7 +447,7 @@ Editor::bounce_region_selection (bool with_processing)
}
if (copy_to_trigger) {
boost::shared_ptr<Trigger::UIState> state (new Trigger::UIState());
std::shared_ptr<Trigger::UIState> state (new Trigger::UIState());
if (multiple_selected) {
state->name = string_compose ("%1%2", bounce_name, r->name ());
} else {
@ -463,9 +463,9 @@ Editor::bounce_region_selection (bool with_processing)
}
bool
Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
Editor::write_region (string path, std::shared_ptr<AudioRegion> region)
{
boost::shared_ptr<AudioFileSource> fs;
std::shared_ptr<AudioFileSource> fs;
const samplepos_t chunk_size = 4096;
samplepos_t to_read;
Sample buf[chunk_size];
@ -473,7 +473,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
samplepos_t pos;
char s[PATH_MAX+1];
uint32_t cnt;
vector<boost::shared_ptr<AudioFileSource> > sources;
vector<std::shared_ptr<AudioFileSource> > sources;
uint32_t nchans;
const string sound_directory = _session->session_directory().sound_path();
@ -516,7 +516,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
try {
fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate()));
fs = std::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate()));
}
catch (failed_constructor& err) {
@ -540,7 +540,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
this_time = min (to_read, chunk_size);
uint32_t chn = 0;
for (vector<boost::shared_ptr<AudioFileSource> >::iterator src=sources.begin(); src != sources.end(); ++src, ++chn) {
for (vector<std::shared_ptr<AudioFileSource> >::iterator src=sources.begin(); src != sources.end(); ++src, ++chn) {
fs = (*src);
@ -563,7 +563,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
time (&tnow);
now = localtime (&tnow);
for (vector<boost::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
for (vector<std::shared_ptr<AudioFileSource> >::iterator src = sources.begin(); src != sources.end(); ++src) {
(*src)->update_header (0, *now, tnow);
(*src)->mark_immutable ();
}
@ -572,7 +572,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
error_out:
for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
for (vector<std::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->mark_for_remove ();
}
@ -598,7 +598,7 @@ Editor::write_audio_selection (TimeSelection& ts)
if (atv->is_audio_track()) {
boost::shared_ptr<AudioPlaylist> playlist = boost::dynamic_pointer_cast<AudioPlaylist>(atv->track()->playlist());
std::shared_ptr<AudioPlaylist> playlist = std::dynamic_pointer_cast<AudioPlaylist>(atv->track()->playlist());
if (playlist && write_audio_range (*playlist, atv->track()->n_channels(), ts) == 0) {
ret = -1;
@ -613,7 +613,7 @@ Editor::write_audio_selection (TimeSelection& ts)
bool
Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<TimelineRange>& range)
{
boost::shared_ptr<AudioFileSource> fs;
std::shared_ptr<AudioFileSource> fs;
const samplepos_t chunk_size = 4096;
samplecnt_t nframes;
Sample buf[chunk_size];
@ -622,7 +622,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
char s[PATH_MAX+1];
uint32_t cnt;
string path;
vector<boost::shared_ptr<AudioFileSource> > sources;
vector<std::shared_ptr<AudioFileSource> > sources;
const string sound_directory = _session->session_directory().sound_path();
@ -653,7 +653,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
path = s;
try {
fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate()));
fs = std::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate()));
}
catch (failed_constructor& err) {
@ -725,7 +725,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
time (&tnow);
now = localtime (&tnow);
for (vector<boost::shared_ptr<AudioFileSource> >::iterator s = sources.begin(); s != sources.end(); ++s) {
for (vector<std::shared_ptr<AudioFileSource> >::iterator s = sources.begin(); s != sources.end(); ++s) {
(*s)->update_header (0, *now, tnow);
(*s)->mark_immutable ();
// do we need to ref it again?
@ -736,7 +736,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
error_out:
/* unref created files */
for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
for (vector<std::shared_ptr<AudioFileSource> >::iterator i = sources.begin(); i != sources.end(); ++i) {
(*i)->mark_for_remove ();
}

2
gtk2_ardour/editor_markers.cc
View File

@ -534,7 +534,7 @@ Editor::LocationMarkers::~LocationMarkers ()
}
void
Editor::get_markers_to_ripple (boost::shared_ptr<Playlist> target_playlist, timepos_t const & pos, std::vector<ArdourMarker*>& markers)
Editor::get_markers_to_ripple (std::shared_ptr<Playlist> target_playlist, timepos_t const & pos, std::vector<ArdourMarker*>& markers)
{
const timepos_t ripple_start = effective_ripple_mark_start (target_playlist, pos);

6
gtk2_ardour/editor_mixer.cc
View File

@ -82,7 +82,7 @@ Editor::editor_list_button_toggled ()
void
Editor::show_editor_mixer (bool yn)
{
boost::shared_ptr<ARDOUR::Route> r;
std::shared_ptr<ARDOUR::Route> r;
show_editor_mixer_when_tracks_arrive = false;
@ -209,7 +209,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
// if this is an automation track, then the mixer strip should
// show the parent
boost::shared_ptr<ARDOUR::Stripable> stripable;
std::shared_ptr<ARDOUR::Stripable> stripable;
AutomationTimeAxisView* atv;
if ((atv = dynamic_cast<AutomationTimeAxisView*>(&view)) != 0) {
@ -238,7 +238,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
create_editor_mixer ();
}
boost::shared_ptr<ARDOUR::Route> route = boost::dynamic_pointer_cast<ARDOUR::Route> (stripable);
std::shared_ptr<ARDOUR::Route> route = std::dynamic_pointer_cast<ARDOUR::Route> (stripable);
if (current_mixer_strip->route() == route) {
return;
}

28
gtk2_ardour/editor_mouse.cc
View File

@ -211,9 +211,9 @@ Editor::canvas_event_sample (GdkEvent const * event, double* pcx, double* pcy) c
}
void
Editor::set_current_trimmable (boost::shared_ptr<Trimmable> t)
Editor::set_current_trimmable (std::shared_ptr<Trimmable> t)
{
boost::shared_ptr<Trimmable> st = _trimmable.lock();
std::shared_ptr<Trimmable> st = _trimmable.lock();
if (!st || st == t) {
_trimmable = t;
@ -221,9 +221,9 @@ Editor::set_current_trimmable (boost::shared_ptr<Trimmable> t)
}
void
Editor::set_current_movable (boost::shared_ptr<Movable> m)
Editor::set_current_movable (std::shared_ptr<Movable> m)
{
boost::shared_ptr<Movable> sm = _movable.lock();
std::shared_ptr<Movable> sm = _movable.lock();
if (!sm || sm != m) {
_movable = m;
@ -1178,14 +1178,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
RouteTimeAxisView* p = dynamic_cast<RouteTimeAxisView*> (parent);
assert (p);
boost::shared_ptr<Playlist> pl = p->track()->playlist ();
std::shared_ptr<Playlist> pl = p->track()->playlist ();
if (pl->n_regions() == 0) {
/* Parent has no regions; create one so that we have somewhere to put automation */
_drags->set (new RegionCreateDrag (this, item, parent), event);
} else {
/* See if there's a region before the click that we can extend, and extend it if so */
timepos_t const t (canvas_event_sample (event));
boost::shared_ptr<Region> prev = pl->find_next_region (t, End, -1);
std::shared_ptr<Region> prev = pl->find_next_region (t, End, -1);
if (!prev) {
_drags->set (new RegionCreateDrag (this, item, parent), event);
} else {
@ -1277,18 +1277,18 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
RouteTimeAxisView* tatv;
boost::shared_ptr<Playlist> playlist;
std::shared_ptr<Playlist> playlist;
if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) == 0) {
continue;
}
if ((playlist = (*i)->playlist()) == 0) {
continue;
}
if (boost::dynamic_pointer_cast<AudioPlaylist> (playlist) == 0) {
if (std::dynamic_pointer_cast<AudioPlaylist> (playlist) == 0) {
continue;
}
for (list<TimelineRange>::const_iterator j = selection->time.begin(); j != selection->time.end(); ++j) {
boost::shared_ptr<RegionList> rl = playlist->regions_touched (j->start(), j->end());
std::shared_ptr<RegionList> rl = playlist->regions_touched (j->start(), j->end());
for (RegionList::iterator ir = rl->begin(); ir != rl->end(); ++ir) {
RegionView* rv;
if ((rv = tatv->view()->find_view (*ir)) != 0) {
@ -2631,10 +2631,10 @@ Editor::mouse_brush_insert_region (RegionView* rv, timepos_t const & pos)
return;
}
boost::shared_ptr<Playlist> playlist = rtv->playlist();
std::shared_ptr<Playlist> playlist = rtv->playlist();
playlist->clear_changes ();
boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region(), true));
std::shared_ptr<Region> new_region (RegionFactory::create (rv->region(), true));
playlist->add_region (new_region, pos);
_session->add_command (new StatefulDiffCommand (playlist));
@ -2699,7 +2699,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
/* lets try to create new Region for the selection */
vector<boost::shared_ptr<Region> > new_regions;
vector<std::shared_ptr<Region> > new_regions;
create_region_from_selection (new_regions);
if (new_regions.empty()) {
@ -2708,7 +2708,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
/* XXX fix me one day to use all new regions */
boost::shared_ptr<Region> region (new_regions.front());
std::shared_ptr<Region> region (new_regions.front());
/* add it to the current stream/playlist.
*
@ -2725,7 +2725,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
*/
begin_reversible_command (Operations::selection_grab);
boost::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
std::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
playlist->clear_changes ();
clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start());

344
gtk2_ardour/editor_ops.cc
View File

File diff suppressed because it is too large Load Diff

18
gtk2_ardour/editor_regions.cc
View File

@ -120,7 +120,7 @@ EditorRegions::selection_changed ()
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = _model->get_iter (*i))) {
boost::shared_ptr<Region> region = (*iter)[_columns.region];
std::shared_ptr<Region> region = (*iter)[_columns.region];
// they could have clicked on a row that is just a placeholder, like "Hidden"
// although that is not allowed by our selection filter. check it anyway
@ -144,7 +144,7 @@ void
EditorRegions::set_selected (RegionSelection& regions)
{
for (RegionSelection::iterator i = regions.begin (); i != regions.end (); ++i) {
boost::shared_ptr<Region> r ((*i)->region ());
std::shared_ptr<Region> r ((*i)->region ());
RegionRowMap::iterator it;
@ -168,7 +168,7 @@ EditorRegions::show_context_menu (int button, int time)
bool
EditorRegions::button_press (GdkEventButton* ev)
{
boost::shared_ptr<Region> region;
std::shared_ptr<Region> region;
TreeIter iter;
TreeModel::Path path;
TreeViewColumn* column;
@ -198,7 +198,7 @@ EditorRegions::button_press (GdkEventButton* ev)
}
void
EditorRegions::selection_mapover (sigc::slot<void, boost::shared_ptr<Region>> sl)
EditorRegions::selection_mapover (sigc::slot<void, std::shared_ptr<Region>> sl)
{
Glib::RefPtr<TreeSelection> selection = _display.get_selection ();
TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
@ -216,7 +216,7 @@ EditorRegions::selection_mapover (sigc::slot<void, boost::shared_ptr<Region>> sl
selected (XXX maybe prevent them from being selected)
*/
boost::shared_ptr<Region> r = (*iter)[_columns.region];
std::shared_ptr<Region> r = (*iter)[_columns.region];
if (r) {
sl (r);
@ -226,7 +226,7 @@ EditorRegions::selection_mapover (sigc::slot<void, boost::shared_ptr<Region>> sl
}
void
EditorRegions::regions_changed (boost::shared_ptr<RegionList> rl, const PropertyChange& what_changed)
EditorRegions::regions_changed (std::shared_ptr<RegionList> rl, const PropertyChange& what_changed)
{
/* the grid is most interested in the regions that are *visible* in the editor.
* this is a convenient place to flag changes to the grid cache, on a visible region */
@ -241,13 +241,13 @@ EditorRegions::regions_changed (boost::shared_ptr<RegionList> rl, const Property
RegionListBase::regions_changed (rl, what_changed);
}
boost::shared_ptr<Region>
std::shared_ptr<Region>
EditorRegions::get_single_selection ()
{
Glib::RefPtr<TreeSelection> selected = _display.get_selection ();
if (selected->count_selected_rows () != 1) {
return boost::shared_ptr<Region> ();
return std::shared_ptr<Region> ();
}
TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
@ -257,7 +257,7 @@ EditorRegions::get_single_selection ()
TreeIter iter = _model->get_iter (*rows.begin ());
if (!iter) {
return boost::shared_ptr<Region> ();
return std::shared_ptr<Region> ();
}
return (*iter)[_columns.region];

6
gtk2_ardour/editor_regions.h
View File

@ -32,10 +32,10 @@ public:
EditorRegions (Editor*);
void set_selected (RegionSelection&);
void selection_mapover (sigc::slot<void, boost::shared_ptr<ARDOUR::Region>>);
void selection_mapover (sigc::slot<void, std::shared_ptr<ARDOUR::Region>>);
void remove_unused_regions ();
boost::shared_ptr<ARDOUR::Region> get_single_selection ();
std::shared_ptr<ARDOUR::Region> get_single_selection ();
void unselect_all ()
{
@ -43,7 +43,7 @@ public:
}
protected:
void regions_changed (boost::shared_ptr<ARDOUR::RegionList>, PBD::PropertyChange const&);
void regions_changed (std::shared_ptr<ARDOUR::RegionList>, PBD::PropertyChange const&);
private:
void init ();

40
gtk2_ardour/editor_selection.cc
View File

@ -492,7 +492,7 @@ void
Editor::mapover_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
{
RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
set<boost::shared_ptr<Playlist> > playlists;
set<std::shared_ptr<Playlist> > playlists;
if (route_basis == 0) {
return;
@ -513,7 +513,7 @@ Editor::mapover_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView
if (v && v->route()->route_group() == group) {
boost::shared_ptr<Track> t = v->track();
std::shared_ptr<Track> t = v->track();
if (t) {
if (playlists.insert (t->playlist()).second) {
/* haven't seen this playlist yet */
@ -540,7 +540,7 @@ Editor::mapover_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView
void
Editor::mapover_all_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl) const
{
set<boost::shared_ptr<Playlist> > playlists;
set<std::shared_ptr<Playlist> > playlists;
set<RouteTimeAxisView*> tracks;
@ -552,7 +552,7 @@ Editor::mapover_all_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxis
continue;
}
boost::shared_ptr<Track> t = v->track();
std::shared_ptr<Track> t = v->track();
if (t) {
if (playlists.insert (t->playlist()).second) {
/* haven't seen this playlist yet */
@ -577,10 +577,10 @@ Editor::mapover_all_tracks_with_unique_playlists (sigc::slot<void, RouteTimeAxis
void
Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionView * basis, vector<RegionView*>* all_equivs) const
{
boost::shared_ptr<Playlist> pl;
vector<boost::shared_ptr<Region> > results;
std::shared_ptr<Playlist> pl;
vector<std::shared_ptr<Region> > results;
RegionView* marv;
boost::shared_ptr<Track> tr;
std::shared_ptr<Track> tr;
if ((tr = tv.track()) == 0) {
/* bus */
@ -596,7 +596,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi
pl->get_equivalent_regions (basis->region(), results);
}
for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
for (vector<std::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
if ((marv = tv.view()->find_view (*ir)) != 0) {
all_equivs->push_back (marv);
}
@ -1035,7 +1035,7 @@ Editor::set_selection (std::list<Selectable*> s, Selection::Operation op)
}
void
Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> region, Selection::Operation op)
Editor::set_selected_regionview_from_region_list (std::shared_ptr<Region> region, Selection::Operation op)
{
vector<RegionView*> regionviews;
@ -1067,10 +1067,10 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
}
bool
Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, boost::weak_ptr<Region> weak_r)
Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, std::weak_ptr<Region> weak_r)
{
RegionView* rv;
boost::shared_ptr<Region> r (weak_r.lock());
std::shared_ptr<Region> r (weak_r.lock());
if (!r) {
return true;
@ -1155,13 +1155,13 @@ Editor::presentation_info_changed (PropertyChange const & what_changed)
n_stripables++;
if (boost::dynamic_pointer_cast<Track> ((*i).stripable)) {
if (std::dynamic_pointer_cast<Track> ((*i).stripable)) {
n_tracks++;
n_routes++;
} else if (boost::dynamic_pointer_cast<Route> ((*i).stripable)) {
} else if (std::dynamic_pointer_cast<Route> ((*i).stripable)) {
n_busses++;
n_routes++;
} else if (boost::dynamic_pointer_cast<VCA> ((*i).stripable)) {
} else if (std::dynamic_pointer_cast<VCA> ((*i).stripable)) {
n_vcas++;
}
@ -1186,7 +1186,7 @@ Editor::presentation_info_changed (PropertyChange const & what_changed)
for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) {
boost::shared_ptr<AutomationControl> control = (*j)->control ();
std::shared_ptr<AutomationControl> control = (*j)->control ();
if (control != (*i).controllable) {
continue;
@ -1433,8 +1433,8 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing)
for (list<RegionView*>::const_iterator i = rs.begin(); i != rs.end(); ++i) {
boost::shared_ptr<Region> r = (*i)->region ();
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
std::shared_ptr<Region> r = (*i)->region ();
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (r);
if (ar) {
have_audio = true;
@ -1443,7 +1443,7 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing)
}
}
if (boost::dynamic_pointer_cast<MidiRegion> (r)) {
if (std::dynamic_pointer_cast<MidiRegion> (r)) {
have_midi = true;
}
@ -2372,9 +2372,9 @@ Editor::catch_up_on_midi_selection ()
struct ViewStripable {
TimeAxisView* tav;
boost::shared_ptr<Stripable> stripable;
std::shared_ptr<Stripable> stripable;
ViewStripable (TimeAxisView* t, boost::shared_ptr<Stripable> s)
ViewStripable (TimeAxisView* t, std::shared_ptr<Stripable> s)
: tav (t), stripable (s) {}
};

28
gtk2_ardour/editor_sources.cc
View File

@ -114,16 +114,16 @@ EditorSources::selection_changed ()
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = _model->get_iter (*i))) {
/* highlight any regions in the editor that use this region's source */
boost::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
std::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
if (!region)
continue;
boost::shared_ptr<ARDOUR::Source> source = region->source ();
std::shared_ptr<ARDOUR::Source> source = region->source ();
if (source) {
set<boost::shared_ptr<Region>> regions;
set<std::shared_ptr<Region>> regions;
RegionFactory::get_regions_using_source (source, regions);
for (set<boost::shared_ptr<Region>>::iterator region = regions.begin (); region != regions.end (); region++) {
for (set<std::shared_ptr<Region>>::iterator region = regions.begin (); region != regions.end (); region++) {
_change_connection.block (true);
_editor->set_selected_regionview_from_region_list (*region, Selection::Add);
_change_connection.block (false);
@ -161,7 +161,7 @@ EditorSources::recover_selected_sources ()
TreeView::Selection::ListHandle_Path rows = _display.get_selection ()->get_selected_rows ();
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = _model->get_iter (*i))) {
boost::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
std::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
if (region) {
to_be_recovered.push_back (region);
}
@ -192,7 +192,7 @@ EditorSources::remove_selected_sources ()
int opt = prompter.run ();
if (opt >= 1) {
std::list<boost::weak_ptr<ARDOUR::Source>> to_be_removed;
std::list<std::weak_ptr<ARDOUR::Source>> to_be_removed;
if (_display.get_selection ()->count_selected_rows () > 0) {
TreeIter iter;
@ -202,17 +202,17 @@ EditorSources::remove_selected_sources ()
for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) {
if ((iter = _model->get_iter (*i))) {
boost::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
std::shared_ptr<ARDOUR::Region> region = (*iter)[_columns.region];
if (!region)
continue;
boost::shared_ptr<ARDOUR::Source> source = region->source ();
std::shared_ptr<ARDOUR::Source> source = region->source ();
if (source) {
set<boost::shared_ptr<Region>> regions;
set<std::shared_ptr<Region>> regions;
RegionFactory::get_regions_using_source (source, regions);
for (set<boost::shared_ptr<Region>>::iterator region = regions.begin (); region != regions.end (); region++) {
for (set<std::shared_ptr<Region>>::iterator region = regions.begin (); region != regions.end (); region++) {
_change_connection.block (true);
_editor->set_selected_regionview_from_region_list (*region, Selection::Add);
_change_connection.block (false);
@ -226,7 +226,7 @@ EditorSources::remove_selected_sources ()
_editor->remove_regions (_editor->get_regions_from_selection_and_entered (), false /*can_ripple*/, false /*as_part_of_other_command*/); // this operation is undo-able
if (opt == 2) {
for (std::list<boost::weak_ptr<ARDOUR::Source>>::iterator i = to_be_removed.begin (); i != to_be_removed.end (); ++i) {
for (std::list<std::weak_ptr<ARDOUR::Source>>::iterator i = to_be_removed.begin (); i != to_be_removed.end (); ++i) {
_session->remove_source (*i); // this operation is (currently) not undo-able
}
}
@ -288,13 +288,13 @@ EditorSources::drag_data_received (const RefPtr<Gdk::DragContext>& context,
}
}
boost::shared_ptr<ARDOUR::Region>
std::shared_ptr<ARDOUR::Region>
EditorSources::get_single_selection ()
{
Glib::RefPtr<TreeSelection> selected = _display.get_selection ();
if (selected->count_selected_rows () != 1) {
return boost::shared_ptr<ARDOUR::Region> ();
return std::shared_ptr<ARDOUR::Region> ();
}
TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
@ -304,7 +304,7 @@ EditorSources::get_single_selection ()
TreeIter iter = _model->get_iter (*rows.begin ());
if (!iter) {
return boost::shared_ptr<ARDOUR::Region> ();
return std::shared_ptr<ARDOUR::Region> ();
}
return (*iter)[_columns.region];

2
gtk2_ardour/editor_sources.h
View File

@ -26,7 +26,7 @@ class EditorSources : public EditorComponent, public SourceListBase
public:
EditorSources (Editor*);
boost::shared_ptr<ARDOUR::Region> get_single_selection ();
std::shared_ptr<ARDOUR::Region> get_single_selection ();
/* user actions */
void remove_selected_sources ();

2
gtk2_ardour/editor_summary.cc
View File

@ -961,7 +961,7 @@ EditorSummary::routes_added (list<RouteTimeAxisView*> const & r)
for (list<RouteTimeAxisView*>::const_iterator i = r.begin(); i != r.end(); ++i) {
/* Connect to the relevant signal for the route so that we know when its colour has changed */
(*i)->route()->presentation_info().PropertyChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::route_gui_changed, this, _1), gui_context ());
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> ((*i)->route ());
std::shared_ptr<Track> tr = std::dynamic_pointer_cast<Track> ((*i)->route ());
if (tr) {
tr->PlaylistChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context ());
}

2
gtk2_ardour/editor_tempodisplay.cc
View File

@ -842,7 +842,7 @@ Editor::mid_tempo_per_track_update (TimeAxisView& tav)
for (TimeAxisView::Children::iterator ct = kids.begin(); ct != kids.end(); ++ct) {
boost::shared_ptr<AutomationTimeAxisView> atav = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*ct);
std::shared_ptr<AutomationTimeAxisView> atav = std::dynamic_pointer_cast<AutomationTimeAxisView> (*ct);
if (atav) {
AutomationStreamView* asv = atav->automation_view ();

22
gtk2_ardour/editor_timefx.cc
View File

@ -87,10 +87,10 @@ Editor::time_stretch (RegionSelection& regions, Temporal::ratio_t const & ratio)
return aret;
}
set<boost::shared_ptr<Playlist> > midi_playlists_affected;
set<std::shared_ptr<Playlist> > midi_playlists_affected;
for (RegionList::iterator i = midi.begin(); i != midi.end(); ++i) {
boost::shared_ptr<Playlist> playlist = (*i)->playlist();
std::shared_ptr<Playlist> playlist = (*i)->playlist();
if (playlist) {
playlist->clear_changes ();
@ -102,7 +102,7 @@ Editor::time_stretch (RegionSelection& regions, Temporal::ratio_t const & ratio)
request.time_fraction = ratio;
for (RegionList::iterator i = midi.begin(); i != midi.end(); ++i) {
boost::shared_ptr<Playlist> playlist = (*i)->playlist();
std::shared_ptr<Playlist> playlist = (*i)->playlist();
if (!playlist) {
continue;
@ -116,7 +116,7 @@ Editor::time_stretch (RegionSelection& regions, Temporal::ratio_t const & ratio)
midi_playlists_affected.insert (playlist);
}
for (set<boost::shared_ptr<Playlist> >::iterator p = midi_playlists_affected.begin(); p != midi_playlists_affected.end(); ++p) {
for (set<std::shared_ptr<Playlist> >::iterator p = midi_playlists_affected.begin(); p != midi_playlists_affected.end(); ++p) {
PBD::StatefulDiffCommand* cmd = new StatefulDiffCommand (*p);
_session->add_command (cmd);
if (!cmd->empty ()) {
@ -357,15 +357,15 @@ Editor::time_fx (RegionList& regions, Temporal::ratio_t ratio, bool pitching)
void
Editor::do_timefx ()
{
typedef std::map<boost::shared_ptr<Region>, boost::shared_ptr<Region> > ResultMap;
typedef std::map<std::shared_ptr<Region>, std::shared_ptr<Region> > ResultMap;
ResultMap results;
uint32_t const N = current_timefx->regions.size ();
for (RegionList::const_iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (*i);
boost::shared_ptr<Playlist> playlist;
std::shared_ptr<AudioRegion> region = std::dynamic_pointer_cast<AudioRegion> (*i);
std::shared_ptr<Playlist> playlist;
if (!region || (playlist = region->playlist()) == 0) {
continue;
@ -415,15 +415,15 @@ Editor::do_timefx ()
if (current_timefx->request.cancel) {
current_timefx->status = -1;
for (ResultMap::const_iterator i = results.begin(); i != results.end(); ++i) {
boost::weak_ptr<Region> w = i->second;
std::weak_ptr<Region> w = i->second;
RegionFactory::map_remove (w);
}
} else {
current_timefx->status = 0;
for (ResultMap::const_iterator i = results.begin(); i != results.end(); ++i) {
boost::shared_ptr<Region> region = i->first;
boost::shared_ptr<Region> new_region = i->second;
boost::shared_ptr<Playlist> playlist = region->playlist();
std::shared_ptr<Region> region = i->first;
std::shared_ptr<Region> new_region = i->second;
std::shared_ptr<Playlist> playlist = region->playlist();
playlist->clear_changes ();
playlist->replace_region (region, new_region, region->position());

4
gtk2_ardour/editor_videotimeline.cc
View File

@ -95,7 +95,7 @@ Editor::embed_audio_from_video (std::string path, samplepos_t n, bool lock_posit
ImportProgressWindow ipw (&import_status, _("Import"), _("Cancel Import"));
ipw.show ();
boost::shared_ptr<ARDOUR::Track> track;
std::shared_ptr<ARDOUR::Track> track;
std::string const& gid = ARDOUR::Playlist::generate_pgroup_id ();
Temporal::timepos_t pos (n);
@ -104,7 +104,7 @@ Editor::embed_audio_from_video (std::string path, samplepos_t n, bool lock_posit
if (ok && track) {
if (lock_position_to_video) {
boost::shared_ptr<ARDOUR::Playlist> pl = track->playlist();
std::shared_ptr<ARDOUR::Playlist> pl = track->playlist();
pl->find_next_region (pos, ARDOUR::End, 0)->set_video_locked (true);
}
_session->save_state ("", true);

78
gtk2_ardour/engine_dialog.cc
View File

@ -553,7 +553,7 @@ EngineControl::build_notebook ()
void
EngineControl::build_full_control_notebook ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
using namespace Notebook_Helpers;
@ -660,7 +660,7 @@ EngineControl::build_full_control_notebook ()
void
EngineControl::build_no_control_notebook ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
using namespace Notebook_Helpers;
@ -777,7 +777,7 @@ EngineControl::enable_latency_tab ()
void
EngineControl::update_sensitivity ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
start_stop_button.set_sensitive (false);
return;
@ -897,7 +897,7 @@ EngineControl::midi_latency_adjustment_changed (Gtk::Adjustment* a, MidiDeviceSe
}
if (ARDOUR::AudioEngine::instance ()->running () && !_measure_midi) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
if (backend->can_change_systemic_latency_when_running () && device->enabled) {
if (for_input) {
@ -917,7 +917,7 @@ EngineControl::midi_device_enabled_toggled (ArdourButton* b, MidiDeviceSettings
refresh_midi_display (device->name);
if (ARDOUR::AudioEngine::instance ()->running ()) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
backend->set_midi_device_enabled (device->name, device->enabled);
if (backend->can_change_systemic_latency_when_running () && device->enabled) {
@ -930,7 +930,7 @@ EngineControl::midi_device_enabled_toggled (ArdourButton* b, MidiDeviceSettings
void
EngineControl::refresh_midi_display (std::string focus)
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
int row = 0;
@ -1022,7 +1022,7 @@ EngineControl::backend_changed ()
{
SignalBlocker blocker (*this, "backend_changed");
string backend_name = backend_combo.get_active_text ();
boost::shared_ptr<ARDOUR::AudioBackend> backend;
std::shared_ptr<ARDOUR::AudioBackend> backend;
if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (backend_name, ARDOUR_COMMAND_LINE::backend_client_name, ""))) {
/* eh? setting the backend failed... how ? */
@ -1085,7 +1085,7 @@ EngineControl::backend_changed ()
void
EngineControl::update_midi_options ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<string> midi_options = backend->enumerate_midi_options ();
if (midi_options.size () == 1 || _have_control) {
@ -1104,7 +1104,7 @@ bool
EngineControl::set_driver_popdown_strings ()
{
DEBUG_ECONTROL ("set_driver_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<string> drivers = backend->enumerate_drivers ();
if (drivers.empty ()) {
@ -1172,7 +1172,7 @@ bool
EngineControl::set_device_popdown_strings ()
{
DEBUG_ECONTROL ("set_device_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_devices ();
/* NOTE: Ardour currently does not display the "available" field of the
@ -1211,7 +1211,7 @@ bool
EngineControl::set_input_device_popdown_strings ()
{
DEBUG_ECONTROL ("set_input_device_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_input_devices ();
vector<string> available_devices;
@ -1240,7 +1240,7 @@ bool
EngineControl::set_output_device_popdown_strings ()
{
DEBUG_ECONTROL ("set_output_device_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_output_devices ();
vector<string> available_devices;
@ -1268,7 +1268,7 @@ void
EngineControl::list_devices ()
{
DEBUG_ECONTROL ("list_devices");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
/* now fill out devices, mark sample rates, buffer sizes insensitive */
@ -1299,7 +1299,7 @@ void
EngineControl::driver_changed ()
{
SignalBlocker blocker (*this, "driver_changed");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
backend->set_driver (driver_combo.get_active_text ());
@ -1315,7 +1315,7 @@ EngineControl::driver_changed ()
vector<float>
EngineControl::get_sample_rates_for_all_devices ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend =
std::shared_ptr<ARDOUR::AudioBackend> backend =
ARDOUR::AudioEngine::instance ()->current_backend ();
vector<float> all_rates;
@ -1347,7 +1347,7 @@ void
EngineControl::set_samplerate_popdown_strings ()
{
DEBUG_ECONTROL ("set_samplerate_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
string desired;
vector<float> sr;
vector<string> s;
@ -1396,7 +1396,7 @@ EngineControl::set_samplerate_popdown_strings ()
vector<uint32_t>
EngineControl::get_buffer_sizes_for_all_devices ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend =
std::shared_ptr<ARDOUR::AudioBackend> backend =
ARDOUR::AudioEngine::instance ()->current_backend ();
vector<uint32_t> all_sizes;
@ -1430,7 +1430,7 @@ void
EngineControl::set_buffersize_popdown_strings ()
{
DEBUG_ECONTROL ("set_buffersize_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<uint32_t> bs;
vector<string> s;
@ -1479,7 +1479,7 @@ void
EngineControl::set_nperiods_popdown_strings ()
{
DEBUG_ECONTROL ("set_nperiods_popdown_strings");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
vector<uint32_t> np;
vector<string> s;
@ -1508,7 +1508,7 @@ void
EngineControl::device_changed ()
{
SignalBlocker blocker (*this, "device_changed");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
string device_name_in;
@ -1575,7 +1575,7 @@ EngineControl::input_device_changed ()
{
DEBUG_ECONTROL ("input_device_changed");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend && backend->match_input_output_devices_or_none ()) {
const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
@ -1597,7 +1597,7 @@ void
EngineControl::output_device_changed ()
{
DEBUG_ECONTROL ("output_device_changed");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend && backend->match_input_output_devices_or_none ()) {
const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
@ -1637,7 +1637,7 @@ EngineControl::buffer_size_changed ()
{
DEBUG_ECONTROL ("buffer_size_changed");
if (ARDOUR::AudioEngine::instance ()->running ()) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend && backend->can_change_buffer_size_when_running ()) {
backend->set_buffer_size (get_buffer_size ());
}
@ -1685,7 +1685,7 @@ void
EngineControl::midi_option_changed ()
{
DEBUG_ECONTROL ("midi_option_changed");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
backend->set_midi_option (get_midi_option ());
@ -1723,7 +1723,7 @@ EngineControl::midi_option_changed ()
void
EngineControl::latency_changed ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend || !_have_control || !ARDOUR::AudioEngine::instance ()->running ()) {
return;
}
@ -1808,7 +1808,7 @@ EngineControl::get_matching_state (
EngineControl::State
EngineControl::get_saved_state_for_currently_displayed_backend_and_device ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend) {
if (backend->use_separate_input_and_output_devices ()) {
@ -1942,7 +1942,7 @@ EngineControl::maybe_display_saved_state ()
} else {
DEBUG_ECONTROL ("Unable to find saved state for backend and devices");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend) {
input_latency.set_value (backend->systemic_hw_input_latency ());
output_latency.set_value (backend->systemic_hw_output_latency ());
@ -2185,7 +2185,7 @@ EngineControl::set_current_state (const State& state)
{
DEBUG_ECONTROL ("set_current_state");
boost::shared_ptr<ARDOUR::AudioBackend> backend;
std::shared_ptr<ARDOUR::AudioBackend> backend;
if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (state->backend, ARDOUR_COMMAND_LINE::backend_client_name, ""))) {
DEBUG_ECONTROL (string_compose ("Unable to set backend to %1", state->backend));
@ -2283,7 +2283,7 @@ int
EngineControl::push_state_to_backend (bool start)
{
DEBUG_ECONTROL ("push_state_to_backend");
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
PBD::Unwinder<uint32_t> protect_ignore_device_changes (ignore_device_changes, ignore_device_changes + 1);
if (!backend) {
@ -2661,7 +2661,7 @@ EngineControl::control_app_button_clicked ()
return;
}
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
return;
@ -2690,7 +2690,7 @@ EngineControl::start_stop_button_clicked ()
return;
}
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
return;
@ -2715,7 +2715,7 @@ EngineControl::update_devices_button_clicked ()
return;
}
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
return;
@ -2748,7 +2748,7 @@ EngineControl::use_buffered_io_button_clicked ()
return;
}
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
return;
@ -2762,7 +2762,7 @@ EngineControl::use_buffered_io_button_clicked ()
void
EngineControl::manage_control_app_sensitivity ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (!backend) {
return;
@ -2856,7 +2856,7 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
/* undo special case from push_state_to_backend() when measuring midi latency */
if (_measure_midi && ARDOUR::AudioEngine::instance ()->running ()) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend->can_change_systemic_latency_when_running ()) {
for (vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin (); p != _midi_devices.end (); ++p) {
backend->set_midi_device_enabled ((*p)->name, (*p)->enabled);
@ -3144,7 +3144,7 @@ EngineControl::latency_back_button_clicked ()
ARDOUR::AudioEngine::instance ()->stop_latency_detection ();
notebook.set_current_page (0);
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (backend && backend->can_change_systemic_latency_when_running ()) {
/* IFF engine was not running before latency detection, stop it */
if (!was_running_before_lm && ARDOUR::AudioEngine::instance ()->running ()) {
@ -3160,7 +3160,7 @@ EngineControl::use_latency_button_clicked ()
return;
}
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
if (_measure_midi) {
ARDOUR::MIDIDM* mididm = ARDOUR::AudioEngine::instance ()->mididm ();
if (!mididm) {
@ -3227,7 +3227,7 @@ EngineControl::on_delete_event (GdkEventAny* ev)
void
EngineControl::engine_running ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size ()));
@ -3252,7 +3252,7 @@ EngineControl::engine_running ()
void
EngineControl::engine_stopped ()
{
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
std::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance ()->current_backend ();
assert (backend);
connect_disconnect_button.set_label (string_compose (_("Connect to %1"), backend->name ()));

4
gtk2_ardour/engine_dialog.h
View File

@ -235,7 +235,7 @@ private:
}
};
typedef boost::shared_ptr<MidiDeviceSetting> MidiDeviceSettings;
typedef std::shared_ptr<MidiDeviceSetting> MidiDeviceSettings;
bool _can_set_midi_latencies;
std::vector<MidiDeviceSettings> _midi_devices;
@ -280,7 +280,7 @@ private:
}
};
typedef boost::shared_ptr<StateStruct> State;
typedef std::shared_ptr<StateStruct> State;
typedef std::list<State> StateList;
static bool state_sort_cmp (const State& a, const State& b);

92
gtk2_ardour/export_channel_selector.cc
View File

@ -243,21 +243,24 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
for (Gtk::ListStore::Children::iterator r_it = route_list->children().begin(); r_it != route_list->children().end(); ++r_it) {
Glib::RefPtr<Gtk::ListStore> port_list = r_it->get_value (route_cols.port_list_col);
std::set<boost::weak_ptr<AudioPort> > route_ports;
std::set<boost::weak_ptr<AudioPort> > intersection;
std::map<boost::weak_ptr<AudioPort>, string> port_labels;
PortExportChannel::PortSet route_ports;
PortExportChannel::PortSet intersection;
std::map<std::weak_ptr<AudioPort>, string, std::owner_less<std::weak_ptr<AudioPort> > > port_labels;
for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) {
route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port));
port_labels.insert (make_pair ((*p_it)->get_value (route_cols.port_cols.port),
(*p_it)->get_value (route_cols.port_cols.label)));
(*p_it)->get_value (route_cols.port_cols.label)));
}
std::owner_less<std::weak_ptr<AudioPort> > cmp;
std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(),
route_ports.begin(), route_ports.end(),
std::insert_iterator<std::set<boost::weak_ptr<AudioPort> > > (intersection, intersection.begin()));
std::insert_iterator<PortExportChannel::PortSet> (intersection, intersection.begin()),
cmp);
intersection.erase (boost::weak_ptr<AudioPort> ()); // Remove "none" selection
intersection.erase (std::weak_ptr<AudioPort> ()); // Remove "none" selection
if (intersection.empty()) {
continue;
@ -269,13 +272,13 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
/* Set previous channels (if any) to none */
for (uint32_t chn = 1; chn < i; ++chn) {
r_it->set_value (route_cols.get_channel (chn).port, boost::weak_ptr<AudioPort> ());
r_it->set_value (route_cols.get_channel (chn).port, std::weak_ptr<AudioPort> ());
r_it->set_value (route_cols.get_channel (chn).label, string ("(none)"));
}
}
boost::weak_ptr<AudioPort> port = *intersection.begin();
std::map<boost::weak_ptr<AudioPort>, string>::iterator label_it = port_labels.find (port);
std::weak_ptr<AudioPort> port = *intersection.begin();
std::map<std::weak_ptr<AudioPort>, string>::iterator label_it = port_labels.find (port);
string label = label_it != port_labels.end() ? label_it->second : "error";
r_it->set_value (route_cols.get_channel (i).port, port);
@ -321,7 +324,7 @@ PortExportChannelSelector::ChannelTreeView::add_route (ARDOUR::IO * io)
row = *iter;
row[route_cols.port_cols.selected] = false;
row[route_cols.port_cols.port] = boost::weak_ptr<AudioPort> ();
row[route_cols.port_cols.port] = std::weak_ptr<AudioPort> ();
row[route_cols.port_cols.label] = "(none)";
}
@ -359,7 +362,7 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels
for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) {
std::string label = it->get_value(route_cols.selected) ? "(none)" : "";
it->set_value (route_cols.get_channel (n_channels).label, label);
it->set_value (route_cols.get_channel (n_channels).port, boost::weak_ptr<AudioPort> ());
it->set_value (route_cols.get_channel (n_channels).port, std::weak_ptr<AudioPort> ());
}
/* set column width */
@ -399,8 +402,8 @@ PortExportChannelSelector::ChannelTreeView::update_config ()
continue;
}
boost::weak_ptr<AudioPort> weak_port = row[route_cols.get_channel (i).port];
boost::shared_ptr<AudioPort> port = weak_port.lock ();
std::weak_ptr<AudioPort> weak_port = row[route_cols.get_channel (i).port];
std::shared_ptr<AudioPort> port = weak_port.lock ();
if (port) {
pec->add_port (port);
}
@ -426,7 +429,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (std::string
}
iter->set_value (route_cols.get_channel (i).label, std::string("(none)"));
iter->set_value (route_cols.get_channel (i).port, boost::weak_ptr<AudioPort> ());
iter->set_value (route_cols.get_channel (i).port, std::weak_ptr<AudioPort> ());
Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col);
Gtk::ListStore::Children::iterator port_it;
@ -457,7 +460,7 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (std::string c
for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
std::string label = port_it->get_value (route_cols.port_cols.label);
if (label == new_text) {
boost::weak_ptr<AudioPort> w = (*port_it)[route_cols.port_cols.port];
std::weak_ptr<AudioPort> w = (*port_it)[route_cols.port_cols.port];
iter->set_value (route_cols.get_channel (channel).port, w);
}
}
@ -671,7 +674,7 @@ TrackExportChannelSelector::sync_with_manager_state ()
auto channel_list = statelist.front()->config->get_channels();
if (!channel_list.empty ()) {
if (boost::dynamic_pointer_cast <RouteExportChannel> (channel_list.front ())) {
if (std::dynamic_pointer_cast <RouteExportChannel> (channel_list.front ())) {
track_output_button.set_active (false);
} else {
track_output_button.set_active (true);
@ -687,31 +690,31 @@ TrackExportChannelSelector::sync_with_manager_state ()
ExportChannelConfiguration::ChannelList const& chan_list = state->config->get_channels ();
for (auto const& c : chan_list) {
boost::shared_ptr<PortExportMIDI> pem;
boost::shared_ptr<PortExportChannel> pec;
boost::shared_ptr<RouteExportChannel> rec;
std::shared_ptr<PortExportMIDI> pem;
std::shared_ptr<PortExportChannel> pec;
std::shared_ptr<RouteExportChannel> rec;
if ((rec = boost::dynamic_pointer_cast <RouteExportChannel> (c))) {
if ((rec = std::dynamic_pointer_cast <RouteExportChannel> (c))) {
for (auto const& i : track_list->children ()) {
Gtk::TreeModel::Row row = *i;
boost::shared_ptr<Route> route = row[track_cols.route];
std::shared_ptr<Route> route = row[track_cols.route];
if (route == rec->route ()) {
row[track_cols.selected] = true;
break;
}
}
} else if ((pem = boost::dynamic_pointer_cast<PortExportMIDI> (c))) {
} else if ((pem = std::dynamic_pointer_cast<PortExportMIDI> (c))) {
bool breakout = false;
for (auto const& i : track_list->children ()) {
Gtk::TreeModel::Row row = *i;
boost::shared_ptr<Route> route = row[track_cols.route];
std::shared_ptr<Route> route = row[track_cols.route];
uint32_t n_audio = route->n_outputs().n_audio();
uint32_t n_midi = route->n_outputs().n_midi();
if (n_audio > 0 || n_midi == 0) {
continue;
}
for (uint32_t i = 0; i < n_midi; ++i) {
boost::shared_ptr<MidiPort> port = route->output()->midi (i);
std::shared_ptr<MidiPort> port = route->output()->midi (i);
assert (pem->port ());
if (port && port == pem->port ()) {
row[track_cols.selected] = true;
@ -722,20 +725,25 @@ TrackExportChannelSelector::sync_with_manager_state ()
continue;
}
}
} else if ((pec = boost::dynamic_pointer_cast<PortExportChannel> (c))) {
} else if ((pec = std::dynamic_pointer_cast<PortExportChannel> (c))) {
for (auto const& i : track_list->children ()) {
Gtk::TreeModel::Row row = *i;
boost::shared_ptr<Route> route = row[track_cols.route];
std::set<boost::weak_ptr<AudioPort>> route_ports;
std::set<boost::weak_ptr<AudioPort>> intersection;
std::shared_ptr<Route> route = row[track_cols.route];
PortExportChannel::PortSet route_ports;
PortExportChannel::PortSet intersection;
PortSet& ps (route->output()->ports ());
for (PortSet::audio_iterator p = ps.audio_begin (); p != ps.audio_end (); ++p) {
route_ports.insert (*p);
}
std::owner_less<std::weak_ptr<AudioPort> > cmp;
std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(),
route_ports.begin(), route_ports.end(),
std::insert_iterator<std::set<boost::weak_ptr<AudioPort>>> (intersection, intersection.begin ()));
route_ports.begin(), route_ports.end(),
std::insert_iterator<PortExportChannel::PortSet> (intersection, intersection.begin ()),
cmp);
if (!intersection.empty()) {
row[track_cols.selected] = true;
@ -758,14 +766,14 @@ TrackExportChannelSelector::select_tracks (int what)
for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) {
Gtk::TreeModel::Row row = *it;
boost::shared_ptr<Route> route = row[track_cols.route];
if (!boost::dynamic_pointer_cast<Track> (route)) {
std::shared_ptr<Route> route = row[track_cols.route];
if (!std::dynamic_pointer_cast<Track> (route)) {
continue;
}
if (0 == (what & 1) && boost::dynamic_pointer_cast<AudioTrack> (route)) {
if (0 == (what & 1) && std::dynamic_pointer_cast<AudioTrack> (route)) {
continue;
}
if (0 == (what & 2) && boost::dynamic_pointer_cast<MidiTrack> (route)) {
if (0 == (what & 2) && std::dynamic_pointer_cast<MidiTrack> (route)) {
continue;
}
if (excl_muted && route->muted ()) {
@ -787,8 +795,8 @@ TrackExportChannelSelector::select_busses ()
for (Gtk::ListStore::Children::iterator it = track_list->children().begin(); it != track_list->children().end(); ++it) {
Gtk::TreeModel::Row row = *it;
boost::shared_ptr<Route> route = row[track_cols.route];
if (!boost::dynamic_pointer_cast<Track> (route)) {
std::shared_ptr<Route> route = row[track_cols.route];
if (!std::dynamic_pointer_cast<Track> (route)) {
if (excl_muted && route->muted ()) {
continue;
}
@ -828,7 +836,7 @@ TrackExportChannelSelector::fill_list()
CoreSelection const& cs (_session->selection());
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if (!boost::dynamic_pointer_cast<Track>(*it)) {
if (!std::dynamic_pointer_cast<Track>(*it)) {
// not a track, must be a bus
if ((*it)->is_master () || (*it)->is_monitor ()) {
continue;
@ -843,7 +851,7 @@ TrackExportChannelSelector::fill_list()
}
}
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if (boost::dynamic_pointer_cast<AudioTrack>(*it) || boost::dynamic_pointer_cast<MidiTrack>(*it)) {
if (std::dynamic_pointer_cast<AudioTrack>(*it) || std::dynamic_pointer_cast<MidiTrack>(*it)) {
if (!(*it)->active ()) {
// don't include inactive tracks
continue;
@ -854,7 +862,7 @@ TrackExportChannelSelector::fill_list()
}
void
TrackExportChannelSelector::add_track (boost::shared_ptr<Route> route, bool selected)
TrackExportChannelSelector::add_track (std::shared_ptr<Route> route, bool selected)
{
Gtk::TreeModel::iterator iter = track_list->append();
Gtk::TreeModel::Row row = *iter;
@ -879,13 +887,13 @@ TrackExportChannelSelector::update_config()
ExportProfileManager::ChannelConfigStatePtr state;
boost::shared_ptr<Route> route = row[track_cols.route];
std::shared_ptr<Route> route = row[track_cols.route];
if (track_output_button.get_active()) {
uint32_t n_audio = route->n_outputs().n_audio();
uint32_t n_midi = route->n_outputs().n_midi();
for (uint32_t i = 0; i < n_audio; ++i) {
boost::shared_ptr<AudioPort> port = route->output()->audio (i);
std::shared_ptr<AudioPort> port = route->output()->audio (i);
if (port) {
ExportChannelPtr channel (new PortExportChannel ());
PortExportChannel * pec = static_cast<PortExportChannel *> (channel.get());
@ -901,7 +909,7 @@ TrackExportChannelSelector::update_config()
n_midi = 0;
}
for (uint32_t i = 0; i < n_midi; ++i) {
boost::shared_ptr<MidiPort> port = route->output()->midi (i);
std::shared_ptr<MidiPort> port = route->output()->midi (i);
if (port) {
ExportChannelPtr channel (new PortExportMIDI ());
PortExportMIDI* pem = static_cast<PortExportMIDI*> (channel.get());

14
gtk2_ardour/export_channel_selector.h
View File

@ -64,9 +64,9 @@ class XMLNode;
class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
protected:
typedef boost::shared_ptr<ARDOUR::ExportChannelConfiguration> ChannelConfigPtr;
typedef std::shared_ptr<ARDOUR::ExportChannelConfiguration> ChannelConfigPtr;
typedef std::list<ChannelConfigPtr> ChannelConfigList;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
typedef std::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
ProfileManagerPtr manager;
@ -148,7 +148,7 @@ private:
public:
Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
Gtk::TreeModelColumn<std::weak_ptr<ARDOUR::AudioPort> > port;
Gtk::TreeModelColumn<std::string> label;
};
std::list<Channel> channels;
@ -166,7 +166,7 @@ private:
PortCols () { add(selected); add(port); add(label); }
Gtk::TreeModelColumn<bool> selected; // not used ATM
Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
Gtk::TreeModelColumn<std::weak_ptr<ARDOUR::AudioPort> > port;
Gtk::TreeModelColumn<std::string> label;
};
PortCols port_cols;
@ -232,7 +232,7 @@ private:
void handle_selection ();
ARDOUR::ExportProfileManager::ChannelConfigStatePtr state;
boost::shared_ptr<ARDOUR::RegionExportChannelFactory> factory;
std::shared_ptr<ARDOUR::RegionExportChannelFactory> factory;
ARDOUR::AudioRegion const & region;
ARDOUR::AudioTrack & track;
@ -262,7 +262,7 @@ class TrackExportChannelSelector : public ExportChannelSelector
void fill_list();
bool sync_with_manager_state ();
void add_track (boost::shared_ptr<ARDOUR::Route> route, bool selected);
void add_track (std::shared_ptr<ARDOUR::Route> route, bool selected);
void update_config();
ChannelConfigList configs;
@ -271,7 +271,7 @@ class TrackExportChannelSelector : public ExportChannelSelector
struct TrackCols : public Gtk::TreeModelColumnRecord
{
public:
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<std::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<std::string> label;
Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<uint32_t> order_key;

4
gtk2_ardour/export_dialog.cc
View File

@ -265,7 +265,7 @@ ExportDialog::update_warnings_and_example_filename ()
/* Add new warnings */
boost::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
std::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
for (std::list<string>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
add_error (*it);
@ -352,7 +352,7 @@ ExportDialog::do_export (bool analysis_only)
_analysis_only = analysis_only;
if (analysis_only) {
for (auto const& fmt : profile_manager->get_formats ()) {
boost::shared_ptr<ExportFormatSpecification> fmp = fmt->format;
std::shared_ptr<ExportFormatSpecification> fmp = fmt->format;
fmp->set_format_id (ExportFormatBase::F_None);
fmp->set_type (ExportFormatBase::T_None);
fmp->set_analyse (true);

8
gtk2_ardour/export_dialog.h
View File

@ -76,8 +76,8 @@ protected:
Gtk::Dialog::on_response (response_id);
}
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef std::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef std::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
ARDOUR::ExportProfileManager::ExportType type;
HandlerPtr handler;
@ -94,7 +94,7 @@ protected:
boost::scoped_ptr<ExportChannelSelector> channel_selector;
boost::scoped_ptr<ExportFileNotebook> file_notebook;
boost::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
std::shared_ptr<SoundcloudExportSelector> soundcloud_selector;
Gtk::VBox warning_widget;
Gtk::VBox progress_widget;
@ -123,7 +123,7 @@ private:
void show_progress ();
gint progress_timeout ();
typedef boost::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
typedef std::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
PublicEditor & editor;
StatusPtr status;

2
gtk2_ardour/export_file_notebook.cc
View File

@ -53,7 +53,7 @@ ExportFileNotebook::ExportFileNotebook () :
}
void
ExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager)
ExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, std::shared_ptr<ARDOUR::ExportProfileManager> manager)
{
SessionHandlePtr::set_session (s);
profile_manager = manager;

10
gtk2_ardour/export_file_notebook.h
View File

@ -46,19 +46,19 @@ public:
ExportFileNotebook ();
void set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager);
void set_session_and_manager (ARDOUR::Session * s, std::shared_ptr<ARDOUR::ExportProfileManager> manager);
void sync_with_manager ();
void update_example_filenames();
boost::shared_ptr<SoundcloudExportSelector> soundcloud_export_selector;
std::shared_ptr<SoundcloudExportSelector> soundcloud_export_selector;
sigc::signal<void> CriticalSelectionChanged;
private:
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
typedef boost::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
typedef std::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef std::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
typedef std::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
class FilePage;
ManagerPtr profile_manager;

4
gtk2_ardour/export_filename_selector.h
View File

@ -40,7 +40,7 @@
class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{
public:
typedef boost::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
typedef std::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
ExportFilenameSelector ();
~ExportFilenameSelector ();
@ -71,7 +71,7 @@ private:
void open_browse_dialog ();
void open_folder ();
boost::shared_ptr<ARDOUR::ExportFilename> filename;
std::shared_ptr<ARDOUR::ExportFilename> filename;
Glib::RefPtr<Gtk::SizeGroup> label_sizegroup;

68
gtk2_ardour/export_format_dialog.cc
View File

@ -428,7 +428,7 @@ ExportFormatDialog::load_state (FormatPtr spec)
}
for (Gtk::ListStore::Children::iterator it = format_list->children ().begin (); it != format_list->children ().end (); ++it) {
boost::shared_ptr<ARDOUR::ExportFormat> format_in_list = it->get_value (format_cols.ptr);
std::shared_ptr<ARDOUR::ExportFormat> format_in_list = it->get_value (format_cols.ptr);
if (spec->is_format (format_in_list)) {
format_in_list->set_selected (true);
break;
@ -559,9 +559,9 @@ ExportFormatDialog::init_format_table ()
/* Encoding options */
boost::shared_ptr<HasSampleFormat> hsf;
std::shared_ptr<HasSampleFormat> hsf;
if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (*it))) {
if ((hsf = std::dynamic_pointer_cast<HasSampleFormat> (*it))) {
hsf->SampleFormatSelectChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_selection, this, _1, _2), gui_context ());
hsf->SampleFormatCompatibleChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_compatibility, this, _1, _2), gui_context ());
@ -825,11 +825,11 @@ ExportFormatDialog::change_dither_type_selection (bool select, WeakDitherTypePtr
template <typename T, typename ColsT>
void
ExportFormatDialog::change_selection (bool select, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore>& list, Gtk::TreeView& view, ColsT& cols)
ExportFormatDialog::change_selection (bool select, std::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore>& list, Gtk::TreeView& view, ColsT& cols)
{
++applying_changes_from_engine;
boost::shared_ptr<T> ptr = w_ptr.lock ();
std::shared_ptr<T> ptr = w_ptr.lock ();
Gtk::ListStore::Children::iterator it;
Glib::RefPtr<Gtk::TreeSelection> selection;
@ -886,10 +886,10 @@ ExportFormatDialog::change_dither_type_compatibility (bool compatibility, WeakDi
template <typename T, typename ColsT>
void
ExportFormatDialog::change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore>& list, ColsT& cols,
ExportFormatDialog::change_compatibility (bool compatibility, std::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore>& list, ColsT& cols,
std::string const& c_incompatible, std::string const& c_compatible)
{
boost::shared_ptr<T> ptr = w_ptr.lock ();
std::shared_ptr<T> ptr = w_ptr.lock ();
Gtk::ListStore::Children::iterator it;
for (it = list->children ().begin (); it != list->children ().end (); ++it) {
@ -1107,27 +1107,27 @@ ExportFormatDialog::change_encoding_options (ExportFormatPtr ptr)
fill_sample_rate_lists (ptr);
empty_encoding_option_table ();
boost::shared_ptr<ARDOUR::ExportFormatLinear> linear_ptr;
boost::shared_ptr<ARDOUR::ExportFormatOggVorbis> ogg_ptr;
boost::shared_ptr<ARDOUR::ExportFormatFLAC> flac_ptr;
boost::shared_ptr<ARDOUR::ExportFormatOggOpus> opus_ptr;
boost::shared_ptr<ARDOUR::ExportFormatBWF> bwf_ptr;
boost::shared_ptr<ARDOUR::ExportFormatMPEG> mpeg_ptr;
boost::shared_ptr<ARDOUR::ExportFormatFFMPEG> ffmpeg_ptr;
std::shared_ptr<ARDOUR::ExportFormatLinear> linear_ptr;
std::shared_ptr<ARDOUR::ExportFormatOggVorbis> ogg_ptr;
std::shared_ptr<ARDOUR::ExportFormatFLAC> flac_ptr;
std::shared_ptr<ARDOUR::ExportFormatOggOpus> opus_ptr;
std::shared_ptr<ARDOUR::ExportFormatBWF> bwf_ptr;
std::shared_ptr<ARDOUR::ExportFormatMPEG> mpeg_ptr;
std::shared_ptr<ARDOUR::ExportFormatFFMPEG> ffmpeg_ptr;
if ((linear_ptr = boost::dynamic_pointer_cast<ExportFormatLinear> (ptr))) {
if ((linear_ptr = std::dynamic_pointer_cast<ExportFormatLinear> (ptr))) {
show_linear_enconding_options (linear_ptr);
} else if ((ogg_ptr = boost::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr))) {
} else if ((ogg_ptr = std::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr))) {
show_ogg_enconding_options (ogg_ptr);
} else if ((opus_ptr = boost::dynamic_pointer_cast<ExportFormatOggOpus> (ptr))) {
} else if ((opus_ptr = std::dynamic_pointer_cast<ExportFormatOggOpus> (ptr))) {
show_opus_enconding_options (opus_ptr);
} else if ((flac_ptr = boost::dynamic_pointer_cast<ExportFormatFLAC> (ptr))) {
} else if ((flac_ptr = std::dynamic_pointer_cast<ExportFormatFLAC> (ptr))) {
show_flac_enconding_options (flac_ptr);
} else if ((bwf_ptr = boost::dynamic_pointer_cast<ExportFormatBWF> (ptr))) {
} else if ((bwf_ptr = std::dynamic_pointer_cast<ExportFormatBWF> (ptr))) {
show_bwf_enconding_options (bwf_ptr);
} else if ((mpeg_ptr = boost::dynamic_pointer_cast<ExportFormatMPEG> (ptr))) {
} else if ((mpeg_ptr = std::dynamic_pointer_cast<ExportFormatMPEG> (ptr))) {
show_mpeg_enconding_options (mpeg_ptr);
} else if ((ffmpeg_ptr = boost::dynamic_pointer_cast<ExportFormatFFMPEG> (ptr))) {
} else if ((ffmpeg_ptr = std::dynamic_pointer_cast<ExportFormatFFMPEG> (ptr))) {
show_ffmpeg_enconding_options (ffmpeg_ptr);
} else {
std::cout << "Unrecognized format!" << std::endl;
@ -1149,7 +1149,7 @@ ExportFormatDialog::remove_widget (Gtk::Widget& to_remove, Gtk::Container* remov
}
void
ExportFormatDialog::show_linear_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatLinear> ptr)
ExportFormatDialog::show_linear_enconding_options (std::shared_ptr<ARDOUR::ExportFormatLinear> ptr)
{
/* Set label and pack table */
@ -1161,13 +1161,13 @@ ExportFormatDialog::show_linear_enconding_options (boost::shared_ptr<ARDOUR::Exp
encoding_options_table.attach (sample_format_view, 0, 1, 1, 2);
encoding_options_table.attach (dither_type_view, 1, 2, 1, 2);
fill_sample_format_lists (boost::dynamic_pointer_cast<HasSampleFormat> (ptr));
fill_sample_format_lists (std::dynamic_pointer_cast<HasSampleFormat> (ptr));
show_all_children ();
}
void
ExportFormatDialog::show_ogg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatOggVorbis> ptr)
ExportFormatDialog::show_ogg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatOggVorbis> ptr)
{
encoding_options_label.set_label (_("Ogg Vorbis options"));
@ -1178,7 +1178,7 @@ ExportFormatDialog::show_ogg_enconding_options (boost::shared_ptr<ARDOUR::Export
}
void
ExportFormatDialog::show_opus_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatOggOpus> ptr)
ExportFormatDialog::show_opus_enconding_options (std::shared_ptr<ARDOUR::ExportFormatOggOpus> ptr)
{
encoding_options_label.set_label (_("OPUS options"));
encoding_options_table.resize (1, 1);
@ -1188,7 +1188,7 @@ ExportFormatDialog::show_opus_enconding_options (boost::shared_ptr<ARDOUR::Expor
}
void
ExportFormatDialog::show_flac_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatFLAC> ptr)
ExportFormatDialog::show_flac_enconding_options (std::shared_ptr<ARDOUR::ExportFormatFLAC> ptr)
{
encoding_options_label.set_label (_("FLAC options"));
@ -1198,13 +1198,13 @@ ExportFormatDialog::show_flac_enconding_options (boost::shared_ptr<ARDOUR::Expor
encoding_options_table.attach (sample_format_view, 0, 1, 1, 2);
encoding_options_table.attach (dither_type_view, 1, 2, 1, 2);
fill_sample_format_lists (boost::dynamic_pointer_cast<HasSampleFormat> (ptr));
fill_sample_format_lists (std::dynamic_pointer_cast<HasSampleFormat> (ptr));
show_all_children ();
}
void
ExportFormatDialog::show_bwf_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatBWF> ptr)
ExportFormatDialog::show_bwf_enconding_options (std::shared_ptr<ARDOUR::ExportFormatBWF> ptr)
{
encoding_options_label.set_label (_("Broadcast Wave options"));
@ -1214,13 +1214,13 @@ ExportFormatDialog::show_bwf_enconding_options (boost::shared_ptr<ARDOUR::Export
encoding_options_table.attach (sample_format_view, 0, 1, 1, 2);
encoding_options_table.attach (dither_type_view, 1, 2, 1, 2);
fill_sample_format_lists (boost::dynamic_pointer_cast<HasSampleFormat> (ptr));
fill_sample_format_lists (std::dynamic_pointer_cast<HasSampleFormat> (ptr));
show_all_children ();
}
void
ExportFormatDialog::show_mpeg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatMPEG> ptr)
ExportFormatDialog::show_mpeg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatMPEG> ptr)
{
encoding_options_label.set_label (_("Variable bit rate quality"));
encoding_options_table.resize (1, 1);
@ -1231,7 +1231,7 @@ ExportFormatDialog::show_mpeg_enconding_options (boost::shared_ptr<ARDOUR::Expor
}
void
ExportFormatDialog::show_ffmpeg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatFFMPEG> ptr)
ExportFormatDialog::show_ffmpeg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatFFMPEG> ptr)
{
encoding_options_label.set_label (_("FFMPEG/MP3 options"));
encoding_options_table.resize (1, 1);
@ -1241,7 +1241,7 @@ ExportFormatDialog::show_ffmpeg_enconding_options (boost::shared_ptr<ARDOUR::Exp
}
void
ExportFormatDialog::fill_sample_rate_lists (boost::shared_ptr<ARDOUR::ExportFormat> ptr)
ExportFormatDialog::fill_sample_rate_lists (std::shared_ptr<ARDOUR::ExportFormat> ptr)
{
Gtk::TreeModel::iterator iter;
Gtk::TreeModel::Row row;
@ -1268,7 +1268,7 @@ ExportFormatDialog::fill_sample_rate_lists (boost::shared_ptr<ARDOUR::ExportForm
}
void
ExportFormatDialog::fill_sample_format_lists (boost::shared_ptr<ARDOUR::HasSampleFormat> ptr)
ExportFormatDialog::fill_sample_format_lists (std::shared_ptr<ARDOUR::HasSampleFormat> ptr)
{
/* Fill lists */
@ -1311,7 +1311,7 @@ ExportFormatDialog::fill_sample_format_lists (boost::shared_ptr<ARDOUR::HasSampl
}
void
ExportFormatDialog::fill_codec_quality_lists (boost::shared_ptr<ARDOUR::HasCodecQuality> ptr)
ExportFormatDialog::fill_codec_quality_lists (std::shared_ptr<ARDOUR::HasCodecQuality> ptr)
{
HasCodecQuality::CodecQualityList const& codecs = ptr->get_codec_qualities ();

26
gtk2_ardour/export_format_dialog.h
View File

@ -62,7 +62,7 @@ private:
typedef ARDOUR::ExportFormatManager::WeakSampleFormatPtr WeakSampleFormatPtr;
typedef ARDOUR::ExportFormatManager::WeakDitherTypePtr WeakDitherTypePtr;
typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
typedef std::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
public:
@ -116,7 +116,7 @@ private:
void change_dither_type_selection (bool select, WeakDitherTypePtr type);
template<typename T, typename ColsT>
void change_selection (bool select, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, Gtk::TreeView & view, ColsT & cols);
void change_selection (bool select, std::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, Gtk::TreeView & view, ColsT & cols);
void change_quality_compatibility (bool compatibility, WeakQualityPtr quality);
void change_format_compatibility (bool compatibility, WeakFormatPtr format);
@ -125,7 +125,7 @@ private:
void change_dither_type_compatibility (bool compatibility, WeakDitherTypePtr type);
template<typename T, typename ColsT>
void change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
void change_compatibility (bool compatibility, std::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
std::string const & c_incompatible = "red", std::string const & c_compatible = "white");
void update_description();
@ -164,17 +164,17 @@ private:
void empty_encoding_option_table ();
void remove_widget (Gtk::Widget & to_remove, Gtk::Container * remove_from);
void show_linear_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatLinear> ptr);
void show_ogg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatOggVorbis> ptr);
void show_flac_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatFLAC> ptr);
void show_bwf_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatBWF> ptr);
void show_opus_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatOggOpus> ptr);
void show_mpeg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatMPEG> ptr);
void show_ffmpeg_enconding_options (boost::shared_ptr<ARDOUR::ExportFormatFFMPEG> ptr);
void show_linear_enconding_options (std::shared_ptr<ARDOUR::ExportFormatLinear> ptr);
void show_ogg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatOggVorbis> ptr);
void show_flac_enconding_options (std::shared_ptr<ARDOUR::ExportFormatFLAC> ptr);
void show_bwf_enconding_options (std::shared_ptr<ARDOUR::ExportFormatBWF> ptr);
void show_opus_enconding_options (std::shared_ptr<ARDOUR::ExportFormatOggOpus> ptr);
void show_mpeg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatMPEG> ptr);
void show_ffmpeg_enconding_options (std::shared_ptr<ARDOUR::ExportFormatFFMPEG> ptr);
void fill_sample_format_lists (boost::shared_ptr<ARDOUR::HasSampleFormat> ptr);
void fill_codec_quality_lists (boost::shared_ptr<ARDOUR::HasCodecQuality> ptr);
void fill_sample_rate_lists (boost::shared_ptr<ARDOUR::ExportFormat> ptr);
void fill_sample_format_lists (std::shared_ptr<ARDOUR::HasSampleFormat> ptr);
void fill_codec_quality_lists (std::shared_ptr<ARDOUR::HasCodecQuality> ptr);
void fill_sample_rate_lists (std::shared_ptr<ARDOUR::ExportFormat> ptr);
/*** GUI components ***/

2
gtk2_ardour/export_format_selector.h
View File

@ -44,7 +44,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
private:
typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
typedef std::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
typedef std::list<FormatPtr> FormatList;
public:

2
gtk2_ardour/export_preset_selector.cc
View File

@ -67,7 +67,7 @@ ExportPresetSelector::ExportPresetSelector (bool readonly)
}
void
ExportPresetSelector::set_manager (boost::shared_ptr<ARDOUR::ExportProfileManager> manager)
ExportPresetSelector::set_manager (std::shared_ptr<ARDOUR::ExportProfileManager> manager)
{
profile_manager = manager;
current = profile_manager->preset ();

4
gtk2_ardour/export_preset_selector.h
View File

@ -37,14 +37,14 @@ class ExportPresetSelector : public Gtk::HBox
public:
ExportPresetSelector (bool readonly = false);
void set_manager (boost::shared_ptr<ARDOUR::ExportProfileManager> manager);
void set_manager (std::shared_ptr<ARDOUR::ExportProfileManager> manager);
sigc::signal<void> CriticalSelectionChanged;
Gtk::ComboBox& the_combo () { return combo; }
private:
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef std::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
typedef ARDOUR::ExportPresetPtr PresetPtr;
typedef ARDOUR::ExportProfileManager::PresetList PresetList;

12
gtk2_ardour/export_report.cc
View File

@ -920,9 +920,9 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
}
if (SMFSource::valid_midi_file (path)) { return; }
boost::shared_ptr<Region> r;
std::shared_ptr<Region> r;
SourceList srclist;
boost::shared_ptr<AudioFileSource> afs;
std::shared_ptr<AudioFileSource> afs;
bool old_sbp = AudioSource::get_build_peakfiles ();
/* don't even think of building peakfiles for these files */
@ -930,12 +930,12 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
for (unsigned int n = 0; n < n_chn; ++n) {
try {
afs = boost::dynamic_pointer_cast<AudioFileSource> (
afs = std::dynamic_pointer_cast<AudioFileSource> (
SourceFactory::createExternal (DataType::AUDIO, *_session,
path, n,
Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false));
if (afs->sample_rate() != _session->nominal_sample_rate()) {
boost::shared_ptr<SrcFileSource> sfs (new SrcFileSource(*_session, afs, ARDOUR::SrcGood));
std::shared_ptr<SrcFileSource> sfs (new SrcFileSource(*_session, afs, ARDOUR::SrcGood));
srclist.push_back(sfs);
} else {
srclist.push_back(afs);
@ -953,7 +953,7 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
return;
}
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
afs = std::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
std::string rname = region_name_from_path (afs->path(), false);
PBD::PropertyList plist;
@ -963,7 +963,7 @@ ExportReport::audition (std::string path, unsigned n_chn, int page)
plist.add (ARDOUR::Properties::name, rname);
plist.add (ARDOUR::Properties::layer, 0);
r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
r = std::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
r->set_position (timepos_t ());
_session->audition_region(r);

2
gtk2_ardour/export_report.h
View File

@ -187,7 +187,7 @@ private:
class ExportReport : public ArdourDialog
{
public:
typedef boost::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
typedef std::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
ExportReport (ARDOUR::Session*, StatusPtr);
ExportReport (const std::string & title, const ARDOUR::AnalysisResults & ar);
int run ();

6
gtk2_ardour/export_timespan_selector.h
View File

@ -63,11 +63,11 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{
protected:
typedef std::list<ARDOUR::Location*> LocationList;
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
typedef std::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef std::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
typedef std::list<ARDOUR::ExportTimespanPtr> TimespanList;
typedef boost::shared_ptr<TimespanList> TimespanListPtr;
typedef std::shared_ptr<TimespanList> TimespanListPtr;
typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
public:

8
gtk2_ardour/export_video_dialog.cc
View File

@ -472,9 +472,9 @@ ExportVideoDialog::launch_export ()
/* export audio track */
ExportTimespanPtr tsp = _session->get_export_handler ()->add_timespan ();
boost::shared_ptr<ExportChannelConfiguration> ccp = _session->get_export_handler ()->add_channel_config ();
boost::shared_ptr<ARDOUR::ExportFilename> fnp = _session->get_export_handler ()->add_filename ();
boost::shared_ptr<AudioGrapher::BroadcastInfo> b;
std::shared_ptr<ExportChannelConfiguration> ccp = _session->get_export_handler ()->add_channel_config ();
std::shared_ptr<ARDOUR::ExportFilename> fnp = _session->get_export_handler ()->add_filename ();
std::shared_ptr<AudioGrapher::BroadcastInfo> b;
XMLTree tree;
string vtl_normalize = _normalize ? "true" : "false";
@ -527,7 +527,7 @@ ExportVideoDialog::launch_export ()
.c_str ());
/* clang-format on */
boost::shared_ptr<ExportFormatSpecification> fmp = _session->get_export_handler ()->add_format (*tree.root ());
std::shared_ptr<ExportFormatSpecification> fmp = _session->get_export_handler ()->add_format (*tree.root ());
/* set up range */
samplepos_t start, end;

2
gtk2_ardour/export_video_dialog.h
View File

@ -75,7 +75,7 @@ private:
bool _aborted;
bool _normalize;
boost::shared_ptr<ARDOUR::ExportStatus> status;
std::shared_ptr<ARDOUR::ExportStatus> status;
TimeSelection _export_range;
sigc::connection _audio_progress_connection;

92
gtk2_ardour/foldback_strip.cc
View File

@ -61,7 +61,7 @@ using namespace std;
#define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ()))
FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, boost::shared_ptr<ARDOUR::Route> sr, boost::shared_ptr<ARDOUR::Route> fr, uint32_t wd)
FoldbackSend::FoldbackSend (std::shared_ptr<Send> snd, std::shared_ptr<ARDOUR::Route> sr, std::shared_ptr<ARDOUR::Route> fr, uint32_t wd)
: _button (ArdourButton::led_default_elements)
, _send (snd)
, _send_route (sr)
@ -71,7 +71,7 @@ FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, boost::shared_ptr<ARDOU
, _width (wd)
, _pan_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain ()), 0, 1, 0.01, 0.1)
, _slider (&_adjustment, boost::shared_ptr<PBD::Controllable> (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ())))
, _slider (&_adjustment, std::shared_ptr<PBD::Controllable> (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ())))
, _ignore_ui_adjustment (true)
, _slider_persistant_tooltip (&_slider)
{
@ -95,7 +95,7 @@ FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, boost::shared_ptr<ARDOU
if (_foldback_route->input ()->n_ports ().n_audio () == 2) {
_button.set_layout_ellipsize_width (PX_SCALE (_width - 19) * PANGO_SCALE);
boost::shared_ptr<Pannable> pannable = _send->panner ()->pannable ();
std::shared_ptr<Pannable> pannable = _send->panner ()->pannable ();
_pan_control.set_size_request (PX_SCALE (19), PX_SCALE (19));
_pan_control.set_tooltip_prefix (_("Pan: "));
_pan_control.set_no_show_all (true);
@ -104,7 +104,7 @@ FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, boost::shared_ptr<ARDOU
_pan_control.set_controllable (pannable->pan_azimuth_control);
_pan_control.set_name (_send->panner_linked_to_route () ? "trim knob" : "pan knob");
}
boost::shared_ptr<AutomationControl> lc;
std::shared_ptr<AutomationControl> lc;
lc = _send->gain_control ();
_slider.set_controllable (lc);
_slider.set_name ("ProcessorControlSlider");
@ -131,13 +131,13 @@ FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, boost::shared_ptr<ARDOU
FoldbackSend::~FoldbackSend ()
{
_connections.drop_connections ();
_slider.set_controllable (boost::shared_ptr<AutomationControl> ());
_pan_control.set_controllable (boost::shared_ptr<AutomationControl> ());
_send = boost::shared_ptr<Send> ();
_send_route = boost::shared_ptr<Route> ();
_foldback_route = boost::shared_ptr<Route> ();
_send_proc = boost::shared_ptr<Processor> ();
_send_del = boost::shared_ptr<Delivery> ();
_slider.set_controllable (std::shared_ptr<AutomationControl> ());
_pan_control.set_controllable (std::shared_ptr<AutomationControl> ());
_send = std::shared_ptr<Send> ();
_send_route = std::shared_ptr<Route> ();
_foldback_route = std::shared_ptr<Route> ();
_send_proc = std::shared_ptr<Processor> ();
_send_del = std::shared_ptr<Delivery> ();
}
void
@ -221,7 +221,7 @@ FoldbackSend::send_state_changed ()
void
FoldbackSend::send_pan_changed ()
{
boost::shared_ptr<Pannable> pannable = _send->panner ()->pannable ();
std::shared_ptr<Pannable> pannable = _send->panner ()->pannable ();
_pan_control.set_controllable (pannable->pan_azimuth_control);
}
@ -231,7 +231,7 @@ FoldbackSend::level_adjusted ()
if (_ignore_ui_adjustment) {
return;
}
boost::shared_ptr<AutomationControl> lc = _send->gain_control ();
std::shared_ptr<AutomationControl> lc = _send->gain_control ();
if (!lc) {
return;
@ -244,7 +244,7 @@ FoldbackSend::level_adjusted ()
void
FoldbackSend::level_changed ()
{
boost::shared_ptr<AutomationControl> lc = _send->gain_control ();
std::shared_ptr<AutomationControl> lc = _send->gain_control ();
if (!lc) {
return;
}
@ -263,7 +263,7 @@ FoldbackSend::level_changed ()
void
FoldbackSend::set_tooltip ()
{
boost::shared_ptr<AutomationControl> lc = _send->gain_control ();
std::shared_ptr<AutomationControl> lc = _send->gain_control ();
if (!lc) {
return;
@ -317,7 +317,7 @@ FoldbackSend::set_gain (float new_gain)
/* get level from sending route */
new_gain = _send_route->gain_control ()->get_value ();
}
boost::shared_ptr<AutomationControl> lc = _send->gain_control ();
std::shared_ptr<AutomationControl> lc = _send->gain_control ();
if (!lc) {
return;
@ -328,16 +328,16 @@ FoldbackSend::set_gain (float new_gain)
void
FoldbackSend::set_send_position (bool post)
{
boost::shared_ptr<Route> new_snd_rt = _send_route;
boost::shared_ptr<Route> new_fb_rt = _foldback_route;
std::shared_ptr<Route> new_snd_rt = _send_route;
std::shared_ptr<Route> new_fb_rt = _foldback_route;
float new_level = _send->gain_control ()->get_value ();
bool new_enable = _send_proc->enabled ();
bool is_pan = false;
float new_pan = 0.0;
if (_foldback_route->input ()->n_ports ().n_audio () == 2) {
is_pan = true;
boost::shared_ptr<Pannable> pannable = _send_del->panner ()->pannable ();
boost::shared_ptr<Controllable> ac;
std::shared_ptr<Pannable> pannable = _send_del->panner ()->pannable ();
std::shared_ptr<Controllable> ac;
ac = pannable->pan_azimuth_control;
new_pan = ac->get_value ();
}
@ -345,15 +345,15 @@ FoldbackSend::set_send_position (bool post)
remove_me ();
new_snd_rt->add_foldback_send (new_fb_rt, post);
boost::shared_ptr<Send> snd = new_snd_rt->internal_send_for (new_fb_rt);
std::shared_ptr<Send> snd = new_snd_rt->internal_send_for (new_fb_rt);
if (snd) {
snd->gain_control ()->set_value (new_level, Controllable::NoGroup);
boost::shared_ptr<Processor> snd_proc = boost::dynamic_pointer_cast<Processor> (snd);
std::shared_ptr<Processor> snd_proc = std::dynamic_pointer_cast<Processor> (snd);
snd_proc->enable (new_enable);
if (is_pan) {
boost::shared_ptr<Delivery> new_del = boost::dynamic_pointer_cast<Delivery> (snd);
boost::shared_ptr<Pannable> pannable = new_del->panner ()->pannable ();
boost::shared_ptr<Controllable> ac;
std::shared_ptr<Delivery> new_del = std::dynamic_pointer_cast<Delivery> (snd);
std::shared_ptr<Pannable> pannable = new_del->panner ()->pannable ();
std::shared_ptr<Controllable> ac;
ac = pannable->pan_azimuth_control;
ac->set_value (new_pan, Controllable::NoGroup);
}
@ -363,7 +363,7 @@ FoldbackSend::set_send_position (bool post)
void
FoldbackSend::remove_me ()
{
boost::shared_ptr<Processor> send_proc = boost::dynamic_pointer_cast<Processor> (_send);
std::shared_ptr<Processor> send_proc = std::dynamic_pointer_cast<Processor> (_send);
_connections.drop_connections ();
_send_route->remove_processor (send_proc);
}
@ -372,7 +372,7 @@ FoldbackSend::remove_me ()
PBD::Signal1<void, FoldbackStrip*> FoldbackStrip::CatchDeletion;
FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt)
FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, std::shared_ptr<Route> rt)
: SessionHandlePtr (sess)
, RouteUI (sess)
, _mixer (mx)
@ -573,7 +573,7 @@ FoldbackStrip::name () const
}
void
FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
FoldbackStrip::set_route (std::shared_ptr<Route> rt)
{
if (!rt) {
clear_send_box ();
@ -659,7 +659,7 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
}
struct StripableByPresentationOrder {
bool operator() (const boost::shared_ptr<Stripable>& a, const boost::shared_ptr<Stripable>& b) const
bool operator() (const std::shared_ptr<Stripable>& a, const std::shared_ptr<Stripable>& b) const
{
return a->presentation_info ().order () < b->presentation_info ().order ();
}
@ -680,9 +680,9 @@ FoldbackStrip::update_send_box ()
}
stripables.sort (StripableByPresentationOrder ());
for (StripableList::iterator it = stripables.begin (); it != stripables.end (); ++it) {
boost::shared_ptr<Stripable> s_sp = *it;
boost::shared_ptr<Route> s_rt = boost::dynamic_pointer_cast<Route> (s_sp);
boost::shared_ptr<Send> snd = s_rt->internal_send_for (_route);
std::shared_ptr<Stripable> s_sp = *it;
std::shared_ptr<Route> s_rt = std::dynamic_pointer_cast<Route> (s_sp);
std::shared_ptr<Send> snd = s_rt->internal_send_for (_route);
if (snd) {
FoldbackSend* fb_s = new FoldbackSend (snd, s_rt, _route, _width);
_send_display.pack_start (*fb_s, Gtk::PACK_SHRINK);
@ -842,7 +842,7 @@ FoldbackStrip::build_route_select_menu ()
fb_list = _session->get_routelist (true, PresentationInfo::FoldbackBus);
for (RouteList::iterator s = fb_list.begin (); s != fb_list.end (); ++s) {
boost::shared_ptr<Route> route = (*s);
std::shared_ptr<Route> route = (*s);
if (route == _route) {
continue;
}
@ -856,7 +856,7 @@ FoldbackStrip::name_button_button_press (GdkEventButton* ev)
{
if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS) {
StripableList slist;
boost::shared_ptr<Route> previous = boost::shared_ptr<Route> ();
std::shared_ptr<Route> previous = std::shared_ptr<Route> ();
_session->get_stripables (slist, PresentationInfo::FoldbackBus);
if (slist.size () > 1) {
Menu* menu = build_route_select_menu ();
@ -954,7 +954,7 @@ FoldbackStrip::presentation_info_changed (PropertyChange const& what_changed)
}
void
FoldbackStrip::spill_change (boost::shared_ptr<Stripable> s)
FoldbackStrip::spill_change (std::shared_ptr<Stripable> s)
{
if (s == _route) {
_showing_sends = true;
@ -970,7 +970,7 @@ FoldbackStrip::fast_update ()
* So, much like the mackie control, we just want the highest peak from
* all channels in the route.
*/
boost::shared_ptr<PeakMeter> peak_meter = _route->shared_peak_meter ();
std::shared_ptr<PeakMeter> peak_meter = _route->shared_peak_meter ();
const float meter_level = peak_meter->meter_level (0, MeterMCP);
_meter->set (log_meter0dB (meter_level));
}
@ -1054,13 +1054,13 @@ FoldbackStrip::deselect_all_processors ()
void
FoldbackStrip::create_selected_sends (ARDOUR::Placement p, bool)
{
boost::shared_ptr<StripableList> slist (new StripableList);
std::shared_ptr<StripableList> slist (new StripableList);
PresentationInfo::Flag fl = PresentationInfo::MixerRoutes;
_session->get_stripables (*slist, fl);
for (StripableList::iterator i = (*slist).begin (); i != (*slist).end (); ++i) {
if ((*i)->is_selected () && !(*i)->is_master () && !(*i)->is_monitor ()) {
boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (*i);
std::shared_ptr<Route> rt = std::dynamic_pointer_cast<Route> (*i);
if (rt) {
rt->add_foldback_send (_route, p == PostFader);
}
@ -1073,8 +1073,8 @@ void
FoldbackStrip::duplicate_current_fb ()
{
RouteList new_rt_lst;
boost::shared_ptr<Route> new_fb;
boost::shared_ptr<Route> old_fb = _route;
std::shared_ptr<Route> new_fb;
std::shared_ptr<Route> old_fb = _route;
string new_name_tp = "Foldback";
/* get number of io so long as it is 1 or 2 */
@ -1091,13 +1091,13 @@ FoldbackStrip::duplicate_current_fb ()
new_fb->gain_control ()->set_value (oldgain * 0.25, PBD::Controllable::NoGroup);
for (auto const& rt : old_fb->signal_sources (true)) {
boost::shared_ptr<Send> old_snd = rt->internal_send_for (old_fb);
std::shared_ptr<Send> old_snd = rt->internal_send_for (old_fb);
if (old_snd) {
boost::shared_ptr<Processor> old_proc = old_snd;
std::shared_ptr<Processor> old_proc = old_snd;
bool old_pre = old_proc->get_pre_fader ();
rt->add_foldback_send (new_fb, !old_pre);
float old_gain = old_snd->gain_control ()->get_value ();
boost::shared_ptr<Send> new_snd = rt->internal_send_for (new_fb);
std::shared_ptr<Send> new_snd = rt->internal_send_for (new_fb);
new_snd->gain_control ()->set_value (old_gain, PBD::Controllable::NoGroup);
}
}
@ -1113,13 +1113,13 @@ FoldbackStrip::remove_current_fb ()
{
clear_send_box ();
StripableList slist;
boost::shared_ptr<Route> next = boost::shared_ptr<Route> ();
boost::shared_ptr<Route> old_route = _route;
std::shared_ptr<Route> next = std::shared_ptr<Route> ();
std::shared_ptr<Route> old_route = _route;
_session->get_stripables (slist, PresentationInfo::FoldbackBus);
if (slist.size ()) {
for (StripableList::iterator s = slist.begin (); s != slist.end (); ++s) {
if ((*s) != _route) {
next = boost::dynamic_pointer_cast<Route> (*s);
next = std::dynamic_pointer_cast<Route> (*s);
break;
}
}

22
gtk2_ardour/foldback_strip.h
View File

@ -78,7 +78,7 @@ class ArdourWindow;
class FoldbackSend : public Gtk::VBox
{
public:
FoldbackSend (boost::shared_ptr<ARDOUR::Send>, boost::shared_ptr<ARDOUR::Route> sr, boost::shared_ptr<ARDOUR::Route> fr, uint32_t wd);
FoldbackSend (std::shared_ptr<ARDOUR::Send>, std::shared_ptr<ARDOUR::Route> sr, std::shared_ptr<ARDOUR::Route> fr, uint32_t wd);
~FoldbackSend ();
private:
@ -100,11 +100,11 @@ private:
Gtk::Menu* build_send_menu ();
ArdourWidgets::ArdourButton _button;
boost::shared_ptr<ARDOUR::Send> _send;
boost::shared_ptr<ARDOUR::Route> _send_route;
boost::shared_ptr<ARDOUR::Route> _foldback_route;
boost::shared_ptr<ARDOUR::Processor> _send_proc;
boost::shared_ptr<ARDOUR::Delivery> _send_del;
std::shared_ptr<ARDOUR::Send> _send;
std::shared_ptr<ARDOUR::Route> _send_route;
std::shared_ptr<ARDOUR::Route> _foldback_route;
std::shared_ptr<ARDOUR::Processor> _send_proc;
std::shared_ptr<ARDOUR::Delivery> _send_del;
uint32_t _width;
ArdourWidgets::ArdourKnob _pan_control;
Gtk::Adjustment _adjustment;
@ -117,7 +117,7 @@ private:
class FoldbackStrip : public RouteUI, public Gtk::EventBox
{
public:
FoldbackStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
FoldbackStrip (Mixer_UI&, ARDOUR::Session*, std::shared_ptr<ARDOUR::Route>);
~FoldbackStrip ();
std::string name () const;
@ -125,7 +125,7 @@ public:
PluginSelector* plugin_selector ();
void fast_update ();
void set_route (boost::shared_ptr<ARDOUR::Route>);
void set_route (std::shared_ptr<ARDOUR::Route>);
void set_button_names ();
PannerUI& panner_ui ()
@ -133,13 +133,13 @@ public:
return _panners;
}
boost::shared_ptr<ARDOUR::Stripable> stripable () const
std::shared_ptr<ARDOUR::Stripable> stripable () const
{
return RouteUI::stripable ();
}
/** The delivery that we are handling the level for with our fader has changed */
PBD::Signal1<void, boost::weak_ptr<ARDOUR::Delivery> > DeliveryChanged;
PBD::Signal1<void, std::weak_ptr<ARDOUR::Delivery> > DeliveryChanged;
static PBD::Signal1<void, FoldbackStrip*> CatchDeletion;
@ -176,7 +176,7 @@ private:
void update_panner_choices ();
void update_output_display ();
void spill_change (boost::shared_ptr<ARDOUR::Stripable>);
void spill_change (std::shared_ptr<ARDOUR::Stripable>);
void route_property_changed (const PBD::PropertyChange&);
void presentation_info_changed (PBD::PropertyChange const&);

30
gtk2_ardour/gain_meter.cc
View File

@ -121,10 +121,10 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
if (horizontal) {
gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider = manage (new HSliderController (&gain_adjustment, std::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll));
} else {
gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider = manage (new VSliderController (&gain_adjustment, std::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider->set_tweaks (ArdourFader::NoButtonForward);
}
@ -224,10 +224,10 @@ GainMeterBase::~GainMeterBase ()
}
void
GainMeterBase::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> pm,
boost::shared_ptr<Amp> amp,
boost::shared_ptr<GainControl> control)
GainMeterBase::set_controls (std::shared_ptr<Route> r,
std::shared_ptr<PeakMeter> pm,
std::shared_ptr<Amp> amp,
std::shared_ptr<GainControl> control)
{
connections.clear ();
model_connections.drop_connections ();
@ -236,7 +236,7 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
if (!pm && !control) {
level_meter->set_meter (0);
gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
gain_slider->set_controllable (std::shared_ptr<PBD::Controllable>());
_meter.reset ();
_amp.reset ();
_route.reset ();
@ -992,10 +992,10 @@ GainMeter::GainMeter (Session* s, int fader_length)
GainMeter::~GainMeter () { }
void
GainMeter::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> meter,
boost::shared_ptr<Amp> amp,
boost::shared_ptr<GainControl> control)
GainMeter::set_controls (std::shared_ptr<Route> r,
std::shared_ptr<PeakMeter> meter,
std::shared_ptr<Amp> amp,
std::shared_ptr<GainControl> control)
{
if (meter_hbox.get_parent()) {
hbox.remove (meter_hbox);
@ -1095,13 +1095,13 @@ GainMeter::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
peak_display.queue_draw();
}
boost::shared_ptr<PBD::Controllable>
std::shared_ptr<PBD::Controllable>
GainMeterBase::get_controllable()
{
if (_amp) {
return _control;
} else {
return boost::shared_ptr<PBD::Controllable>();
return std::shared_ptr<PBD::Controllable>();
}
}
@ -1124,8 +1124,8 @@ GainMeter::meter_configuration_changed (ChanCount c)
}
}
bool is_audio_track = _route && boost::dynamic_pointer_cast<AudioTrack>(_route) != 0;
bool is_midi_track = _route && boost::dynamic_pointer_cast<MidiTrack>(_route) != 0;
bool is_audio_track = _route && std::dynamic_pointer_cast<AudioTrack>(_route) != 0;
bool is_midi_track = _route && std::dynamic_pointer_cast<MidiTrack>(_route) != 0;
if (!is_audio_track && (is_midi_track || /* MIDI Bus */ (type == (1 << DataType::MIDI)))) {
if (!_route || _route->active()) {

26
gtk2_ardour/gain_meter.h
View File

@ -80,10 +80,10 @@ public:
GainMeterBase (ARDOUR::Session*, bool horizontal, int, int);
virtual ~GainMeterBase ();
virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
boost::shared_ptr<ARDOUR::PeakMeter> meter,
boost::shared_ptr<ARDOUR::Amp> amp,
boost::shared_ptr<ARDOUR::GainControl> control);
virtual void set_controls (std::shared_ptr<ARDOUR::Route> route,
std::shared_ptr<ARDOUR::PeakMeter> meter,
std::shared_ptr<ARDOUR::Amp> amp,
std::shared_ptr<ARDOUR::GainControl> control);
void update_gain_sensitive ();
void update_meters ();
@ -101,7 +101,7 @@ public:
virtual void setup_meters (int len=0);
boost::shared_ptr<PBD::Controllable> get_controllable();
std::shared_ptr<PBD::Controllable> get_controllable();
LevelMeterHBox& get_level_meter() const { return *level_meter; }
ArdourWidgets::SliderController& get_gain_slider() const { return *gain_slider; }
@ -122,10 +122,10 @@ protected:
friend class MeterStrip;
friend class RouteTimeAxisView;
friend class VCAMasterStrip;
boost::shared_ptr<ARDOUR::Route> _route;
boost::shared_ptr<ARDOUR::PeakMeter> _meter;
boost::shared_ptr<ARDOUR::Amp> _amp;
boost::shared_ptr<ARDOUR::GainControl> _control;
std::shared_ptr<ARDOUR::Route> _route;
std::shared_ptr<ARDOUR::PeakMeter> _meter;
std::shared_ptr<ARDOUR::Amp> _amp;
std::shared_ptr<ARDOUR::GainControl> _control;
std::vector<sigc::connection> connections;
PBD::ScopedConnectionList model_connections;
@ -223,10 +223,10 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
GainMeter (ARDOUR::Session*, int);
virtual ~GainMeter ();
virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
boost::shared_ptr<ARDOUR::PeakMeter> meter,
boost::shared_ptr<ARDOUR::Amp> amp,
boost::shared_ptr<ARDOUR::GainControl> control);
virtual void set_controls (std::shared_ptr<ARDOUR::Route> route,
std::shared_ptr<ARDOUR::PeakMeter> meter,
std::shared_ptr<ARDOUR::Amp> amp,
std::shared_ptr<ARDOUR::GainControl> control);
int get_gm_width ();
void setup_meters (int len=0);

22
gtk2_ardour/generic_pluginui.cc
View File

@ -84,7 +84,7 @@ using namespace ArdourWidgets;
using namespace Gtk;
using namespace ARDOUR_UI_UTILS;
GenericPluginUI::GenericPluginUI (boost::shared_ptr<PlugInsertBase> pib, bool scrollable)
GenericPluginUI::GenericPluginUI (std::shared_ptr<PlugInsertBase> pib, bool scrollable)
: PlugUIBase (pib)
, automation_menu (0)
, is_scrollable(scrollable)
@ -172,7 +172,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PlugInsertBase> pib, bool sc
continue;
}
const Evoral::Parameter param(PluginAutomation, 0, i);
boost::shared_ptr<ARDOUR::AutomationControl> c (boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
std::shared_ptr<ARDOUR::AutomationControl> c (std::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
if (!c) {
continue;
}
@ -202,7 +202,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PlugInsertBase> pib, bool sc
main_contents.pack_start (settings_box, false, false);
if (_pi) {
_pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, boost::weak_ptr<Processor>(_pi)), gui_context());
_pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, std::weak_ptr<Processor>(_pi)), gui_context());
_bypass_button.set_active (!_pi->enabled());
} else {
_bypass_button.set_sensitive (false);
@ -356,7 +356,7 @@ GenericPluginUI::build ()
ControlUI* cui;
boost::shared_ptr<ARDOUR::AutomationControl> c (boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
std::shared_ptr<ARDOUR::AutomationControl> c (std::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
if (c && c->flags () & Controllable::HiddenControl) {
continue;
@ -384,7 +384,7 @@ GenericPluginUI::build ()
const ParameterDescriptor& desc = d->second;
const Evoral::Parameter param(PluginPropertyAutomation, 0, desc.key);
boost::shared_ptr<ARDOUR::AutomationControl> c (boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
std::shared_ptr<ARDOUR::AutomationControl> c (std::dynamic_pointer_cast<ARDOUR::AutomationControl>(_pib->control (param)));
if (!c) {
error << string_compose(_("Plugin Editor: no control for property %1"), desc.key) << endmsg;
@ -711,7 +711,7 @@ GenericPluginUI::midi_refill_patches ()
for (uint8_t chn = 0; chn < 16; ++chn) {
midi_pgmsel[chn]->clear_items ();
boost::shared_ptr<MIDI::Name::ChannelNameSet> cns =
std::shared_ptr<MIDI::Name::ChannelNameSet> cns =
MIDI::Name::MidiPatchManager::instance().find_channel_name_set (model, mode, chn);
if (cns) {
@ -761,9 +761,9 @@ GenericPluginUI::midi_bank_patch_select (uint8_t chn, uint32_t bankpgm)
MidiTrack* mt = _pi ? dynamic_cast<MidiTrack*> (_pi->owner()) : NULL;
if (mt) {
/* send to track */
boost::shared_ptr<AutomationControl> bank_msb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true);
boost::shared_ptr<AutomationControl> bank_lsb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true);
boost::shared_ptr<AutomationControl> program = mt->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true);
std::shared_ptr<AutomationControl> bank_msb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true);
std::shared_ptr<AutomationControl> bank_lsb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true);
std::shared_ptr<AutomationControl> program = mt->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true);
bank_msb->set_value (bank >> 7, PBD::Controllable::NoGroup);
bank_lsb->set_value (bank & 127, PBD::Controllable::NoGroup);
@ -860,7 +860,7 @@ GenericPluginUI::automation_state_changed (ControlUI* cui)
GenericPluginUI::ControlUI*
GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
const ParameterDescriptor& desc,
boost::shared_ptr<AutomationControl> mcontrol,
std::shared_ptr<AutomationControl> mcontrol,
float value,
bool is_input,
bool use_knob)
@ -1292,7 +1292,7 @@ GenericPluginUI::output_update ()
for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
float val = plugin->get_parameter ((*i)->parameter().id());
char buf[32];
boost::shared_ptr<ReadOnlyControl> c = _pib->control_output ((*i)->parameter().id());
std::shared_ptr<ReadOnlyControl> c = _pib->control_output ((*i)->parameter().id());
const std::string& str = ARDOUR::value_as_string(c->desc(), Variant(val));
size_t len = str.copy(buf, 31);
buf[len] = '\0';

4
gtk2_ardour/ghostregion.cc
View File

@ -454,7 +454,7 @@ MidiGhostRegion::model_changed ()
/* we rely on the parent MRV having removed notes not in the model */
for (EventList::iterator i = events.begin(); i != events.end(); ) {
boost::shared_ptr<NoteType> note = i->first;
std::shared_ptr<NoteType> note = i->first;
GhostEvent* cne = i->second;
const bool visible = (note->note() >= parent_mrv._current_range_min) &&
(note->note() <= parent_mrv._current_range_max);
@ -479,7 +479,7 @@ MidiGhostRegion::model_changed ()
* @return Our Event, or 0 if not found.
*/
MidiGhostRegion::GhostEvent *
MidiGhostRegion::find_event (boost::shared_ptr<NoteType> parent)
MidiGhostRegion::find_event (std::shared_ptr<NoteType> parent)
{
/* we are using _optimization_iterator to speed up the common case where a caller
is going through our notes in order.

4
gtk2_ardour/ghostregion.h
View File

@ -134,9 +134,9 @@ private:
MidiRegionView& parent_mrv;
typedef Evoral::Note<Temporal::Beats> NoteType;
MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
MidiGhostRegion::GhostEvent* find_event (std::shared_ptr<NoteType>);
typedef boost::unordered_map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
typedef boost::unordered_map<std::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
EventList events;
EventList::iterator _optimization_iterator;
};

8
gtk2_ardour/global_port_matrix.cc
View File

@ -68,8 +68,8 @@ GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
std::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
std::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
if (p) {
if (s) {
@ -117,8 +117,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
boost::shared_ptr<Port> p = AudioEngine::instance()->get_port_by_name (*i);
boost::shared_ptr<Port> q = AudioEngine::instance()->get_port_by_name (*j);
std::shared_ptr<Port> p = AudioEngine::instance()->get_port_by_name (*i);
std::shared_ptr<Port> q = AudioEngine::instance()->get_port_by_name (*j);
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */

28
gtk2_ardour/group_tabs.cc
View File

@ -218,7 +218,7 @@ GroupTabs::on_button_release_event (GdkEventButton*)
if (_dragging_new_tab) {
run_new_group_dialog (&routes, false);
} else {
boost::shared_ptr<RouteList> r = _session->get_routes ();
std::shared_ptr<RouteList> r = _session->get_routes ();
/* First add new ones, then remove old ones.
* We cannot allow the group to become temporarily empty, because
* Session::route_removed_from_route_group() will delete empty groups.
@ -394,7 +394,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
items.push_back (SeparatorElem());
bool can_subgroup = true;
boost::shared_ptr<RouteList> rl = g->route_list();
std::shared_ptr<RouteList> rl = g->route_list();
for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
#ifdef MIXBUS
if ((*i)->mixbus ()) {
@ -482,7 +482,7 @@ GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool renam
return;
}
boost::shared_ptr<VCA> master;
std::shared_ptr<VCA> master;
if (which == 0) {
if (_session->vca_manager().create_vca (1).empty ()) {
@ -518,7 +518,7 @@ GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const
return;
}
boost::shared_ptr<VCA> master = _session->vca_manager().vca_by_number (which);
std::shared_ptr<VCA> master = _session->vca_manager().vca_by_number (which);
if (!master) {
/* should never happen; if it does, basically something deeply
@ -538,7 +538,7 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl, std::string vcan
return;
}
boost::shared_ptr<VCA> master;
std::shared_ptr<VCA> master;
bool set_name = false;
if (which == 0) {
@ -584,10 +584,10 @@ GroupTabs::get_rec_enabled ()
return rec_enabled;
}
boost::shared_ptr<RouteList> rl = _session->get_routes ();
std::shared_ptr<RouteList> rl = _session->get_routes ();
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
boost::shared_ptr<Track> trk (boost::dynamic_pointer_cast<Track> (*i));
std::shared_ptr<Track> trk (std::dynamic_pointer_cast<Track> (*i));
if (trk && trk->rec_enable_control()->get_value()) {
rec_enabled.push_back (*i);
}
@ -725,7 +725,7 @@ GroupTabs::un_subgroup (RouteGroup* g)
void
GroupTabs::collect (RouteGroup* g)
{
boost::shared_ptr<RouteList> group_routes = g->route_list ();
std::shared_ptr<RouteList> group_routes = g->route_list ();
group_routes->sort (Stripable::Sorter());
int const N = group_routes->size ();
@ -792,7 +792,7 @@ GroupTabs::set_activation (RouteGroup* g, bool a)
void
GroupTabs::remove_group (RouteGroup* g)
{
boost::shared_ptr<RouteList> rl (g->route_list ());
std::shared_ptr<RouteList> rl (g->route_list ());
_session->remove_route_group (*g);
emit_gui_changed_for_members (rl);
@ -875,11 +875,11 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
}
void
GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr<Route> w)
GroupTabs::route_added_to_route_group (RouteGroup*, std::weak_ptr<Route> w)
{
/* Similarly-spirited hack as in route_group_property_changed */
boost::shared_ptr<Route> r = w.lock ();
std::shared_ptr<Route> r = w.lock ();
if (!r) {
return;
}
@ -890,11 +890,11 @@ GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr<Route> w)
}
void
GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w)
GroupTabs::route_removed_from_route_group (RouteGroup*, std::weak_ptr<Route> w)
{
/* Similarly-spirited hack as in route_group_property_changed */
boost::shared_ptr<Route> r = w.lock ();
std::shared_ptr<Route> r = w.lock ();
if (!r) {
return;
}
@ -905,7 +905,7 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w
}
void
GroupTabs::emit_gui_changed_for_members (boost::shared_ptr<RouteList> rl)
GroupTabs::emit_gui_changed_for_members (std::shared_ptr<RouteList> rl)
{
PresentationInfo::ChangeSuspender cs;

6
gtk2_ardour/group_tabs.h
View File

@ -81,7 +81,7 @@ protected:
};
private:
static void emit_gui_changed_for_members (boost::shared_ptr<ARDOUR::RouteList>);
static void emit_gui_changed_for_members (std::shared_ptr<ARDOUR::RouteList>);
/** Compute all the tabs for this widget.
* @return Tabs.
@ -136,8 +136,8 @@ private:
Tab * click_to_tab (double, std::list<Tab>::iterator *, std::list<Tab>::iterator *);
void route_group_property_changed (ARDOUR::RouteGroup *);
void route_added_to_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>);
void route_removed_from_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>);
void route_added_to_route_group (ARDOUR::RouteGroup *, std::weak_ptr<ARDOUR::Route>);
void route_removed_from_route_group (ARDOUR::RouteGroup *, std::weak_ptr<ARDOUR::Route>);
void assign_group_to_master (uint32_t which, ARDOUR::RouteGroup*, bool rename_master) const;
void unassign_group_to_master (uint32_t which, ARDOUR::RouteGroup*) const;

2
gtk2_ardour/hit.cc
View File

@ -29,7 +29,7 @@
using namespace ARDOUR;
using namespace ArdourCanvas;
Hit::Hit (MidiRegionView& region, Item* parent, double size, const boost::shared_ptr<NoteType> note, bool with_events)
Hit::Hit (MidiRegionView& region, Item* parent, double size, const std::shared_ptr<NoteType> note, bool with_events)
: NoteBase (region, with_events, note)
{
_polygon = new ArdourCanvas::Polygon (parent);

2
gtk2_ardour/hit.h
View File

@ -35,7 +35,7 @@ public:
Hit (MidiRegionView& region,
ArdourCanvas::Item* parent,
double size,
const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
const std::shared_ptr<NoteType> note = std::shared_ptr<NoteType>(),
bool with_events = true);
~Hit();

58
gtk2_ardour/io_button.cc
View File

@ -54,7 +54,7 @@ IOButtonBase::maybe_update (PropertyChange const& what_changed)
}
static bool
exclusively_connected (boost::shared_ptr<IO> dest_io, boost::shared_ptr<IO> io, DataType dt, uint32_t tcnt, std::string const& name, ostringstream& label)
exclusively_connected (std::shared_ptr<IO> dest_io, std::shared_ptr<IO> io, DataType dt, uint32_t tcnt, std::string const& name, ostringstream& label)
{
/* check if IO is exclusively connected to a subset of this Route's ports */
uint32_t n = 0;
@ -95,7 +95,7 @@ exclusively_connected (boost::shared_ptr<IO> dest_io, boost::shared_ptr<IO> io,
}
DataType
IOButtonBase::guess_main_type (boost::shared_ptr<IO> io)
IOButtonBase::guess_main_type (std::shared_ptr<IO> io)
{
/* The heuristic follows these principles:
* A) If all ports that the user connected are of the same type, then he
@ -185,7 +185,7 @@ IOButtonBase::guess_main_type (boost::shared_ptr<IO> io)
* '-----------------------------------------------'
*/
void
IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, boost::shared_ptr<ARDOUR::Bundle>& bndl, boost::shared_ptr<ARDOUR::IO> io)
IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, std::shared_ptr<ARDOUR::Bundle>& bndl, std::shared_ptr<ARDOUR::IO> io)
{
ostringstream tooltip;
ostringstream label;
@ -252,9 +252,9 @@ IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, boost::sh
/* Are all main-typed channels connected to the same route ? */
if (!have_label) {
boost::shared_ptr<ARDOUR::RouteList> routes = session.get_routes ();
std::shared_ptr<ARDOUR::RouteList> routes = session.get_routes ();
for (auto const& route : *routes) {
boost::shared_ptr<IO> dest_io = input ? route->output () : route->input ();
std::shared_ptr<IO> dest_io = input ? route->output () : route->input ();
if (io->bundle ()->connected_to (dest_io->bundle (), session.engine (), dt, true)) {
label << Gtkmm2ext::markup_escape_text (route->name ());
have_label = true;
@ -276,11 +276,11 @@ IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, boost::sh
/* Are all main-typed channels connected to the same (user) bundle ? */
if (!have_label) {
boost::shared_ptr<ARDOUR::BundleList> bundles = session.bundles ();
boost::shared_ptr<ARDOUR::Port> ap = boost::dynamic_pointer_cast<ARDOUR::Port> (session.vkbd_output_port ());
std::shared_ptr<ARDOUR::BundleList> bundles = session.bundles ();
std::shared_ptr<ARDOUR::Port> ap = std::dynamic_pointer_cast<ARDOUR::Port> (session.vkbd_output_port ());
std::string vkbd_portname = AudioEngine::instance ()->make_port_name_non_relative (ap->name ());
for (auto const& bundle : *bundles) {
if (boost::dynamic_pointer_cast<UserBundle> (bundle) == 0) {
if (std::dynamic_pointer_cast<UserBundle> (bundle) == 0) {
if (!bundle->offers_port (vkbd_portname)) {
continue;
}
@ -343,7 +343,7 @@ IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, boost::sh
/* check for direct connections to I/O Plugins */
if (!have_label) {
for (auto const& iop : *session.io_plugs ()) {
boost::shared_ptr<IO> i = input ? iop->output () : iop->input ();
std::shared_ptr<IO> i = input ? iop->output () : iop->input ();
if (!io->connected_to (i)) {
continue;
}
@ -430,7 +430,7 @@ IOButton::IOButton (bool input)
}
void
IOButton::set_route (boost::shared_ptr<ARDOUR::Route> rt, RouteUI* routeui)
IOButton::set_route (std::shared_ptr<ARDOUR::Route> rt, RouteUI* routeui)
{
_connections.drop_connections ();
_bundle_connections.drop_connections ();
@ -457,16 +457,16 @@ IOButton::~IOButton ()
{
}
boost::shared_ptr<IO>
std::shared_ptr<IO>
IOButton::io () const
{
return _input ? _route->input () : _route->output ();
}
boost::shared_ptr<Track>
std::shared_ptr<Track>
IOButton::track () const
{
return boost::dynamic_pointer_cast<Track> (_route);
return std::dynamic_pointer_cast<Track> (_route);
}
void
@ -478,10 +478,10 @@ IOButton::port_pretty_name_changed (std::string pn)
}
void
IOButton::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::weak_ptr<Port> wb)
IOButton::port_connected_or_disconnected (std::weak_ptr<Port> wa, std::weak_ptr<Port> wb)
{
boost::shared_ptr<Port> a = wa.lock ();
boost::shared_ptr<Port> b = wb.lock ();
std::shared_ptr<Port> a = wa.lock ();
std::shared_ptr<Port> b = wb.lock ();
if ((a && io ()->has_port (a)) || (b && io ()->has_port (b))) {
update ();
@ -489,7 +489,7 @@ IOButton::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::weak_
}
void
IOButton::bundle_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
IOButton::bundle_chosen (std::shared_ptr<ARDOUR::Bundle> c)
{
if (_input) {
_route->input ()->connect_ports_to_bundle (c, true, this);
@ -521,7 +521,7 @@ IOButton::button_resized (Gtk::Allocation& alloc)
}
struct RouteCompareByName {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b)
bool operator() (std::shared_ptr<Route> a, std::shared_ptr<Route> b)
{
return a->name ().compare (b->name ()) < 0;
}
@ -577,18 +577,18 @@ IOButton::button_press (GdkEventButton* ev)
_menu_bundles.clear ();
ARDOUR::BundleList current = io ()->bundles_connected ();
boost::shared_ptr<ARDOUR::BundleList> b = _route->session ().bundles ();
std::shared_ptr<ARDOUR::BundleList> b = _route->session ().bundles ();
if (_input) {
/* give user bundles first chance at being in the menu */
for (ARDOUR::BundleList::iterator i = b->begin (); i != b->end (); ++i) {
if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
if (std::dynamic_pointer_cast<UserBundle> (*i)) {
maybe_add_bundle_to_menu (*i, current);
}
}
for (ARDOUR::BundleList::iterator i = b->begin (); i != b->end (); ++i) {
if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
if (std::dynamic_pointer_cast<UserBundle> (*i) == 0) {
maybe_add_bundle_to_menu (*i, current);
}
}
@ -597,13 +597,13 @@ IOButton::button_press (GdkEventButton* ev)
DataType intended_type = guess_main_type (_input ? _route->input () : _route->output ());
/* try adding the master bus first */
boost::shared_ptr<Route> master = _route->session ().master_out ();
std::shared_ptr<Route> master = _route->session ().master_out ();
if (master) {
maybe_add_bundle_to_menu (master->input ()->bundle (), current, intended_type);
}
}
boost::shared_ptr<ARDOUR::RouteList> routes = _route->session ().get_routes ();
std::shared_ptr<ARDOUR::RouteList> routes = _route->session ().get_routes ();
RouteList copy = *routes;
copy.sort (RouteCompareByName ());
@ -643,14 +643,14 @@ IOButton::button_press (GdkEventButton* ev)
/* then try adding user output bundles, often labeled/grouped physical inputs */
for (ARDOUR::BundleList::iterator i = b->begin (); i != b->end (); ++i) {
if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
if (std::dynamic_pointer_cast<UserBundle> (*i)) {
maybe_add_bundle_to_menu (*i, current, intended_type);
}
}
/* then all other bundles, including physical outs or other software */
for (ARDOUR::BundleList::iterator i = b->begin (); i != b->end (); ++i) {
if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
if (std::dynamic_pointer_cast<UserBundle> (*i) == 0) {
maybe_add_bundle_to_menu (*i, current, intended_type);
}
}
@ -697,7 +697,7 @@ IOButton::button_press (GdkEventButton* ev)
void
IOButton::update ()
{
boost::shared_ptr<ARDOUR::Bundle> bundle;
std::shared_ptr<ARDOUR::Bundle> bundle;
_bundle_connections.drop_connections ();
set_label (*this, _route->session (), bundle, _input ? _route->input () : _route->output ());
@ -708,7 +708,7 @@ IOButton::update ()
}
void
IOButton::maybe_add_bundle_to_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/, ARDOUR::DataType type)
IOButton::maybe_add_bundle_to_menu (std::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/, ARDOUR::DataType type)
{
using namespace Gtk::Menu_Helpers;
@ -724,7 +724,7 @@ IOButton::maybe_add_bundle_to_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleL
}
/* Don't add the monitor input unless we are Master */
boost::shared_ptr<Route> monitor = _route->session ().monitor_out ();
std::shared_ptr<Route> monitor = _route->session ().monitor_out ();
if ((!_route->is_master ()) && monitor && b->has_same_ports (monitor->input ()->bundle ())) {
return;
}
@ -742,7 +742,7 @@ IOButton::maybe_add_bundle_to_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleL
}
/* Avoid adding duplicates */
list<boost::shared_ptr<Bundle>>::iterator i = _menu_bundles.begin ();
list<std::shared_ptr<Bundle>>::iterator i = _menu_bundles.begin ();
while (i != _menu_bundles.end () && b->has_same_ports (*i) == false) {
++i;
}

20
gtk2_ardour/io_button.h
View File

@ -52,8 +52,8 @@ public:
virtual ~IOButtonBase () {}
protected:
static void set_label (IOButtonBase&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Bundle>&, boost::shared_ptr<ARDOUR::IO>);
static ARDOUR::DataType guess_main_type (boost::shared_ptr<ARDOUR::IO>);
static void set_label (IOButtonBase&, ARDOUR::Session&, std::shared_ptr<ARDOUR::Bundle>&, std::shared_ptr<ARDOUR::IO>);
static ARDOUR::DataType guess_main_type (std::shared_ptr<ARDOUR::IO>);
virtual void update () = 0;
void maybe_update (PBD::PropertyChange const& what_changed);
@ -68,7 +68,7 @@ public:
IOButton (bool input);
~IOButton ();
void set_route (boost::shared_ptr<ARDOUR::Route>, RouteUI*);
void set_route (std::shared_ptr<ARDOUR::Route>, RouteUI*);
private:
void update ();
@ -76,20 +76,20 @@ private:
bool button_release (GdkEventButton*);
void button_resized (Gtk::Allocation&);
void port_pretty_name_changed (std::string);
void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
void maybe_add_bundle_to_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const&, ARDOUR::DataType = ARDOUR::DataType::NIL);
void port_connected_or_disconnected (std::weak_ptr<ARDOUR::Port>, std::weak_ptr<ARDOUR::Port>);
void maybe_add_bundle_to_menu (std::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const&, ARDOUR::DataType = ARDOUR::DataType::NIL);
void disconnect ();
void add_port (ARDOUR::DataType);
void bundle_chosen (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_chosen (std::shared_ptr<ARDOUR::Bundle>);
boost::shared_ptr<ARDOUR::IO> io () const;
boost::shared_ptr<ARDOUR::Track> track () const;
std::shared_ptr<ARDOUR::IO> io () const;
std::shared_ptr<ARDOUR::Track> track () const;
bool _input;
boost::shared_ptr<ARDOUR::Route> _route;
std::shared_ptr<ARDOUR::Route> _route;
RouteUI* _route_ui;
Gtk::Menu _menu;
std::list<boost::shared_ptr<ARDOUR::Bundle> > _menu_bundles;
std::list<std::shared_ptr<ARDOUR::Bundle> > _menu_bundles;
};
#endif

46
gtk2_ardour/io_plugin_window.cc
View File

@ -125,7 +125,7 @@ IOPluginWindow::refill ()
if (!_session) {
return;
}
boost::shared_ptr<IOPlugList> iop (_session->io_plugs ());
std::shared_ptr<IOPlugList> iop (_session->io_plugs ());
for (auto& i : *iop) {
IOPlugUI* iopup = manage (new IOPlugUI (i));
if (i->is_pre ()) {
@ -178,7 +178,7 @@ bool
IOPluginWindow::PluginBox::use_plugins (SelectedPlugins const& plugins)
{
for (SelectedPlugins::const_iterator p = plugins.begin (); p != plugins.end (); ++p) {
_session->load_io_plugin (boost::shared_ptr<IOPlug> (new IOPlug (*_session, *p, _is_pre)));
_session->load_io_plugin (std::shared_ptr<IOPlug> (new IOPlug (*_session, *p, _is_pre)));
}
return false;
}
@ -194,7 +194,7 @@ IOPluginWindow::PluginBox::load_plugin (PluginPresetPtr const& ppp)
if (ppp->_preset.valid) {
p->load_preset (ppp->_preset);
}
_session->load_io_plugin (boost::shared_ptr<IOPlug> (new IOPlug (*_session, p, _is_pre)));
_session->load_io_plugin (std::shared_ptr<IOPlug> (new IOPlug (*_session, p, _is_pre)));
}
bool
@ -235,7 +235,7 @@ IOPluginWindow::PluginBox::drag_data_received (Glib::RefPtr<Gdk::DragContext> co
for (auto const& i : nfos) {
PluginPtr p = i->load (*_session);
if (p) {
_session->load_io_plugin (boost::shared_ptr<IOPlug> (new IOPlug (*_session, p, _is_pre)));
_session->load_io_plugin (std::shared_ptr<IOPlug> (new IOPlug (*_session, p, _is_pre)));
}
}
@ -260,7 +260,7 @@ IOPluginWindow::PluginBox::drag_data_received (Glib::RefPtr<Gdk::DragContext> co
/* ****************************************************************************/
IOPluginWindow::IOPlugUI::IOPlugUI (boost::shared_ptr<ARDOUR::IOPlug> iop)
IOPluginWindow::IOPlugUI::IOPlugUI (std::shared_ptr<ARDOUR::IOPlug> iop)
: Alignment (0, 0.5, 0, 0)
, _btn_input (iop->input (), iop->is_pre ())
, _btn_output (iop->output (), iop->is_pre ())
@ -373,13 +373,13 @@ IOPluginWindow::IOPlugUI::button_resized (Gtk::Allocation& alloc)
/* ****************************************************************************/
IOPluginWindow::PluginWindowProxy::PluginWindowProxy (std::string const& name, boost::weak_ptr<PlugInsertBase> plugin)
IOPluginWindow::PluginWindowProxy::PluginWindowProxy (std::string const& name, std::weak_ptr<PlugInsertBase> plugin)
: WM::ProxyBase (name, std::string ())
, _pib (plugin)
, _is_custom (true)
, _want_custom (true)
{
boost::shared_ptr<PlugInsertBase> p = _pib.lock ();
std::shared_ptr<PlugInsertBase> p = _pib.lock ();
if (!p) {
return;
}
@ -394,7 +394,7 @@ IOPluginWindow::PluginWindowProxy::~PluginWindowProxy ()
Gtk::Window*
IOPluginWindow::PluginWindowProxy::get (bool create)
{
boost::shared_ptr<PlugInsertBase> p = _pib.lock ();
std::shared_ptr<PlugInsertBase> p = _pib.lock ();
if (!p) {
return 0;
}
@ -413,7 +413,7 @@ IOPluginWindow::PluginWindowProxy::get (bool create)
_window = new PluginUIWindow (p, false, _is_custom);
if (_window) {
boost::shared_ptr<ARDOUR::IOPlug> iop = boost::dynamic_pointer_cast<ARDOUR::IOPlug> (p);
std::shared_ptr<ARDOUR::IOPlug> iop = std::dynamic_pointer_cast<ARDOUR::IOPlug> (p);
assert (iop);
_window->set_title (iop->name ());
setup ();
@ -478,7 +478,7 @@ IOPluginWindow::PluginWindowProxy::plugin_going_away ()
/* ****************************************************************************/
IOPluginWindow::IOButton::IOButton (boost::shared_ptr<ARDOUR::IO> io, bool pre)
IOPluginWindow::IOButton::IOButton (std::shared_ptr<ARDOUR::IO> io, bool pre)
: _io (io)
, _pre (pre)
, _io_selector (0)
@ -525,10 +525,10 @@ IOPluginWindow::IOButton::port_pretty_name_changed (std::string pn)
}
void
IOPluginWindow::IOButton::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::weak_ptr<Port> wb)
IOPluginWindow::IOButton::port_connected_or_disconnected (std::weak_ptr<Port> wa, std::weak_ptr<Port> wb)
{
boost::shared_ptr<Port> a = wa.lock ();
boost::shared_ptr<Port> b = wb.lock ();
std::shared_ptr<Port> a = wa.lock ();
std::shared_ptr<Port> b = wb.lock ();
if ((a && _io->has_port (a)) || (b && _io->has_port (b))) {
update ();
@ -544,7 +544,7 @@ IOPluginWindow::IOButton::disconnect ()
void
IOPluginWindow::IOButton::update ()
{
boost::shared_ptr<ARDOUR::Bundle> bundle;
std::shared_ptr<ARDOUR::Bundle> bundle;
_bundle_connections.drop_connections ();
set_label (*this, _io->session (), bundle, _io);
@ -555,7 +555,7 @@ IOPluginWindow::IOButton::update ()
}
struct RouteCompareByName {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b)
bool operator() (std::shared_ptr<Route> a, std::shared_ptr<Route> b)
{
return a->name ().compare (b->name ()) < 0;
}
@ -586,8 +586,8 @@ IOPluginWindow::IOButton::button_press (GdkEventButton* ev)
uint32_t const n_with_separator = citems.size ();
boost::shared_ptr<ARDOUR::BundleList> b = _io->session ().bundles ();
boost::shared_ptr<ARDOUR::RouteList> routes = _io->session ().get_routes ();
std::shared_ptr<ARDOUR::BundleList> b = _io->session ().bundles ();
std::shared_ptr<ARDOUR::RouteList> routes = _io->session ().get_routes ();
RouteList copy = *routes;
copy.sort (RouteCompareByName ());
@ -597,12 +597,12 @@ IOPluginWindow::IOButton::button_press (GdkEventButton* ev)
* user-bundles first.
*/
for (auto const& i : *b) {
if (boost::dynamic_pointer_cast<UserBundle> (i)) {
if (std::dynamic_pointer_cast<UserBundle> (i)) {
maybe_add_bundle_to_menu (i);
}
}
for (auto const& i : *b) {
if (boost::dynamic_pointer_cast<UserBundle> (i) == 0) {
if (std::dynamic_pointer_cast<UserBundle> (i) == 0) {
maybe_add_bundle_to_menu (i);
}
}
@ -627,12 +627,12 @@ IOPluginWindow::IOButton::button_press (GdkEventButton* ev)
} else {
/* output of post-process plugins go to physical sinks */
for (auto const& i : *b) {
if (boost::dynamic_pointer_cast<UserBundle> (i)) {
if (std::dynamic_pointer_cast<UserBundle> (i)) {
maybe_add_bundle_to_menu (i);
}
}
for (auto const& i : *b) {
if (boost::dynamic_pointer_cast<UserBundle> (i) == 0) {
if (std::dynamic_pointer_cast<UserBundle> (i) == 0) {
maybe_add_bundle_to_menu (i);
}
}
@ -650,13 +650,13 @@ IOPluginWindow::IOButton::button_press (GdkEventButton* ev)
}
void
IOPluginWindow::IOButton::bundle_chosen (boost::shared_ptr<Bundle> c)
IOPluginWindow::IOButton::bundle_chosen (std::shared_ptr<Bundle> c)
{
_io->connect_ports_to_bundle (c, true, this);
}
void
IOPluginWindow::IOButton::maybe_add_bundle_to_menu (boost::shared_ptr<Bundle> b)
IOPluginWindow::IOButton::maybe_add_bundle_to_menu (std::shared_ptr<Bundle> b)
{
using namespace Menu_Helpers;

18
gtk2_ardour/io_plugin_window.h
View File

@ -51,7 +51,7 @@ public:
class PluginWindowProxy : public WM::ProxyBase
{
public:
PluginWindowProxy (std::string const&, boost::weak_ptr<ARDOUR::PlugInsertBase>);
PluginWindowProxy (std::string const&, std::weak_ptr<ARDOUR::PlugInsertBase>);
~PluginWindowProxy ();
Gtk::Window* get (bool create = false);
@ -73,7 +73,7 @@ public:
private:
void plugin_going_away ();
boost::weak_ptr<ARDOUR::PlugInsertBase> _pib;
std::weak_ptr<ARDOUR::PlugInsertBase> _pib;
bool _is_custom;
bool _want_custom;
@ -108,7 +108,7 @@ private:
class IOButton : public IOButtonBase
{
public:
IOButton (boost::shared_ptr<ARDOUR::IO>, bool pre);
IOButton (std::shared_ptr<ARDOUR::IO>, bool pre);
~IOButton ();
private:
@ -117,13 +117,13 @@ private:
bool button_release (GdkEventButton*);
void button_resized (Gtk::Allocation&);
void port_pretty_name_changed (std::string);
void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
void maybe_add_bundle_to_menu (boost::shared_ptr<ARDOUR::Bundle>);
void port_connected_or_disconnected (std::weak_ptr<ARDOUR::Port>, std::weak_ptr<ARDOUR::Port>);
void maybe_add_bundle_to_menu (std::shared_ptr<ARDOUR::Bundle>);
void disconnect ();
void bundle_chosen (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_chosen (std::shared_ptr<ARDOUR::Bundle>);
void edit_io_configuration ();
boost::shared_ptr<ARDOUR::IO> _io;
std::shared_ptr<ARDOUR::IO> _io;
bool _pre;
Gtk::Menu _menu;
IOSelectorWindow* _io_selector;
@ -132,7 +132,7 @@ private:
class IOPlugUI : public Gtk::Alignment
{
public:
IOPlugUI (boost::shared_ptr<ARDOUR::IOPlug>);
IOPlugUI (std::shared_ptr<ARDOUR::IOPlug>);
private:
bool button_press_event (GdkEventButton*);
@ -147,7 +147,7 @@ private:
IOButton _btn_output;
ArdourWidgets::ArdourButton _btn_ioplug;
PluginWindowProxy* _window_proxy;
boost::shared_ptr<ARDOUR::IOPlug> _iop;
std::shared_ptr<ARDOUR::IOPlug> _iop;
PBD::ScopedConnection _going_away_connection;
};

8
gtk2_ardour/io_selector.cc
View File

@ -44,7 +44,7 @@ using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
using namespace Gtk;
IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, std::shared_ptr<ARDOUR::IO> io)
: PortMatrix (p, session, DataType::NIL)
, _io (io)
{
@ -141,7 +141,7 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
boost::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
std::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
if (!f) {
return;
}
@ -178,7 +178,7 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const
for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
boost::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
std::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
/* since we are talking about an IO, our ports should all have an associated Port *,
so the above call should never fail */
@ -222,7 +222,7 @@ IOSelector::channel_noun () const
return _("port");
}
IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, std::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
: ArdourWindow (_("I/O selector"))
, _selector (this, session, io)
{

Some files were not shown because too many files have changed in this diff Show More