From b35518e21293cef8142093a7ce181dd4b66778e0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 16 Feb 2023 16:33:28 -0700 Subject: [PATCH] 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 leads to some complications, particularly with Evoral::Sequence and ExportPortChannel. --- gtk2_ardour/analysis_window.cc | 4 +- gtk2_ardour/ardour_ui.cc | 22 +- gtk2_ardour/ardour_ui3.cc | 12 +- gtk2_ardour/au_pluginui.h | 4 +- gtk2_ardour/audio_clip_editor.cc | 14 +- gtk2_ardour/audio_clip_editor.h | 10 +- gtk2_ardour/audio_clock.cc | 6 +- gtk2_ardour/audio_region_editor.cc | 2 +- gtk2_ardour/audio_region_editor.h | 4 +- gtk2_ardour/audio_region_properties_box.cc | 4 +- gtk2_ardour/audio_region_properties_box.h | 6 +- gtk2_ardour/audio_region_view.cc | 42 +- gtk2_ardour/audio_region_view.h | 20 +- gtk2_ardour/audio_streamview.cc | 36 +- gtk2_ardour/audio_streamview.h | 12 +- gtk2_ardour/audio_time_axis.cc | 2 +- gtk2_ardour/audio_time_axis.h | 2 +- gtk2_ardour/audio_trigger_properties_box.cc | 10 +- gtk2_ardour/automation_controller.cc | 10 +- gtk2_ardour/automation_controller.h | 14 +- gtk2_ardour/automation_line.cc | 4 +- gtk2_ardour/automation_line.h | 10 +- gtk2_ardour/automation_region_view.cc | 22 +- gtk2_ardour/automation_region_view.h | 12 +- gtk2_ardour/automation_selection.h | 2 +- gtk2_ardour/automation_streamview.cc | 42 +- gtk2_ardour/automation_streamview.h | 6 +- gtk2_ardour/automation_time_axis.cc | 30 +- gtk2_ardour/automation_time_axis.h | 30 +- gtk2_ardour/axis_provider.h | 4 +- gtk2_ardour/axis_view.h | 4 +- gtk2_ardour/beatbox_gui.cc | 6 +- gtk2_ardour/beatbox_gui.h | 4 +- gtk2_ardour/bundle_manager.cc | 40 +- gtk2_ardour/bundle_manager.h | 30 +- gtk2_ardour/control_slave_ui.cc | 16 +- gtk2_ardour/control_slave_ui.h | 6 +- gtk2_ardour/crossfade_edit.h | 12 +- gtk2_ardour/crossfade_view.h | 4 +- gtk2_ardour/cuebox_ui.cc | 8 +- gtk2_ardour/cursor_context.h | 2 +- gtk2_ardour/duplicate_routes_dialog.cc | 8 +- gtk2_ardour/edit_note_dialog.cc | 4 +- gtk2_ardour/editor.cc | 100 +-- gtk2_ardour/editor.h | 116 +-- gtk2_ardour/editor_audio_import.cc | 76 +- gtk2_ardour/editor_canvas.cc | 10 +- gtk2_ardour/editor_canvas_events.cc | 24 +- gtk2_ardour/editor_drag.cc | 128 +-- gtk2_ardour/editor_drag.h | 24 +- gtk2_ardour/editor_export_audio.cc | 52 +- gtk2_ardour/editor_markers.cc | 2 +- gtk2_ardour/editor_mixer.cc | 6 +- gtk2_ardour/editor_mouse.cc | 28 +- gtk2_ardour/editor_ops.cc | 344 ++++---- gtk2_ardour/editor_regions.cc | 18 +- gtk2_ardour/editor_regions.h | 6 +- gtk2_ardour/editor_selection.cc | 40 +- gtk2_ardour/editor_sources.cc | 28 +- gtk2_ardour/editor_sources.h | 2 +- gtk2_ardour/editor_summary.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/editor_timefx.cc | 22 +- gtk2_ardour/editor_videotimeline.cc | 4 +- gtk2_ardour/engine_dialog.cc | 78 +- gtk2_ardour/engine_dialog.h | 4 +- gtk2_ardour/export_channel_selector.cc | 92 ++- gtk2_ardour/export_channel_selector.h | 14 +- gtk2_ardour/export_dialog.cc | 4 +- gtk2_ardour/export_dialog.h | 8 +- gtk2_ardour/export_file_notebook.cc | 2 +- gtk2_ardour/export_file_notebook.h | 10 +- gtk2_ardour/export_filename_selector.h | 4 +- gtk2_ardour/export_format_dialog.cc | 68 +- gtk2_ardour/export_format_dialog.h | 26 +- gtk2_ardour/export_format_selector.h | 2 +- gtk2_ardour/export_preset_selector.cc | 2 +- gtk2_ardour/export_preset_selector.h | 4 +- gtk2_ardour/export_report.cc | 12 +- gtk2_ardour/export_report.h | 2 +- gtk2_ardour/export_timespan_selector.h | 6 +- gtk2_ardour/export_video_dialog.cc | 8 +- gtk2_ardour/export_video_dialog.h | 2 +- gtk2_ardour/foldback_strip.cc | 92 +-- gtk2_ardour/foldback_strip.h | 22 +- gtk2_ardour/gain_meter.cc | 30 +- gtk2_ardour/gain_meter.h | 26 +- gtk2_ardour/generic_pluginui.cc | 22 +- gtk2_ardour/ghostregion.cc | 4 +- gtk2_ardour/ghostregion.h | 4 +- gtk2_ardour/global_port_matrix.cc | 8 +- gtk2_ardour/group_tabs.cc | 28 +- gtk2_ardour/group_tabs.h | 6 +- gtk2_ardour/hit.cc | 2 +- gtk2_ardour/hit.h | 2 +- gtk2_ardour/io_button.cc | 58 +- gtk2_ardour/io_button.h | 20 +- gtk2_ardour/io_plugin_window.cc | 46 +- gtk2_ardour/io_plugin_window.h | 18 +- gtk2_ardour/io_selector.cc | 8 +- gtk2_ardour/io_selector.h | 10 +- gtk2_ardour/latency_gui.h | 2 +- gtk2_ardour/loudness_dialog.cc | 8 +- gtk2_ardour/loudness_dialog.h | 4 +- gtk2_ardour/loudness_settings.cc | 2 + gtk2_ardour/luadialog.cc | 2 +- gtk2_ardour/luainstance.h | 2 +- gtk2_ardour/luawindow.h | 2 +- gtk2_ardour/lv2_plugin_ui.cc | 10 +- gtk2_ardour/lv2_plugin_ui.h | 10 +- gtk2_ardour/lxvst_plugin_ui.cc | 2 +- gtk2_ardour/lxvst_plugin_ui.h | 2 +- gtk2_ardour/mac_vst_plugin_ui.h | 2 +- gtk2_ardour/meter_strip.cc | 14 +- gtk2_ardour/meter_strip.h | 8 +- gtk2_ardour/meterbridge.cc | 8 +- gtk2_ardour/meterbridge.h | 4 +- gtk2_ardour/midi_automation_line.cc | 8 +- gtk2_ardour/midi_automation_line.h | 6 +- gtk2_ardour/midi_channel_selector.cc | 2 +- gtk2_ardour/midi_channel_selector.h | 4 +- gtk2_ardour/midi_clip_editor.cc | 2 +- gtk2_ardour/midi_clip_editor.h | 4 +- gtk2_ardour/midi_export_dialog.cc | 2 +- gtk2_ardour/midi_export_dialog.h | 2 +- gtk2_ardour/midi_list_editor.cc | 28 +- gtk2_ardour/midi_list_editor.h | 10 +- gtk2_ardour/midi_region_properties_box.cc | 2 +- gtk2_ardour/midi_region_properties_box.h | 2 +- gtk2_ardour/midi_region_view.cc | 112 +-- gtk2_ardour/midi_region_view.h | 52 +- gtk2_ardour/midi_streamview.cc | 28 +- gtk2_ardour/midi_streamview.h | 8 +- gtk2_ardour/midi_time_axis.cc | 36 +- gtk2_ardour/midi_time_axis.h | 8 +- gtk2_ardour/midi_tracer.cc | 20 +- gtk2_ardour/midi_tracer.h | 6 +- gtk2_ardour/mixer_group_tabs.cc | 2 +- gtk2_ardour/mixer_strip.cc | 66 +- gtk2_ardour/mixer_strip.h | 26 +- gtk2_ardour/mixer_ui.cc | 158 ++-- gtk2_ardour/mixer_ui.h | 38 +- gtk2_ardour/monitor_section.cc | 34 +- gtk2_ardour/monitor_section.h | 12 +- gtk2_ardour/monitor_selector.cc | 8 +- gtk2_ardour/monitor_selector.h | 16 +- gtk2_ardour/mono_panner.cc | 2 +- gtk2_ardour/mono_panner.h | 12 +- gtk2_ardour/new_plugin_preset_dialog.cc | 2 +- gtk2_ardour/new_plugin_preset_dialog.h | 2 +- gtk2_ardour/note.cc | 2 +- gtk2_ardour/note.h | 2 +- gtk2_ardour/note_base.cc | 2 +- gtk2_ardour/note_base.h | 6 +- gtk2_ardour/note_player.cc | 4 +- gtk2_ardour/note_player.h | 8 +- gtk2_ardour/option_editor.cc | 2 +- gtk2_ardour/panner2d.cc | 4 +- gtk2_ardour/panner2d.h | 8 +- gtk2_ardour/panner_interface.cc | 4 +- gtk2_ardour/panner_interface.h | 8 +- gtk2_ardour/panner_ui.cc | 34 +- gtk2_ardour/panner_ui.h | 10 +- gtk2_ardour/patch_change.cc | 2 +- gtk2_ardour/patch_change_dialog.cc | 8 +- gtk2_ardour/patch_change_dialog.h | 6 +- gtk2_ardour/patch_change_widget.cc | 78 +- gtk2_ardour/patch_change_widget.h | 20 +- gtk2_ardour/piano_roll_header.cc | 4 +- gtk2_ardour/playlist_selection.h | 2 +- gtk2_ardour/playlist_selector.cc | 30 +- gtk2_ardour/playlist_selector.h | 8 +- gtk2_ardour/plugin_display.cc | 2 +- gtk2_ardour/plugin_display.h | 4 +- gtk2_ardour/plugin_dspload_ui.cc | 2 +- gtk2_ardour/plugin_dspload_ui.h | 4 +- gtk2_ardour/plugin_dspload_window.cc | 16 +- gtk2_ardour/plugin_dspload_window.h | 8 +- gtk2_ardour/plugin_eq_gui.cc | 2 +- gtk2_ardour/plugin_eq_gui.h | 6 +- gtk2_ardour/plugin_manager_ui.cc | 18 +- gtk2_ardour/plugin_manager_ui.h | 4 +- gtk2_ardour/plugin_pin_dialog.cc | 94 +-- gtk2_ardour/plugin_pin_dialog.h | 36 +- gtk2_ardour/plugin_presets_ui.cc | 8 +- gtk2_ardour/plugin_presets_ui.h | 4 +- gtk2_ardour/plugin_setup_dialog.cc | 10 +- gtk2_ardour/plugin_setup_dialog.h | 6 +- gtk2_ardour/plugin_ui.cc | 56 +- gtk2_ardour/plugin_ui.h | 38 +- gtk2_ardour/port_group.cc | 130 +-- gtk2_ardour/port_group.h | 36 +- gtk2_ardour/port_insert_ui.cc | 12 +- gtk2_ardour/port_insert_ui.h | 6 +- gtk2_ardour/port_matrix.cc | 76 +- gtk2_ardour/port_matrix.h | 38 +- gtk2_ardour/port_matrix_column_labels.cc | 4 +- gtk2_ardour/port_matrix_column_labels.h | 4 +- gtk2_ardour/port_matrix_component.cc | 10 +- gtk2_ardour/port_matrix_component.h | 6 +- gtk2_ardour/port_matrix_grid.h | 2 +- gtk2_ardour/port_matrix_labels.h | 2 +- gtk2_ardour/port_matrix_row_labels.cc | 2 +- gtk2_ardour/port_matrix_row_labels.h | 6 +- gtk2_ardour/processor_box.cc | 462 +++++------ gtk2_ardour/processor_box.h | 102 +-- gtk2_ardour/public_editor.h | 30 +- gtk2_ardour/rc_option_editor.cc | 10 +- gtk2_ardour/recorder_ui.cc | 54 +- gtk2_ardour/recorder_ui.h | 14 +- gtk2_ardour/region_editor.cc | 8 +- gtk2_ardour/region_editor.h | 4 +- gtk2_ardour/region_gain_line.cc | 2 +- gtk2_ardour/region_gain_line.h | 2 +- gtk2_ardour/region_layering_order_editor.cc | 4 +- gtk2_ardour/region_layering_order_editor.h | 2 +- gtk2_ardour/region_list_base.cc | 86 +- gtk2_ardour/region_list_base.h | 42 +- gtk2_ardour/region_peak_cursor.cc | 2 +- gtk2_ardour/region_selection.cc | 6 +- gtk2_ardour/region_selection.h | 4 +- gtk2_ardour/region_view.cc | 18 +- gtk2_ardour/region_view.h | 10 +- gtk2_ardour/return_ui.cc | 6 +- gtk2_ardour/return_ui.h | 8 +- gtk2_ardour/rhythm_ferret.cc | 6 +- gtk2_ardour/rhythm_ferret.h | 4 +- gtk2_ardour/route_group_menu.cc | 4 +- gtk2_ardour/route_list_base.cc | 126 +-- gtk2_ardour/route_list_base.h | 8 +- gtk2_ardour/route_params_ui.cc | 56 +- gtk2_ardour/route_params_ui.h | 14 +- gtk2_ardour/route_processor_selection.cc | 8 +- gtk2_ardour/route_sorter.h | 8 +- gtk2_ardour/route_time_axis.cc | 156 ++-- gtk2_ardour/route_time_axis.h | 50 +- gtk2_ardour/route_ui.cc | 168 ++-- gtk2_ardour/route_ui.h | 48 +- gtk2_ardour/selection.cc | 68 +- gtk2_ardour/selection.h | 22 +- gtk2_ardour/selection_properties_box.cc | 2 +- gtk2_ardour/send_ui.cc | 10 +- gtk2_ardour/send_ui.h | 6 +- gtk2_ardour/session_import_dialog.cc | 8 +- gtk2_ardour/session_import_dialog.h | 4 +- gtk2_ardour/session_metadata_dialog.cc | 2 +- gtk2_ardour/session_metadata_dialog.h | 6 +- gtk2_ardour/sfdb_ui.cc | 22 +- gtk2_ardour/shuttle_control.h | 4 +- gtk2_ardour/slot_properties_box.cc | 20 +- gtk2_ardour/source_list_base.cc | 14 +- gtk2_ardour/source_list_base.h | 6 +- gtk2_ardour/speaker_dialog.cc | 24 +- gtk2_ardour/speaker_dialog.h | 6 +- gtk2_ardour/startup_fsm.cc | 2 +- gtk2_ardour/step_editor.cc | 10 +- gtk2_ardour/step_editor.h | 8 +- gtk2_ardour/stereo_panner.cc | 2 +- gtk2_ardour/stereo_panner.h | 16 +- gtk2_ardour/streamview.cc | 28 +- gtk2_ardour/streamview.h | 24 +- gtk2_ardour/strip_silence_dialog.cc | 4 +- gtk2_ardour/stripable_colorpicker.cc | 2 +- gtk2_ardour/stripable_colorpicker.h | 4 +- gtk2_ardour/stripable_time_axis.cc | 20 +- gtk2_ardour/stripable_time_axis.h | 20 +- gtk2_ardour/stripable_treemodel.cc | 8 +- gtk2_ardour/stripable_treemodel.h | 8 +- gtk2_ardour/tempo_dialog.cc | 6 +- gtk2_ardour/tempo_dialog.h | 4 +- gtk2_ardour/time_axis_view.cc | 10 +- gtk2_ardour/time_axis_view.h | 12 +- gtk2_ardour/time_info_box.cc | 6 +- gtk2_ardour/track_record_axis.cc | 8 +- gtk2_ardour/track_record_axis.h | 10 +- gtk2_ardour/transport_control.h | 14 +- gtk2_ardour/transport_masters_dialog.cc | 20 +- gtk2_ardour/transport_masters_dialog.h | 6 +- gtk2_ardour/trigger_clip_picker.cc | 26 +- gtk2_ardour/trigger_master.cc | 8 +- gtk2_ardour/trigger_master.h | 6 +- gtk2_ardour/trigger_page.cc | 42 +- gtk2_ardour/trigger_page.h | 6 +- gtk2_ardour/trigger_strip.cc | 16 +- gtk2_ardour/trigger_strip.h | 10 +- gtk2_ardour/trigger_ui.cc | 2 +- gtk2_ardour/triggerbox_ui.cc | 10 +- gtk2_ardour/utils.cc | 4 +- gtk2_ardour/utils.h | 2 +- gtk2_ardour/vca_master_strip.cc | 32 +- gtk2_ardour/vca_master_strip.h | 10 +- gtk2_ardour/vca_time_axis.cc | 20 +- gtk2_ardour/vca_time_axis.h | 8 +- gtk2_ardour/video_image_frame.h | 2 +- gtk2_ardour/virtual_keyboard_window.cc | 6 +- gtk2_ardour/virtual_keyboard_window.h | 6 +- gtk2_ardour/vst3_hwnd_plugin_ui.cc | 2 +- gtk2_ardour/vst3_hwnd_plugin_ui.h | 2 +- gtk2_ardour/vst3_nsview_plugin_ui.h | 2 +- gtk2_ardour/vst3_plugin_ui.cc | 2 +- gtk2_ardour/vst3_plugin_ui.h | 4 +- gtk2_ardour/vst3_x11_plugin_ui.cc | 2 +- gtk2_ardour/vst3_x11_plugin_ui.h | 2 +- gtk2_ardour/vst_plugin_ui.cc | 2 +- gtk2_ardour/vst_plugin_ui.h | 4 +- gtk2_ardour/windows_vst_plugin_ui.cc | 2 +- gtk2_ardour/windows_vst_plugin_ui.h | 2 +- libs/ardour/amp.cc | 2 +- libs/ardour/analyser.cc | 12 +- libs/ardour/analysis_graph.cc | 4 +- libs/ardour/ardour/amp.h | 8 +- libs/ardour/ardour/analyser.h | 6 +- libs/ardour/ardour/analysis_graph.h | 10 +- libs/ardour/ardour/audio_backend.h | 2 +- libs/ardour/ardour/audio_playlist_importer.h | 6 +- libs/ardour/ardour/audio_playlist_source.h | 2 +- libs/ardour/ardour/audio_region_importer.h | 10 +- libs/ardour/ardour/audio_track.h | 12 +- libs/ardour/ardour/audio_track_importer.h | 2 +- libs/ardour/ardour/audio_unit.h | 16 +- libs/ardour/ardour/audioengine.h | 4 +- libs/ardour/ardour/audioplaylist.h | 16 +- libs/ardour/ardour/audioregion.h | 46 +- libs/ardour/ardour/audiorom.h | 2 +- libs/ardour/ardour/auditioner.h | 20 +- libs/ardour/ardour/automatable.h | 18 +- libs/ardour/ardour/automation_control.h | 12 +- libs/ardour/ardour/automation_list.h | 6 +- libs/ardour/ardour/automation_watch.h | 10 +- libs/ardour/ardour/beatbox.h | 4 +- libs/ardour/ardour/bundle.h | 16 +- libs/ardour/ardour/butler.h | 2 +- libs/ardour/ardour/clip_library.h | 2 +- libs/ardour/ardour/comparable_shared_ptr.h | 16 +- libs/ardour/ardour/control_group.h | 14 +- libs/ardour/ardour/control_group_member.h | 2 +- libs/ardour/ardour/convolver.h | 8 +- libs/ardour/ardour/delayline.h | 2 +- libs/ardour/ardour/delivery.h | 28 +- libs/ardour/ardour/disk_io.h | 18 +- libs/ardour/ardour/disk_reader.h | 6 +- libs/ardour/ardour/disk_writer.h | 26 +- libs/ardour/ardour/element_import_handler.h | 2 +- libs/ardour/ardour/export_analysis.h | 2 +- libs/ardour/ardour/export_channel.h | 32 +- .../ardour/export_channel_configuration.h | 4 +- libs/ardour/ardour/export_format_base.h | 6 +- libs/ardour/ardour/export_format_manager.h | 8 +- .../ardour/export_format_specification.h | 4 +- libs/ardour/ardour/export_formats.h | 10 +- libs/ardour/ardour/export_graph_builder.h | 56 +- libs/ardour/ardour/export_handler.h | 4 +- libs/ardour/ardour/export_multiplication.h | 20 +- libs/ardour/ardour/export_pointers.h | 22 +- libs/ardour/ardour/export_profile_manager.h | 36 +- libs/ardour/ardour/export_timespan.h | 2 +- libs/ardour/ardour/filter.h | 8 +- libs/ardour/ardour/gain_control.h | 4 +- libs/ardour/ardour/graph.h | 10 +- libs/ardour/ardour/graph_edges.h | 2 +- libs/ardour/ardour/graphnode.h | 8 +- libs/ardour/ardour/instrument_info.h | 14 +- libs/ardour/ardour/internal_send.h | 14 +- libs/ardour/ardour/io.h | 42 +- libs/ardour/ardour/io_plug.h | 20 +- libs/ardour/ardour/io_processor.h | 20 +- libs/ardour/ardour/io_vector.h | 12 +- libs/ardour/ardour/ladspa_plugin.h | 4 +- libs/ardour/ardour/legatize.h | 2 +- libs/ardour/ardour/location.h | 6 +- libs/ardour/ardour/lua_api.h | 50 +- libs/ardour/ardour/luaproc.h | 8 +- libs/ardour/ardour/luascripting.h | 4 +- libs/ardour/ardour/lv2_plugin.h | 20 +- libs/ardour/ardour/midi_cursor.h | 2 +- libs/ardour/ardour/midi_model.h | 34 +- libs/ardour/ardour/midi_operator.h | 2 +- libs/ardour/ardour/midi_patch_manager.h | 32 +- libs/ardour/ardour/midi_playlist.h | 16 +- libs/ardour/ardour/midi_port.h | 4 +- libs/ardour/ardour/midi_region.h | 24 +- libs/ardour/ardour/midi_scene_changer.h | 14 +- libs/ardour/ardour/midi_source.h | 14 +- libs/ardour/ardour/midi_stretch.h | 2 +- libs/ardour/ardour/midi_track.h | 24 +- libs/ardour/ardour/midi_ui.h | 2 +- libs/ardour/ardour/midiport_manager.h | 40 +- libs/ardour/ardour/mixer_scene.h | 2 +- libs/ardour/ardour/monitor_port.h | 4 +- libs/ardour/ardour/monitor_processor.h | 40 +- libs/ardour/ardour/mute_control.h | 6 +- libs/ardour/ardour/muteable.h | 4 +- libs/ardour/ardour/pan_controllable.h | 2 +- libs/ardour/ardour/pannable.h | 16 +- libs/ardour/ardour/panner.h | 12 +- libs/ardour/ardour/panner_shell.h | 14 +- libs/ardour/ardour/parameter_descriptor.h | 2 +- libs/ardour/ardour/pitch.h | 2 +- libs/ardour/ardour/playlist.h | 152 ++-- libs/ardour/ardour/playlist_factory.h | 10 +- libs/ardour/ardour/playlist_source.h | 6 +- libs/ardour/ardour/plug_insert_base.h | 6 +- libs/ardour/ardour/plugin.h | 16 +- libs/ardour/ardour/plugin_insert.h | 36 +- libs/ardour/ardour/plugin_manager.h | 4 +- libs/ardour/ardour/polarity_processor.h | 6 +- libs/ardour/ardour/port.h | 4 +- libs/ardour/ardour/port_engine.h | 2 +- libs/ardour/ardour/port_engine_shared.h | 8 +- libs/ardour/ardour/port_insert.h | 26 +- libs/ardour/ardour/port_manager.h | 32 +- libs/ardour/ardour/port_set.h | 24 +- libs/ardour/ardour/quantize.h | 2 +- libs/ardour/ardour/rb_effect.h | 2 +- libs/ardour/ardour/readable.h | 2 +- libs/ardour/ardour/readonly_control.h | 4 +- libs/ardour/ardour/region.h | 50 +- libs/ardour/ardour/region_factory.h | 54 +- libs/ardour/ardour/region_sorters.h | 6 +- libs/ardour/ardour/resampled_source.h | 4 +- libs/ardour/ardour/return.h | 12 +- libs/ardour/ardour/reverse.h | 2 +- libs/ardour/ardour/route.h | 307 ++++---- libs/ardour/ardour/route_group.h | 36 +- libs/ardour/ardour/route_group_specialized.h | 4 +- libs/ardour/ardour/rt_tasklist.h | 4 +- libs/ardour/ardour/scene_change.h | 2 +- libs/ardour/ardour/selection.h | 26 +- libs/ardour/ardour/send.h | 10 +- libs/ardour/ardour/session.h | 322 ++++---- libs/ardour/ardour/session_event.h | 12 +- libs/ardour/ardour/session_playlist.h | 2 +- libs/ardour/ardour/session_playlists.h | 46 +- libs/ardour/ardour/session_route.h | 20 +- libs/ardour/ardour/simple_export.h | 6 +- libs/ardour/ardour/slavable.h | 22 +- .../ardour/slavable_automation_control.h | 28 +- libs/ardour/ardour/sndfileimportable.h | 2 +- libs/ardour/ardour/solo_control.h | 6 +- libs/ardour/ardour/solo_isolate_control.h | 2 +- libs/ardour/ardour/solo_mute_release.h | 14 +- libs/ardour/ardour/source.h | 2 +- libs/ardour/ardour/source_factory.h | 18 +- libs/ardour/ardour/srcfilesource.h | 4 +- libs/ardour/ardour/step_sequencer.h | 4 +- libs/ardour/ardour/stretch.h | 2 +- libs/ardour/ardour/strip_silence.h | 2 +- libs/ardour/ardour/stripable.h | 140 ++-- libs/ardour/ardour/tempo_map_importer.h | 2 +- libs/ardour/ardour/thawlist.h | 2 +- libs/ardour/ardour/ticker.h | 2 +- libs/ardour/ardour/track.h | 36 +- libs/ardour/ardour/transform.h | 2 +- libs/ardour/ardour/transport_master.h | 22 +- libs/ardour/ardour/transport_master_manager.h | 24 +- libs/ardour/ardour/transpose.h | 2 +- libs/ardour/ardour/triggerbox.h | 40 +- libs/ardour/ardour/types.h | 28 +- libs/ardour/ardour/unknown_processor.h | 2 +- libs/ardour/ardour/utils.h | 12 +- libs/ardour/ardour/vca.h | 138 ++-- libs/ardour/ardour/vca_manager.h | 6 +- libs/ardour/ardour/vst3_host.h | 4 +- libs/ardour/ardour/vst3_module.h | 2 +- libs/ardour/ardour/vst3_plugin.h | 20 +- libs/ardour/audio_playlist.cc | 70 +- libs/ardour/audio_playlist_importer.cc | 6 +- libs/ardour/audio_playlist_source.cc | 12 +- libs/ardour/audio_region_importer.cc | 6 +- libs/ardour/audio_track.cc | 40 +- libs/ardour/audio_track_importer.cc | 6 +- libs/ardour/audio_unit.cc | 20 +- libs/ardour/audioengine.cc | 8 +- libs/ardour/audioregion.cc | 114 +-- libs/ardour/audiorom.cc | 4 +- libs/ardour/auditioner.cc | 22 +- libs/ardour/automatable.cc | 106 +-- libs/ardour/automation_control.cc | 30 +- libs/ardour/automation_list.cc | 8 +- libs/ardour/automation_watch.cc | 12 +- libs/ardour/bundle.cc | 16 +- libs/ardour/butler.cc | 12 +- libs/ardour/clip_library.cc | 2 +- libs/ardour/control_group.cc | 24 +- libs/ardour/control_protocol_manager.cc | 2 +- libs/ardour/convolver.cc | 6 +- libs/ardour/delivery.cc | 18 +- libs/ardour/disk_io.cc | 26 +- libs/ardour/disk_reader.cc | 42 +- libs/ardour/disk_writer.cc | 40 +- libs/ardour/engine_slave.cc | 2 +- libs/ardour/export_channel.cc | 44 +- libs/ardour/export_channel_configuration.cc | 4 +- libs/ardour/export_format_base.cc | 8 +- libs/ardour/export_format_manager.cc | 18 +- libs/ardour/export_format_specification.cc | 8 +- libs/ardour/export_formats.cc | 2 +- libs/ardour/export_graph_builder.cc | 16 +- libs/ardour/export_profile_manager.cc | 8 +- libs/ardour/filter.cc | 14 +- libs/ardour/gain_control.cc | 10 +- libs/ardour/globals.cc | 2 +- libs/ardour/graph.cc | 20 +- libs/ardour/graph_edges.cc | 8 +- libs/ardour/graphnode.cc | 6 +- libs/ardour/import.cc | 90 +-- libs/ardour/import_pt.cc | 58 +- libs/ardour/instrument_info.cc | 60 +- libs/ardour/internal_send.cc | 18 +- libs/ardour/io.cc | 56 +- libs/ardour/io_plug.cc | 40 +- libs/ardour/io_processor.cc | 8 +- libs/ardour/ladspa_plugin.cc | 6 +- libs/ardour/legatize.cc | 2 +- libs/ardour/location.cc | 2 +- libs/ardour/ltc_slave.cc | 4 +- libs/ardour/lua_api.cc | 112 +-- libs/ardour/luabindings.cc | 216 ++--- libs/ardour/luaproc.cc | 24 +- libs/ardour/lv2_plugin.cc | 16 +- libs/ardour/midi_automation_list_binder.cc | 14 +- libs/ardour/midi_clock_slave.cc | 4 +- libs/ardour/midi_model.cc | 30 +- libs/ardour/midi_patch_manager.cc | 18 +- libs/ardour/midi_playlist.cc | 54 +- libs/ardour/midi_port.cc | 2 +- libs/ardour/midi_region.cc | 56 +- libs/ardour/midi_scene_changer.cc | 30 +- libs/ardour/midi_source.cc | 14 +- libs/ardour/midi_stretch.cc | 12 +- libs/ardour/midi_track.cc | 54 +- libs/ardour/midi_ui.cc | 20 +- libs/ardour/midiport_manager.cc | 20 +- libs/ardour/mixer_scene.cc | 8 +- libs/ardour/monitor_control.cc | 2 +- libs/ardour/monitor_port.cc | 22 +- libs/ardour/monitor_processor.cc | 16 +- libs/ardour/mtc_slave.cc | 6 +- libs/ardour/mute_control.cc | 12 +- libs/ardour/pan_controllable.cc | 4 +- libs/ardour/pannable.cc | 10 +- libs/ardour/panner.cc | 2 +- libs/ardour/panner_shell.cc | 4 +- libs/ardour/parameter_descriptor.cc | 4 +- libs/ardour/phase_control.cc | 2 +- libs/ardour/playlist.cc | 276 +++---- libs/ardour/playlist_factory.cc | 62 +- libs/ardour/playlist_source.cc | 2 +- libs/ardour/plug_insert_base.cc | 16 +- libs/ardour/plugin_insert.cc | 156 ++-- libs/ardour/plugin_manager.cc | 4 +- libs/ardour/polarity_processor.cc | 2 +- libs/ardour/port.cc | 20 +- libs/ardour/port_engine_shared.cc | 84 +- libs/ardour/port_insert.cc | 8 +- libs/ardour/port_manager.cc | 92 +-- libs/ardour/port_set.cc | 24 +- libs/ardour/quantize.cc | 4 +- libs/ardour/rb_effect.cc | 12 +- libs/ardour/readable.cc | 10 +- libs/ardour/readonly_control.cc | 8 +- libs/ardour/record_enable_control.cc | 2 +- libs/ardour/record_safe_control.cc | 2 +- libs/ardour/region.cc | 82 +- libs/ardour/region_factory.cc | 150 ++-- libs/ardour/resampled_source.cc | 2 +- libs/ardour/return.cc | 4 +- libs/ardour/reverse.cc | 8 +- libs/ardour/route.cc | 739 +++++++++--------- libs/ardour/route_group.cc | 44 +- libs/ardour/rt_tasklist.cc | 2 +- libs/ardour/scene_change.cc | 6 +- libs/ardour/selection.cc | 54 +- libs/ardour/send.cc | 8 +- libs/ardour/session.cc | 588 +++++++------- libs/ardour/session_bundles.cc | 48 +- libs/ardour/session_butler.cc | 6 +- libs/ardour/session_command.cc | 10 +- libs/ardour/session_events.cc | 2 +- libs/ardour/session_export.cc | 10 +- libs/ardour/session_ltc.cc | 4 +- libs/ardour/session_midi.cc | 47 +- libs/ardour/session_playlists.cc | 98 +-- libs/ardour/session_process.cc | 48 +- libs/ardour/session_rtevents.cc | 26 +- libs/ardour/session_state.cc | 306 ++++---- libs/ardour/session_transport.cc | 72 +- libs/ardour/session_vst.cc | 4 +- libs/ardour/slavable.cc | 42 +- libs/ardour/slavable_automation_control.cc | 60 +- libs/ardour/smf_source.cc | 6 +- libs/ardour/solo_control.cc | 12 +- libs/ardour/solo_isolate_control.cc | 6 +- libs/ardour/solo_mute_release.cc | 8 +- libs/ardour/solo_safe_control.cc | 4 +- libs/ardour/source.cc | 2 +- libs/ardour/source_factory.cc | 56 +- libs/ardour/srcfilesource.cc | 4 +- libs/ardour/st_pitch.cc | 2 +- libs/ardour/st_stretch.cc | 12 +- libs/ardour/step_sequencer.cc | 14 +- libs/ardour/strip_silence.cc | 8 +- libs/ardour/stripable.cc | 4 +- libs/ardour/test/audio_engine_test.cc | 2 +- libs/ardour/test/audio_region_test.cc | 6 +- libs/ardour/test/audio_region_test.h | 10 +- .../test/automation_list_property_test.cc | 12 +- libs/ardour/test/lua_script_test.cc | 8 +- .../test/playlist_equivalent_regions_test.cc | 4 +- .../test/playlist_equivalent_regions_test.h | 2 +- libs/ardour/test/profiling/lots_of_regions.cc | 6 +- libs/ardour/test/region_naming_test.cc | 8 +- libs/ardour/test/resampled_source_test.cc | 2 +- libs/ardour/thawlist.cc | 4 +- libs/ardour/track.cc | 64 +- libs/ardour/transform.cc | 2 +- libs/ardour/transport_master.cc | 28 +- libs/ardour/transport_master_manager.cc | 34 +- libs/ardour/transpose.cc | 2 +- libs/ardour/triggerbox.cc | 66 +- libs/ardour/vca.cc | 8 +- libs/ardour/vca_manager.cc | 14 +- libs/ardour/vst3_module.cc | 8 +- libs/ardour/vst3_plugin.cc | 74 +- libs/ardour/vst3_scan.cc | 4 +- libs/ardour/vst_plugin.cc | 8 +- .../audiographer/general/deinterleaver.h | 4 +- .../audiographer/general/interleaver.h | 4 +- .../audiographer/general/threader.h | 2 +- .../audiographer/sndfile/sndfile_writer.h | 2 +- libs/audiographer/audiographer/source.h | 2 +- .../tests/general/chunker_test.cc | 6 +- .../tests/general/deinterleaver_test.cc | 8 +- .../general/interleaver_deinterleaver_test.cc | 10 +- .../tests/general/interleaver_test.cc | 4 +- .../tests/general/normalizer_test.cc | 6 +- .../tests/general/peak_reader_test.cc | 2 +- .../general/sample_format_converter_test.cc | 36 +- .../tests/general/silence_trimmer_test.cc | 4 +- .../tests/general/sr_converter_test.cc | 6 +- .../tests/general/threader_test.cc | 16 +- .../tests/sndfile/tmp_file_test.cc | 2 +- .../tests/utils/identity_vertex_test.cc | 6 +- libs/backends/alsa/alsa_audiobackend.cc | 38 +- libs/backends/coreaudio/coreaudio_backend.cc | 32 +- libs/backends/coreaudio/coremidi_io.cc | 2 +- libs/backends/coreaudio/coremidi_io.h | 2 +- libs/backends/dummy/dummy_audiobackend.cc | 64 +- libs/backends/dummy/dummy_audiobackend.h | 2 +- libs/backends/jack/jack_api.cc | 10 +- libs/backends/jack/jack_audiobackend.cc | 6 +- libs/backends/jack/jack_audiobackend.h | 6 +- libs/backends/jack/jack_portengine.cc | 62 +- libs/backends/portaudio/portaudio_backend.cc | 30 +- libs/backends/portaudio/winmmemidi_io.h | 2 +- .../backends/pulseaudio/pulseaudio_backend.cc | 22 +- libs/backends/pulseaudio/pulseaudio_backend.h | 2 +- libs/canvas/canvas/image.h | 8 +- libs/canvas/image.cc | 8 +- .../control_protocol/basic_ui.cc | 24 +- .../control_protocol/control_protocol.cc | 66 +- .../control_protocol/basic_ui.h | 2 +- .../control_protocol/control_protocol.h | 16 +- .../control_protocol/control_protocol/types.h | 12 +- .../midi_surface/midi_surface.cc | 22 +- .../midi_surface/midi_surface/midi_surface.h | 16 +- libs/evoral/Control.cc | 4 +- libs/evoral/ControlList.cc | 14 +- libs/evoral/ControlSet.cc | 8 +- libs/evoral/Sequence.cc | 18 +- libs/evoral/evoral/Control.h | 10 +- libs/evoral/evoral/ControlList.h | 8 +- libs/evoral/evoral/ControlSet.h | 12 +- libs/evoral/evoral/MIDIXML.h | 6 +- libs/evoral/evoral/Sequence.h | 55 +- libs/evoral/test/CurveTest.cc | 12 +- libs/evoral/test/CurveTest.h | 4 +- libs/evoral/test/SequenceTest.cc | 12 +- libs/evoral/test/SequenceTest.h | 10 +- libs/lua/LuaBridge/detail/CFunctions.h | 68 +- libs/lua/LuaBridge/detail/Namespace.h | 32 +- libs/midi++2/midi++/midnam_patch.h | 62 +- libs/midi++2/midnam_patch.cc | 124 +-- libs/midi++2/test/MidnamTest.cpp | 30 +- libs/panners/1in2out/panner_1in2out.cc | 6 +- libs/panners/1in2out/panner_1in2out.h | 6 +- libs/panners/2in2out/panner_2in2out.cc | 6 +- libs/panners/2in2out/panner_2in2out.h | 6 +- libs/panners/stereobalance/panner_balance.cc | 6 +- libs/panners/stereobalance/panner_balance.h | 6 +- libs/panners/vbap/vbap.cc | 8 +- libs/panners/vbap/vbap.h | 10 +- libs/panners/vbap/vbap_speakers.cc | 2 +- libs/panners/vbap/vbap_speakers.h | 6 +- libs/pbd/controllable.cc | 12 +- libs/pbd/pbd/controllable.h | 14 +- libs/pbd/pbd/properties.h | 2 +- libs/pbd/pbd/rcu.h | 40 +- libs/pbd/pbd/signals.h | 6 +- libs/pbd/pbd/signals.py | 8 +- libs/pbd/pbd/stateful_diff_command.h | 6 +- libs/pbd/pbd/xml++.h | 4 +- libs/pbd/stateful_diff_command.cc | 10 +- libs/pbd/test/rcu_test.cc | 8 +- libs/pbd/test/rcu_test.h | 2 +- libs/pbd/test/xpath.cc | 8 +- libs/pbd/xml++.cc | 8 +- libs/surfaces/cc121/cc121.cc | 70 +- libs/surfaces/cc121/cc121.h | 30 +- libs/surfaces/cc121/operations.cc | 22 +- .../contourdesign/button_config_widget.cc | 8 +- .../contourdesign/button_config_widget.h | 4 +- libs/surfaces/contourdesign/contourdesign.cc | 18 +- libs/surfaces/contourdesign/contourdesign.h | 8 +- .../contourdesign/contourdesign_gui.cc | 12 +- libs/surfaces/faderport/faderport.cc | 24 +- libs/surfaces/faderport/faderport.h | 8 +- libs/surfaces/faderport/operations.cc | 28 +- libs/surfaces/faderport8/actions.cc | 40 +- libs/surfaces/faderport8/callbacks.cc | 10 +- libs/surfaces/faderport8/faderport8.cc | 152 ++-- libs/surfaces/faderport8/faderport8.h | 40 +- libs/surfaces/faderport8/fp8_strip.cc | 44 +- libs/surfaces/faderport8/fp8_strip.h | 32 +- .../tranzport/tranzport_control_protocol.cc | 2 +- .../generic_midi_control_protocol.cc | 74 +- .../generic_midi_control_protocol.h | 26 +- .../surfaces/generic_midi/midicontrollable.cc | 16 +- libs/surfaces/generic_midi/midicontrollable.h | 8 +- .../surfaces/launch_control_xl/controllers.cc | 110 +-- .../launch_control_xl/launch_control_xl.cc | 104 +-- .../launch_control_xl/launch_control_xl.h | 58 +- libs/surfaces/mackie/controls.cc | 2 +- libs/surfaces/mackie/controls.h | 6 +- libs/surfaces/mackie/gui.cc | 12 +- libs/surfaces/mackie/gui.h | 4 +- .../mackie/mackie_control_protocol.cc | 99 +-- .../surfaces/mackie/mackie_control_protocol.h | 50 +- libs/surfaces/mackie/mcp_buttons.cc | 4 +- libs/surfaces/mackie/strip.cc | 58 +- libs/surfaces/mackie/strip.h | 10 +- libs/surfaces/mackie/subview.cc | 174 ++--- libs/surfaces/mackie/subview.h | 64 +- libs/surfaces/mackie/surface.cc | 16 +- libs/surfaces/mackie/surface.h | 10 +- libs/surfaces/mackie/surface_port.cc | 4 +- libs/surfaces/mackie/surface_port.h | 4 +- libs/surfaces/maschine2/callbacks.cc | 4 +- libs/surfaces/maschine2/maschine2.cc | 4 +- libs/surfaces/maschine2/maschine2.h | 2 +- libs/surfaces/maschine2/ui_knob.cc | 4 +- libs/surfaces/maschine2/ui_knob.h | 6 +- libs/surfaces/osc/osc.cc | 502 ++++++------ libs/surfaces/osc/osc.h | 40 +- libs/surfaces/osc/osc_controllable.cc | 4 +- libs/surfaces/osc/osc_controllable.h | 12 +- libs/surfaces/osc/osc_cue_observer.cc | 16 +- libs/surfaces/osc/osc_cue_observer.h | 14 +- libs/surfaces/osc/osc_global_observer.cc | 26 +- libs/surfaces/osc/osc_global_observer.h | 6 +- libs/surfaces/osc/osc_route_observer.cc | 54 +- libs/surfaces/osc/osc_route_observer.h | 22 +- libs/surfaces/osc/osc_select_observer.cc | 90 +-- libs/surfaces/osc/osc_select_observer.h | 30 +- libs/surfaces/push2/buttons.cc | 16 +- libs/surfaces/push2/cues.cc | 64 +- libs/surfaces/push2/cues.h | 6 +- libs/surfaces/push2/follow_action.h | 4 +- libs/surfaces/push2/knob.cc | 2 +- libs/surfaces/push2/knob.h | 6 +- libs/surfaces/push2/mix.cc | 62 +- libs/surfaces/push2/mix.h | 4 +- libs/surfaces/push2/push2.cc | 66 +- libs/surfaces/push2/push2.h | 22 +- libs/surfaces/push2/scale.cc | 6 +- libs/surfaces/push2/scale.h | 2 +- libs/surfaces/push2/track_mix.cc | 30 +- libs/surfaces/push2/track_mix.h | 8 +- libs/surfaces/tranzport/general.cc | 2 +- libs/surfaces/us2400/controls.cc | 2 +- libs/surfaces/us2400/controls.h | 6 +- libs/surfaces/us2400/gui.cc | 12 +- libs/surfaces/us2400/gui.h | 4 +- libs/surfaces/us2400/mcp_buttons.cc | 4 +- libs/surfaces/us2400/strip.cc | 50 +- libs/surfaces/us2400/strip.h | 14 +- libs/surfaces/us2400/surface.cc | 22 +- libs/surfaces/us2400/surface.h | 8 +- libs/surfaces/us2400/surface_port.cc | 4 +- libs/surfaces/us2400/surface_port.h | 4 +- .../us2400/us2400_control_protocol.cc | 80 +- .../surfaces/us2400/us2400_control_protocol.h | 44 +- libs/surfaces/websockets/dispatcher.cc | 6 +- libs/surfaces/websockets/feedback.cc | 18 +- libs/surfaces/websockets/mixer.cc | 32 +- libs/surfaces/websockets/mixer.h | 20 +- libs/temporal/temporal/tempo.h | 4 +- libs/waveview/wave_view.cc | 32 +- libs/waveview/wave_view_private.cc | 32 +- libs/waveview/waveview/wave_view.h | 26 +- libs/waveview/waveview/wave_view_private.h | 32 +- libs/widgets/ardour_button.cc | 10 +- libs/widgets/ardour_ctrl_base.cc | 16 +- libs/widgets/ardour_display.cc | 8 +- libs/widgets/ardour_spinner.cc | 4 +- libs/widgets/barcontroller.cc | 2 +- libs/widgets/binding_proxy.cc | 8 +- libs/widgets/pane.cc | 2 +- libs/widgets/slider_controller.cc | 12 +- libs/widgets/widgets/ardour_button.h | 4 +- libs/widgets/widgets/ardour_ctrl_base.h | 4 +- libs/widgets/widgets/ardour_display.h | 4 +- libs/widgets/widgets/ardour_spinner.h | 4 +- libs/widgets/widgets/barcontroller.h | 2 +- libs/widgets/widgets/binding_proxy.h | 8 +- libs/widgets/widgets/pane.h | 2 +- libs/widgets/widgets/slider_controller.h | 10 +- session_utils/copy-mixer.cc | 20 +- session_utils/export.cc | 10 +- 819 files changed, 9736 insertions(+), 9709 deletions(-) diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc index 5631c899e7..cb6b9fe496 100644 --- a/gtk2_ardour/analysis_window.cc +++ b/gtk2_ardour/analysis_window.cc @@ -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 pl - = boost::dynamic_pointer_cast((*i)->playlist()); + std::shared_ptr pl + = std::dynamic_pointer_cast((*i)->playlist()); if (!pl) continue; diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fff36a77e4..8ed63e398c 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1476,10 +1476,10 @@ ARDOUR_UI::update_timecode_format () if (_session) { bool matching; - boost::shared_ptr tcmaster; - boost::shared_ptr tm = TransportMasterManager::instance().current(); + std::shared_ptr tcmaster; + std::shared_ptr tm = TransportMasterManager::instance().current(); - if ((tm->type() == LTC || tm->type() == MTC) && (tcmaster = boost::dynamic_pointer_cast(tm)) != 0 && tm->locked()) { + if ((tm->type() == LTC || tm->type() == MTC) && (tcmaster = std::dynamic_pointer_cast(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 > tracks; + list > 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 > tracks; + list > tracks; RouteList routes; assert (_session); @@ -1610,7 +1610,7 @@ ARDOUR_UI::session_add_audio_route ( } if (strict_io) { - for (list >::iterator i = tracks.begin(); i != tracks.end(); ++i) { + for (list >::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 rl = _session->get_tracks (); + std::shared_ptr rl = _session->get_tracks (); bool none_record_enabled = true; for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr t = boost::dynamic_pointer_cast (*r); + std::shared_ptr t = std::dynamic_pointer_cast (*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 r; + std::shared_ptr r; if ((r = _session->get_remote_nth_route (rid)) != 0) { - boost::shared_ptr t; + std::shared_ptr t; - if ((t = boost::dynamic_pointer_cast(r)) != 0) { + if ((t = std::dynamic_pointer_cast(r)) != 0) { t->rec_enable_control()->set_value (!t->rec_enable_control()->get_value(), Controllable::UseGroup); } } diff --git a/gtk2_ardour/ardour_ui3.cc b/gtk2_ardour/ardour_ui3.cc index dee8c7aeb1..0fddba2cdb 100644 --- a/gtk2_ardour/ardour_ui3.cc +++ b/gtk2_ardour/ardour_ui3.cc @@ -121,11 +121,11 @@ ARDOUR_UI::reset_focus (Gtk::Widget* w) void ARDOUR_UI::monitor_dim_all () { - boost::shared_ptr mon = _session->monitor_out (); + std::shared_ptr mon = _session->monitor_out (); if (!mon) { return; } - boost::shared_ptr _monitor = mon->monitor_control (); + std::shared_ptr _monitor = mon->monitor_control (); Glib::RefPtr 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 mon = _session->monitor_out (); + std::shared_ptr mon = _session->monitor_out (); if (!mon) { return; } - boost::shared_ptr _monitor = mon->monitor_control (); + std::shared_ptr _monitor = mon->monitor_control (); Glib::RefPtr 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 mon = _session->monitor_out (); + std::shared_ptr mon = _session->monitor_out (); if (!mon) { return; } - boost::shared_ptr _monitor = mon->monitor_control (); + std::shared_ptr _monitor = mon->monitor_control (); Glib::RefPtr tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono"); _monitor->set_mono (tact->get_active()); diff --git a/gtk2_ardour/au_pluginui.h b/gtk2_ardour/au_pluginui.h index 91ae6aa78c..ba5a10723d 100644 --- a/gtk2_ardour/au_pluginui.h +++ b/gtk2_ardour/au_pluginui.h @@ -79,7 +79,7 @@ class AUPluginUI; class AUPluginUI : public PlugUIBase, public Gtk::VBox { public: - AUPluginUI (boost::shared_ptr); + AUPluginUI (std::shared_ptr); ~AUPluginUI (); gint get_preferred_width () { return req_width; } @@ -115,7 +115,7 @@ public: private: WindowRef wr; - boost::shared_ptr au; + std::shared_ptr au; int prefheight; int prefwidth; diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc index 7f4e60ade2..88cc34f66d 100644 --- a/gtk2_ardour/audio_clip_editor.cc +++ b/gtk2_ardour/audio_clip_editor.cc @@ -92,7 +92,7 @@ AudioClipEditor::ClipBBTMetric::get_marks (std::vector at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (trigger); if (!at) { return; } @@ -402,7 +402,7 @@ AudioClipEditor::drop_waves () } void -AudioClipEditor::set_region (boost::shared_ptr r, TriggerReference tr) +AudioClipEditor::set_region (std::shared_ptr r, TriggerReference tr) { drop_waves (); @@ -425,12 +425,12 @@ AudioClipEditor::set_region (boost::shared_ptr r, TriggerReference len = r->source (0)->length ().samples (); for (uint32_t n = 0; n < n_chans; ++n) { - boost::shared_ptr wr = RegionFactory::get_whole_region_for_source (r->source (n)); + std::shared_ptr wr = RegionFactory::get_whole_region_for_source (r->source (n)); if (!wr) { continue; } - boost::shared_ptr war = boost::dynamic_pointer_cast (wr); + std::shared_ptr war = std::dynamic_pointer_cast (wr); if (!war) { continue; } @@ -445,7 +445,7 @@ AudioClipEditor::set_region (boost::shared_ptr r, TriggerReference } TriggerPtr trigger (tr.trigger()); - boost::shared_ptr at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (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 r, TriggerReference tref) +AudioClipEditorBox::set_region (std::shared_ptr r, TriggerReference tref) { - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr ar = std::dynamic_pointer_cast (r); if (!ar) { return; diff --git a/gtk2_ardour/audio_clip_editor.h b/gtk2_ardour/audio_clip_editor.h index 6a9356fad5..3c3b8c295c 100644 --- a/gtk2_ardour/audio_clip_editor.h +++ b/gtk2_ardour/audio_clip_editor.h @@ -70,7 +70,7 @@ public: ClipEditorBox () {} ~ClipEditorBox () {} - virtual void set_region (boost::shared_ptr, ARDOUR::TriggerReference) = 0; + virtual void set_region (std::shared_ptr, 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::TriggerReference); + void set_region (std::shared_ptr, 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 audio_region; + std::shared_ptr audio_region; void scroll_left (); void scrol_right (); @@ -201,7 +201,7 @@ public: AudioClipEditorBox (); ~AudioClipEditorBox (); - void set_region (boost::shared_ptr, ARDOUR::TriggerReference); + void set_region (std::shared_ptr, ARDOUR::TriggerReference); void region_changed (const PBD::PropertyChange& what_changed); private: @@ -215,7 +215,7 @@ private: PBD::ScopedConnection state_connection; - boost::shared_ptr _region; + std::shared_ptr _region; void zoom_in_click (); void zoom_out_click (); diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 19008165ad..d57de26632 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1014,7 +1014,7 @@ AudioClock::set_slave_info () return; } - boost::shared_ptr tm = TransportMasterManager::instance().current(); + std::shared_ptr 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 tcmaster; - if ((tcmaster = boost::dynamic_pointer_cast(tm)) != 0) { + std::shared_ptr tcmaster; + if ((tcmaster = std::dynamic_pointer_cast(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); diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index f6ef07c1c1..d91390c356 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -52,7 +52,7 @@ _peak_amplitude_thread (void* arg) return 0; } -AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr r) +AudioRegionEditor::AudioRegionEditor (Session* s, std::shared_ptr 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) diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h index 78ac74a3c0..6d73f69721 100644 --- a/gtk2_ardour/audio_region_editor.h +++ b/gtk2_ardour/audio_region_editor.h @@ -55,7 +55,7 @@ class AudioRegionView; class AudioRegionEditor : public RegionEditor { public: - AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr); + AudioRegionEditor (ARDOUR::Session*, std::shared_ptr); ~AudioRegionEditor (); void peak_amplitude_thread (); @@ -67,7 +67,7 @@ private: void gain_changed (); void gain_adjustment_changed (); - boost::shared_ptr _audio_region; + std::shared_ptr _audio_region; Gtk::Label gain_label; Gtk::Adjustment gain_adjustment; diff --git a/gtk2_ardour/audio_region_properties_box.cc b/gtk2_ardour/audio_region_properties_box.cc index 15ecb18b87..ee8b4d7fb3 100644 --- a/gtk2_ardour/audio_region_properties_box.cc +++ b/gtk2_ardour/audio_region_properties_box.cc @@ -117,7 +117,7 @@ RegionPropertiesBox::set_session (Session* s) } void -RegionPropertiesBox::set_region (boost::shared_ptr r) +RegionPropertiesBox::set_region (std::shared_ptr r) { set_session (&r->session ()); @@ -191,7 +191,7 @@ AudioRegionPropertiesBox::~AudioRegionPropertiesBox () } void -AudioRegionPropertiesBox::set_region (boost::shared_ptr r) +AudioRegionPropertiesBox::set_region (std::shared_ptr r) { RegionPropertiesBox::set_region (r); } diff --git a/gtk2_ardour/audio_region_properties_box.h b/gtk2_ardour/audio_region_properties_box.h index 1bb0ffc10a..c1399c6441 100644 --- a/gtk2_ardour/audio_region_properties_box.h +++ b/gtk2_ardour/audio_region_properties_box.h @@ -47,12 +47,12 @@ public: RegionPropertiesBox (); ~RegionPropertiesBox (); - virtual void set_region (boost::shared_ptr); + virtual void set_region (std::shared_ptr); void set_session (ARDOUR::Session* s); protected: - boost::shared_ptr _region; + std::shared_ptr _region; Gtk::Label _header_label; @@ -78,7 +78,7 @@ public: AudioRegionPropertiesBox (); ~AudioRegionPropertiesBox (); - virtual void set_region (boost::shared_ptr); + virtual void set_region (std::shared_ptr); private: ArdourWidgets::ArdourButton fade_in_enable_button; diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 45fdfd0c6f..aa50627378 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -111,7 +111,7 @@ static Cairo::RefPtr create_pending_peak_pattern() { return p; } -AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, +AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, std::shared_ptr 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 r, double spu, +AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, std::shared_ptr 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 other_region) - : RegionView (other, boost::shared_ptr (other_region)) +AudioRegionView::AudioRegionView (const AudioRegionView& other, std::shared_ptr other_region) + : RegionView (other, std::shared_ptr (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 +std::shared_ptr AudioRegionView::audio_region() const { // "Guaranteed" to succeed... - return boost::dynamic_pointer_cast(_region); + return std::dynamic_pointer_cast(_region); } void @@ -415,7 +415,7 @@ AudioRegionView::region_renamed () str = string ("*") + str; } - boost::shared_ptr ar (audio_region()); + std::shared_ptr 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 ar, samplecnt_t width, bool drag_active) +AudioRegionView::reset_fade_in_shape_width (std::shared_ptr 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 ar, s Points points; Points::size_type pi; - boost::shared_ptr list (audio_region()->fade_in()); + std::shared_ptr 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 ar, samplecnt_t width, bool drag_active) +AudioRegionView::reset_fade_out_shape_width (std::shared_ptr 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 ar, Points points; Points::size_type pi; - boost::shared_ptr list (audio_region()->fade_out()); + std::shared_ptr 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 ar (audio_region()); + std::shared_ptr 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 ar, samplecnt_t /*width*/, Points& points, double effective_height, +AudioRegionView::redraw_start_xfade_to (std::shared_ptr 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 ar, sampl /* fade out line */ - boost::shared_ptr inverse = ar->inverse_fade_in (); + std::shared_ptr inverse = ar->inverse_fade_in (); Points ipoints; Points::size_type npoints; @@ -916,7 +916,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr ar, sampl void AudioRegionView::redraw_end_xfade () { - boost::shared_ptr ar (audio_region()); + std::shared_ptr 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 ar, samplecnt_t width, Points& points, double effective_height, +AudioRegionView::redraw_end_xfade_to (std::shared_ptr 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 ar, samplec /* fade in line */ - boost::shared_ptr inverse = ar->inverse_fade_out (); + std::shared_ptr 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 ar (audio_region()); + std::shared_ptr 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 ar (audio_region()); + std::shared_ptr 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()); - trackview.editor().set_current_movable (boost::shared_ptr()); + trackview.editor().set_current_trimmable (std::shared_ptr()); + trackview.editor().set_current_movable (std::shared_ptr()); // if (gain_line) { // gain_line->remove_visibility (AutomationLine::ControlPoints); diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index de47455321..903af2cf57 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -59,25 +59,25 @@ class AudioRegionView : public RegionView public: AudioRegionView (ArdourCanvas::Container *, RouteTimeAxisView&, - boost::shared_ptr, + std::shared_ptr, double initial_samples_per_pixel, uint32_t base_color); AudioRegionView (ArdourCanvas::Container *, RouteTimeAxisView&, - boost::shared_ptr, + std::shared_ptr, double samples_per_pixel, uint32_t base_color, bool recording, TimeAxisViewItem::Visibility); - AudioRegionView (const AudioRegionView& other, boost::shared_ptr); + AudioRegionView (const AudioRegionView& other, std::shared_ptr); ~AudioRegionView (); void init (bool wait_for_data); - boost::shared_ptr audio_region() const; + std::shared_ptr 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 get_gain_line() const { return gain_line; } + std::shared_ptr 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 ar, samplecnt_t, bool drag_active = false); - void reset_fade_out_shape_width (boost::shared_ptr ar, samplecnt_t, bool drag_active = false); + void reset_fade_in_shape_width (std::shared_ptr ar, samplecnt_t, bool drag_active = false); + void reset_fade_out_shape_width (std::shared_ptr 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, samplecnt_t, ArdourCanvas::Points&, double, double); - void redraw_end_xfade_to (boost::shared_ptr, samplecnt_t, ArdourCanvas::Points&, double, double, double); + void redraw_start_xfade_to (std::shared_ptr, samplecnt_t, ArdourCanvas::Points&, double, double); + void redraw_end_xfade_to (std::shared_ptr, 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 gain_line; + std::shared_ptr gain_line; double _amplitude_above_axis; diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index a09417cd8a..7c0da292c9 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -91,10 +91,10 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) } RegionView* -AudioStreamView::create_region_view (boost::shared_ptr r, bool wait_for_waves, bool recording) +AudioStreamView::create_region_view (std::shared_ptr r, bool wait_for_waves, bool recording) { AudioRegionView *region_view = 0; - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); if (region == 0) { return 0; @@ -139,7 +139,7 @@ AudioStreamView::create_region_view (boost::shared_ptr r, bool wait_for_ } RegionView* -AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) +AudioStreamView::add_region_view_internal (std::shared_ptr 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 r, bool wai /* catch region going away */ - r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); + r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, std::weak_ptr (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 tr = _trackview.audio_track(); + std::shared_ptr tr = _trackview.audio_track(); for (uint32_t n = 0; n < tr->n_channels().n_audio(); ++n) { - boost::shared_ptr src = tr->write_source (n); + std::shared_ptr 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(src)), + boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, std::weak_ptr(src)), gui_context()); } } @@ -249,8 +249,8 @@ AudioStreamView::setup_rec_box () plist.add (Properties::name, string()); plist.add (Properties::layer, 0); - boost::shared_ptr region ( - boost::dynamic_pointer_cast(RegionFactory::create (sources, plist, false))); + std::shared_ptr region ( + std::dynamic_pointer_cast(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 at = _trackview.audio_track(); + std::shared_ptr 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,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { - list,RegionView*> >::iterator tmp; + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { + list,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 weak_src) +AudioStreamView::rec_peak_range_ready (samplepos_t start, samplecnt_t cnt, std::weak_ptr weak_src) { ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src) - boost::shared_ptr src (weak_src.lock()); + std::shared_ptr 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,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - list,RegionView*> >::iterator tmp = iter; + list,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 region = boost::dynamic_pointer_cast(iter->first); + std::shared_ptr region = std::dynamic_pointer_cast(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 > -AudioStreamView::hide_xfades_with (boost::shared_ptr ar) +AudioStreamView::hide_xfades_with (std::shared_ptr ar) { list start_hidden; list end_hidden; diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index 07524eb348..b5e98b8745 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -62,9 +62,9 @@ public: void show_all_fades (); void hide_all_fades (); - std::pair, std::list > hide_xfades_with (boost::shared_ptr ar); + std::pair, std::list > hide_xfades_with (std::shared_ptr ar); - RegionView* create_region_view (boost::shared_ptr, bool, bool); + RegionView* create_region_view (std::shared_ptr, 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 src); + void rec_peak_range_ready (samplepos_t start, ARDOUR::samplecnt_t cnt, std::weak_ptr src); void update_rec_regions (ARDOUR::samplepos_t, ARDOUR::samplecnt_t); - RegionView* add_region_view_internal (boost::shared_ptr, bool wait_for_waves, bool recording = false); - void remove_audio_region_view (boost::shared_ptr ); + RegionView* add_region_view_internal (std::shared_ptr, bool wait_for_waves, bool recording = false); + void remove_audio_region_view (std::shared_ptr ); void redisplay_track (); @@ -87,7 +87,7 @@ private: double _amplitude_above_axis; - std::map, bool> rec_data_ready_map; + std::map, bool> rec_data_ready_map; ArdourCanvas::Container* _region_group; diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 7c8d28b2b1..9bf24345a2 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -79,7 +79,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan } void -AudioTimeAxisView::set_route (boost::shared_ptr rt) +AudioTimeAxisView::set_route (std::shared_ptr rt) { _route = rt; diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index 7aaae67dc2..2d46664d5c 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -70,7 +70,7 @@ public: AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); virtual ~AudioTimeAxisView (); - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); AudioStreamView* audio_view(); diff --git a/gtk2_ardour/audio_trigger_properties_box.cc b/gtk2_ardour/audio_trigger_properties_box.cc index 1c1594d780..109eb4fc0e 100644 --- a/gtk2_ardour/audio_trigger_properties_box.cc +++ b/gtk2_ardour/audio_trigger_properties_box.cc @@ -166,7 +166,7 @@ void AudioTriggerPropertiesBox::MultiplyTempo(float mult) { TriggerPtr trigger (tref.trigger()); - boost::shared_ptr at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (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 at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (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 at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (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 at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (trigger); if (!at) { return; } @@ -290,7 +290,7 @@ AudioTriggerPropertiesBox::beats_changed () } TriggerPtr trigger (tref.trigger()); - boost::shared_ptr at = boost::dynamic_pointer_cast (trigger); + std::shared_ptr at = std::dynamic_pointer_cast (trigger); if (at) { at->set_segment_beatcnt (_beat_adjustment.get_value()); } diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index f6f35e0938..81df0429be 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -51,7 +51,7 @@ using namespace ArdourWidgets; using PBD::Controllable; AutomationBarController::AutomationBarController ( - boost::shared_ptr ac, + std::shared_ptr ac, Adjustment* adj) : ArdourWidgets::BarController (*adj, ac) , _controllable (ac) @@ -69,7 +69,7 @@ AutomationBarController::~AutomationBarController() { } -AutomationController::AutomationController(boost::shared_ptr ac, +AutomationController::AutomationController(std::shared_ptr ac, Adjustment* adj, bool use_knob) : _widget(NULL) @@ -140,10 +140,10 @@ AutomationController::~AutomationController() { } -boost::shared_ptr +std::shared_ptr AutomationController::create(const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr ac, + std::shared_ptr 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(new AutomationController(ac, adjustment, use_knob)); + return std::shared_ptr(new AutomationController(ac, adjustment, use_knob)); } void diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h index f39609e543..07b698b4d8 100644 --- a/gtk2_ardour/automation_controller.h +++ b/gtk2_ardour/automation_controller.h @@ -51,26 +51,26 @@ namespace Gtk { class AutomationBarController : public ArdourWidgets::BarController { public: - AutomationBarController(boost::shared_ptr ac, + AutomationBarController(std::shared_ptr ac, Gtk::Adjustment* adj); ~AutomationBarController(); private: std::string get_label (double&); - boost::shared_ptr _controllable; + std::shared_ptr _controllable; }; /** A BarController which displays the value and allows control of an AutomationControl */ class AutomationController : public Gtk::Alignment { public: - static boost::shared_ptr create ( + static std::shared_ptr create ( const Evoral::Parameter& param, const ARDOUR::ParameterDescriptor& desc, - boost::shared_ptr ac, + std::shared_ptr ac, bool use_knob = false); ~AutomationController(); - boost::shared_ptr controllable() { return _controllable; } + std::shared_ptr controllable() { return _controllable; } void disable_vertical_scroll(); @@ -84,7 +84,7 @@ public: void stop_updating (); private: - AutomationController (boost::shared_ptr ac, + AutomationController (std::shared_ptr ac, Gtk::Adjustment* adj, bool use_knob); @@ -99,7 +99,7 @@ private: bool on_button_release(GdkEventButton* ev); Gtk::Widget* _widget; - boost::shared_ptr _controllable; + std::shared_ptr _controllable; Gtk::Adjustment* _adjustment; sigc::connection _screen_update_connection; PBD::ScopedConnectionList _changed_connections; diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index e876d14cb5..18a01eb620 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -87,7 +87,7 @@ using namespace Temporal; AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Item& parent, - boost::shared_ptr al, + std::shared_ptr al, const ParameterDescriptor& desc) : trackview (tv) , _name (name) @@ -1236,7 +1236,7 @@ AutomationLine::clear () } void -AutomationLine::set_list (boost::shared_ptr list) +AutomationLine::set_list (std::shared_ptr list) { alist = list; queue_reset (); diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 4eba5dbc5f..839f2ac20d 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -68,7 +68,7 @@ public: AutomationLine (const std::string& name, TimeAxisView& tv, ArdourCanvas::Item& parent, - boost::shared_ptr al, + std::shared_ptr 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 list); - boost::shared_ptr the_list() const { return alist; } + void set_list(std::shared_ptr list); + std::shared_ptr 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 alist; + std::shared_ptr alist; VisibleAspects _visible; @@ -207,7 +207,7 @@ private: friend class ContiguousControlPoints; - typedef boost::shared_ptr CCP; + typedef std::shared_ptr CCP; std::vector contiguous_points; bool sync_model_with_view_point (ControlPoint&); diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index db6c7bbcb0..85df1bdf1c 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -48,9 +48,9 @@ using namespace Temporal; AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent, AutomationTimeAxisView& time_axis, - boost::shared_ptr region, + std::shared_ptr region, const Evoral::Parameter& param, - boost::shared_ptr list, + std::shared_ptr 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 list) +AutomationRegionView::create_line (std::shared_ptr list) { - _line = boost::shared_ptr (new MidiAutomationLine( + _line = std::shared_ptr (new MidiAutomationLine( ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()), trackview, *get_canvas_group(), list, - boost::dynamic_pointer_cast (_region), + std::dynamic_pointer_cast (_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 c = _region->control(_parameter, true); - boost::shared_ptr ac = boost::dynamic_pointer_cast(c); + std::shared_ptr c = _region->control(_parameter, true); + std::shared_ptr ac = std::dynamic_pointer_cast(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 mt = boost::dynamic_pointer_cast (view->parent_stripable ()); + std::shared_ptr mt = std::dynamic_pointer_cast (view->parent_stripable ()); assert (mt); - boost::shared_ptr mc = mt->control(_parameter); + std::shared_ptr 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 slist) + std::shared_ptr slist) { using namespace ARDOUR; AutomationTimeAxisView* const view = automation_view(); - boost::shared_ptr my_list = _line->the_list(); + std::shared_ptr 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 */ diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h index 58cdff6a7d..a76bcce596 100644 --- a/gtk2_ardour/automation_region_view.h +++ b/gtk2_ardour/automation_region_view.h @@ -40,9 +40,9 @@ class AutomationRegionView : public RegionView public: AutomationRegionView(ArdourCanvas::Container*, AutomationTimeAxisView&, - boost::shared_ptr, + std::shared_ptr, const Evoral::Parameter& parameter, - boost::shared_ptr, + std::shared_ptr, 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 slist); + std::shared_ptr slist); inline AutomationTimeAxisView* automation_view() const { return dynamic_cast(&trackview); } - boost::shared_ptr line() { return _line; } + std::shared_ptr 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 list); + void create_line(std::shared_ptr 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 _line; + std::shared_ptr _line; PBD::ScopedConnection _mouse_mode_connection; }; diff --git a/gtk2_ardour/automation_selection.h b/gtk2_ardour/automation_selection.h index 8460613e94..3aaf2bd2b5 100644 --- a/gtk2_ardour/automation_selection.h +++ b/gtk2_ardour/automation_selection.h @@ -24,7 +24,7 @@ #include "ardour/automation_list.h" #include "evoral/Parameter.h" -class AutomationSelection : public std::list > { +class AutomationSelection : public std::list > { public: const_iterator get_nth(const Evoral::Parameter& param, size_t nth) const { diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index 6238ed87de..f3dacd322b 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -73,19 +73,19 @@ AutomationStreamView::~AutomationStreamView () RegionView* -AutomationStreamView::add_region_view_internal (boost::shared_ptr region, bool /*wait_for_data*/, bool /*recording*/) +AutomationStreamView::add_region_view_internal (std::shared_ptr region, bool /*wait_for_data*/, bool /*recording*/) { if (!region) { return 0; } - const boost::shared_ptr control = boost::dynamic_pointer_cast ( + const std::shared_ptr control = std::dynamic_pointer_cast ( region->control (_automation_view.parameter(), true) ); - boost::shared_ptr list; + std::shared_ptr list; if (control) { - list = boost::dynamic_pointer_cast(control->list()); + list = std::dynamic_pointer_cast(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 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)), gui_context()); + region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, std::weak_ptr(region)), gui_context()); /* setup automation state for this region */ - boost::shared_ptr line = region_view->line (); + std::shared_ptr 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 > lines = get_lines (); + list > lines = get_lines (); - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::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 line = ((AutomationRegionView*) region_views.front())->line (); + std::shared_ptr 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 > lines = get_lines (); + list > lines = get_lines (); - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::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 > lines = get_lines (); + list > lines = get_lines (); - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::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 > lines = get_lines (); + list > lines = get_lines (); - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::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 > lines = get_lines (); + list > lines = get_lines (); - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { (*i)->set_selected_points (ps); } } -list > +list > AutomationStreamView::get_lines () const { - list > lines; + list > lines; for (list::const_iterator i = region_views.begin(); i != region_views.end(); ++i) { AutomationRegionView* arv = dynamic_cast (*i); @@ -314,7 +314,7 @@ bool AutomationStreamView::paste (timepos_t const & pos, unsigned paste_count, float times, - boost::shared_ptr alist) + std::shared_ptr 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 r = (*prev)->region (); + std::shared_ptr r = (*prev)->region (); /* If *prev doesn't cover pos, it's no good */ if (r->position() > pos || ((r->position() + r->length()) < pos)) { diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h index 0d872d3a03..ceabe76f5b 100644 --- a/gtk2_ardour/automation_streamview.h +++ b/gtk2_ardour/automation_streamview.h @@ -66,17 +66,17 @@ public: void get_selectables (Temporal::timepos_t const &, Temporal::timepos_t const &, double, double, std::list &, bool within = false); void set_selected_points (PointSelection &); - std::list > get_lines () const; + std::list > get_lines () const; bool paste (Temporal::timepos_t const & pos, unsigned paste_count, float times, - boost::shared_ptr list); + std::shared_ptr list); private: void setup_rec_box (); - RegionView* add_region_view_internal (boost::shared_ptr, bool wait_for_data, bool recording = false); + RegionView* add_region_view_internal (std::shared_ptr, bool wait_for_data, bool recording = false); void display_region(AutomationRegionView* region_view); void color_handler (); diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index fbe8d8925c..9ceb6e1f4a 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -91,9 +91,9 @@ bool AutomationTimeAxisView::have_name_font = false; */ AutomationTimeAxisView::AutomationTimeAxisView ( Session* s, - boost::shared_ptr strip, - boost::shared_ptr a, - boost::shared_ptr c, + std::shared_ptr strip, + std::shared_ptr a, + std::shared_ptr c, Evoral::Parameter p, PublicEditor& e, TimeAxisView& parent, @@ -299,7 +299,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( assert (_control); - boost::shared_ptr line ( + std::shared_ptr 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 r = boost::dynamic_pointer_cast (_stripable); + std::shared_ptr r = std::dynamic_pointer_cast (_stripable); if (!r) { return; } @@ -758,7 +758,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, timepos_t const & return; } - boost::shared_ptr list = _line->the_list (); + std::shared_ptr 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 alist(_line->the_list()); + std::shared_ptr 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 line) +AutomationTimeAxisView::add_line (std::shared_ptr 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 > +list > AutomationTimeAxisView::lines () const { - list > lines; + list > 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 > lines; + list > lines; if (_line) { lines.push_back (_line); } else if (_view) { lines = _view->get_lines (); } - for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + for (list >::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 what_we_got; - boost::shared_ptr alist (line.the_list()); + std::shared_ptr what_we_got; + std::shared_ptr alist (line.the_list()); XMLNode &before = alist->get_state(); @@ -1189,7 +1189,7 @@ AutomationTimeAxisView::presentation_info () const return _stripable->presentation_info(); } -boost::shared_ptr +std::shared_ptr AutomationTimeAxisView::stripable () const { return _stripable; diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index 81fffb3485..9f5f04a92b 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -64,9 +64,9 @@ class AutomationTimeAxisView : public TimeAxisView { public: AutomationTimeAxisView (ARDOUR::Session*, - boost::shared_ptr, - boost::shared_ptr, - boost::shared_ptr, + std::shared_ptr, + std::shared_ptr, + std::shared_ptr, Evoral::Parameter, PublicEditor&, TimeAxisView& parent, @@ -83,7 +83,7 @@ public: Gdk::Color color () const; void update_name_from_param (); - boost::shared_ptr stripable() const; + std::shared_ptr 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 line() { return _line; } + std::shared_ptr line() { return _line; } /** @return All AutomationLines associated with this view */ - std::list > lines () const; + std::list > 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 control() const { return _control; } - boost::shared_ptr controller() const { return _controller; } + std::shared_ptr control() const { return _control; } + std::shared_ptr controller() const { return _controller; } Evoral::Parameter parameter () const { return _parameter; } @@ -127,7 +127,7 @@ public: bool has_automation () const; - boost::shared_ptr parent_stripable () { + std::shared_ptr 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 _stripable; + std::shared_ptr _stripable; /** control */ - boost::shared_ptr _control; + std::shared_ptr _control; /** control owner; may be _stripable, something else (e.g. a pan control), or NULL */ - boost::shared_ptr _automatable; + std::shared_ptr _automatable; /** controller owner */ - boost::shared_ptr _controller; + std::shared_ptr _controller; Evoral::Parameter _parameter; ArdourCanvas::Rectangle* _base_rect; - boost::shared_ptr _line; + std::shared_ptr _line; std::string _name; @@ -180,7 +180,7 @@ protected: bool _show_regions; - void add_line (boost::shared_ptr); + void add_line (std::shared_ptr); void clear_clicked (); void hide_clicked (); diff --git a/gtk2_ardour/axis_provider.h b/gtk2_ardour/axis_provider.h index 56f4bf8d39..4c389ffcdd 100644 --- a/gtk2_ardour/axis_provider.h +++ b/gtk2_ardour/axis_provider.h @@ -33,8 +33,8 @@ class AxisViewProvider { public: virtual ~AxisViewProvider () {} - virtual AxisView* axis_view_by_stripable (boost::shared_ptr) const = 0; - virtual AxisView* axis_view_by_control (boost::shared_ptr) const = 0; + virtual AxisView* axis_view_by_stripable (std::shared_ptr) const = 0; + virtual AxisView* axis_view_by_control (std::shared_ptr) const = 0; }; #endif /* __gtk2_ardour_axis_provider_h__ */ diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index df464983f7..afc1cc0a80 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -62,8 +62,8 @@ public: sigc::signal Hiding; - virtual boost::shared_ptr stripable() const = 0; - virtual boost::shared_ptr control() const { return boost::shared_ptr(); } + virtual std::shared_ptr stripable() const = 0; + virtual std::shared_ptr control() const { return std::shared_ptr(); } virtual std::string state_id() const = 0; /* for now, we always return properties in string form. diff --git a/gtk2_ardour/beatbox_gui.cc b/gtk2_ardour/beatbox_gui.cc index 2a67676f54..fec33a1aa0 100644 --- a/gtk2_ardour/beatbox_gui.cc +++ b/gtk2_ardour/beatbox_gui.cc @@ -67,7 +67,7 @@ using std::endl; const double _step_dimen = 32; -BBGUI::BBGUI (boost::shared_ptr bb) +BBGUI::BBGUI (std::shared_ptr 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 src = bbox->sequencer().write_to_source (bbox->session(), path); + std::shared_ptr 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 = RegionFactory::create (src, plist, true); + std::shared_ptr region = RegionFactory::create (src, plist, true); } void diff --git a/gtk2_ardour/beatbox_gui.h b/gtk2_ardour/beatbox_gui.h index 4b8e1308b5..cde2a92617 100644 --- a/gtk2_ardour/beatbox_gui.h +++ b/gtk2_ardour/beatbox_gui.h @@ -252,7 +252,7 @@ class SequencerStepIndicator : public ArdourCanvas::Rectangle, public sigc::trac class BBGUI : public ArdourDialog { public: - BBGUI (boost::shared_ptr bb); + BBGUI (std::shared_ptr bb); ~BBGUI (); double width() const { return _width; } @@ -263,7 +263,7 @@ class BBGUI : public ArdourDialog { void on_unmap (); private: - boost::shared_ptr bbox; + std::shared_ptr bbox; double _width; double _height; diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 5260a8fcfb..5c4b7a5edf 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -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) +BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, std::shared_ptr bundle) : PortMatrix (parent, session, DataType::NIL) , _bundle (bundle) { - _port_group = boost::shared_ptr (new PortGroup ("")); + _port_group = std::shared_ptr (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 b) const +BundleEditorMatrix::can_add_channels (std::shared_ptr b) const { if (b == _bundle) { return true; @@ -113,7 +113,7 @@ BundleEditorMatrix::can_add_channels (boost::shared_ptr b) const } bool -BundleEditorMatrix::can_add_port (boost::shared_ptr b, DataType t) const +BundleEditorMatrix::can_add_port (std::shared_ptr b, DataType t) const { #if 1 return true; // anything goes @@ -124,7 +124,7 @@ BundleEditorMatrix::can_add_port (boost::shared_ptr b, DataType t) const } void -BundleEditorMatrix::add_channel (boost::shared_ptr b, DataType t) +BundleEditorMatrix::add_channel (std::shared_ptr b, DataType t) { if (b == _bundle) { @@ -145,7 +145,7 @@ BundleEditorMatrix::add_channel (boost::shared_ptr b, DataType t) } bool -BundleEditorMatrix::can_remove_channels (boost::shared_ptr b) const +BundleEditorMatrix::can_remove_channels (std::shared_ptr b) const { if (b != _bundle) { return false; @@ -161,7 +161,7 @@ BundleEditorMatrix::remove_channel (BundleChannel bc) } bool -BundleEditorMatrix::can_rename_channels (boost::shared_ptr b) const +BundleEditorMatrix::can_rename_channels (std::shared_ptr b) const { if (b == _bundle) { return true; @@ -194,7 +194,7 @@ BundleEditorMatrix::disassociation_verb () const return _("Disassociate"); } -BundleEditor::BundleEditor (Session* session, boost::shared_ptr bundle) +BundleEditor::BundleEditor (Session* session, std::shared_ptr 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 bundles = _session->bundles (); + std::shared_ptr 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 b (new UserBundle (_("Bundle"))); + std::shared_ptr 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 b = (*i)[_list_model_columns.bundle]; + std::shared_ptr 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 b = (*i)[_list_model_columns.bundle]; + std::shared_ptr b = (*i)[_list_model_columns.bundle]; _session->remove_bundle (b); _list_model->erase (i); } } void -BundleManager::add_bundle (boost::shared_ptr b) +BundleManager::add_bundle (std::shared_ptr b) { - boost::shared_ptr u = boost::dynamic_pointer_cast (b); + std::shared_ptr u = std::dynamic_pointer_cast (b); if (u == 0) { return; } @@ -385,20 +385,20 @@ BundleManager::add_bundle (boost::shared_ptr 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 (u)), gui_context()); + u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, std::weak_ptr (u)), gui_context()); } void -BundleManager::bundle_changed (Bundle::Change c, boost::weak_ptr wb) +BundleManager::bundle_changed (Bundle::Change c, std::weak_ptr wb) { - boost::shared_ptr b = wb.lock (); + std::shared_ptr 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 t = (*i)[_list_model_columns.bundle]; + std::shared_ptr 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 b = (*i)[_list_model_columns.bundle]; + std::shared_ptr b = (*i)[_list_model_columns.bundle]; BundleEditor e (_session, b); e.run (); } @@ -430,7 +430,7 @@ NameChannelDialog::NameChannelDialog () setup (); } -NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint32_t c) +NameChannelDialog::NameChannelDialog (std::shared_ptr b, uint32_t c) : ArdourDialog (_("Rename Channel")), _bundle (b), _adding (false) diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h index 38294cd8c0..9f0f84d2f9 100644 --- a/gtk2_ardour/bundle_manager.h +++ b/gtk2_ardour/bundle_manager.h @@ -38,18 +38,18 @@ namespace ARDOUR { class BundleEditorMatrix : public PortMatrix { public: - BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, boost::shared_ptr); + BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, std::shared_ptr); 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) const; - bool can_add_port (boost::shared_ptr, ARDOUR::DataType t) const; + bool can_add_channels (std::shared_ptr) const; + bool can_add_port (std::shared_ptr, ARDOUR::DataType t) const; - void add_channel (boost::shared_ptr, ARDOUR::DataType); - bool can_remove_channels (boost::shared_ptr) const; + void add_channel (std::shared_ptr, ARDOUR::DataType); + bool can_remove_channels (std::shared_ptr) const; void remove_channel (ARDOUR::BundleChannel); - bool can_rename_channels (boost::shared_ptr) const; + bool can_rename_channels (std::shared_ptr) 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 _port_group; - boost::shared_ptr _bundle; + std::shared_ptr _port_group; + std::shared_ptr _bundle; }; class BundleEditor : public ArdourDialog { public: - BundleEditor (ARDOUR::Session *, boost::shared_ptr); + BundleEditor (ARDOUR::Session *, std::shared_ptr); protected: void on_map (); @@ -80,7 +80,7 @@ private: void on_show (); BundleEditorMatrix _matrix; - boost::shared_ptr _bundle; + std::shared_ptr _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); - void bundle_changed (ARDOUR::Bundle::Change, boost::weak_ptr); + void add_bundle (std::shared_ptr); + void bundle_changed (ARDOUR::Bundle::Change, std::weak_ptr); void set_button_sensitivity (); void row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn* c); @@ -109,7 +109,7 @@ private: } Gtk::TreeModelColumn name; - Gtk::TreeModelColumn > bundle; + Gtk::TreeModelColumn > bundle; }; Gtk::TreeView _tree_view; @@ -124,7 +124,7 @@ class NameChannelDialog : public ArdourDialog { public: NameChannelDialog (); - NameChannelDialog (boost::shared_ptr, uint32_t); + NameChannelDialog (std::shared_ptr, uint32_t); std::string get_name () const; @@ -132,7 +132,7 @@ private: void setup (); - boost::shared_ptr _bundle; + std::shared_ptr _bundle; Gtk::Entry _name; bool _adding; }; diff --git a/gtk2_ardour/control_slave_ui.cc b/gtk2_ardour/control_slave_ui.cc index 55b0e1a14d..38c680e8e1 100644 --- a/gtk2_ardour/control_slave_ui.cc +++ b/gtk2_ardour/control_slave_ui.cc @@ -67,14 +67,14 @@ ControlSlaveUI::~ControlSlaveUI () } void -ControlSlaveUI::set_stripable (boost::shared_ptr s) +ControlSlaveUI::set_stripable (std::shared_ptr s) { connections.drop_connections (); stripable = s; if (stripable) { - boost::shared_ptr ac = stripable->gain_control(); + std::shared_ptr ac = stripable->gain_control(); assert (ac); ac->MasterStatusChange.connect (connections, @@ -82,7 +82,7 @@ ControlSlaveUI::set_stripable (boost::shared_ptr 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()), gui_context()); + stripable->DropReferences.connect (connections, invalidator (*this), boost::bind (&ControlSlaveUI::set_stripable, this, std::shared_ptr()), 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 = _session->vca_manager().vca_by_number (n); + std::shared_ptr vca = _session->vca_manager().vca_by_number (n); if (!vca) { return; } - boost::shared_ptr sl = boost::dynamic_pointer_cast (stripable); + std::shared_ptr sl = std::dynamic_pointer_cast (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 sl = boost::dynamic_pointer_cast (stripable); + std::shared_ptr sl = std::dynamic_pointer_cast (stripable); if (!sl) { return; } - sl->unassign (boost::shared_ptr()); + sl->unassign (std::shared_ptr()); } bool @@ -221,7 +221,7 @@ ControlSlaveUI::vca_button_release (GdkEventButton* ev, uint32_t n) } void -ControlSlaveUI::add_vca_button (boost::shared_ptr vca) +ControlSlaveUI::add_vca_button (std::shared_ptr vca) { ArdourButton* vca_button = manage (new ArdourButton (ArdourButton::default_elements)); diff --git a/gtk2_ardour/control_slave_ui.h b/gtk2_ardour/control_slave_ui.h index a0a4cf5244..5908cf90b4 100644 --- a/gtk2_ardour/control_slave_ui.h +++ b/gtk2_ardour/control_slave_ui.h @@ -44,10 +44,10 @@ class ControlSlaveUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr public: ControlSlaveUI (ARDOUR::Session*); ~ControlSlaveUI (); - void set_stripable (boost::shared_ptr); + void set_stripable (std::shared_ptr); private: - boost::shared_ptr stripable; + std::shared_ptr 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); + void add_vca_button (std::shared_ptr); void unassign_all (); Gtk::Menu* context_menu; diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h index 0c49666095..a90cbe91ef 100644 --- a/gtk2_ardour/crossfade_edit.h +++ b/gtk2_ardour/crossfade_edit.h @@ -57,7 +57,7 @@ namespace ArdourWaveview { class CrossfadeEditor : public ArdourDialog { public: - CrossfadeEditor (ARDOUR::Session*, boost::shared_ptr, double miny, double maxy); + CrossfadeEditor (ARDOUR::Session*, std::shared_ptr, double miny, double maxy); ~CrossfadeEditor (); void apply (); @@ -94,7 +94,7 @@ protected: bool on_key_release_event (GdkEventKey*); private: - boost::shared_ptr xfade; + std::shared_ptr xfade; Gtk::VBox vpacker; @@ -200,11 +200,11 @@ private: PBD::ScopedConnection* _peaks_ready_connection; PBD::ScopedConnection state_connection; - void make_waves (boost::shared_ptr, WhichFade); - void peaks_ready (boost::weak_ptr r, WhichFade); + void make_waves (std::shared_ptr, WhichFade); + void peaks_ready (std::weak_ptr r, WhichFade); - void _apply_to (boost::shared_ptr xf); - void setup (boost::shared_ptr); + void _apply_to (std::shared_ptr xf); + void setup (std::shared_ptr); void cancel_audition (); void audition_state_changed (bool); diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h index 65d9d85ded..f953601615 100644 --- a/gtk2_ardour/crossfade_view.h +++ b/gtk2_ardour/crossfade_view.h @@ -41,7 +41,7 @@ class CrossfadeView : public TimeAxisViewItem public: CrossfadeView (ArdourCanvas::Container*, RouteTimeAxisView&, - boost::shared_ptr, + std::shared_ptr, double initial_samples_per_pixel, Gdk::Color& basic_color, AudioRegionView& leftview, @@ -49,7 +49,7 @@ public: ~CrossfadeView (); - boost::shared_ptr crossfade; // ok, let 'em have it + std::shared_ptr crossfade; // ok, let 'em have it AudioRegionView& left_view; // and these too AudioRegionView& right_view; diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc index b3f839a1d9..7bd2dc4322 100644 --- a/gtk2_ardour/cuebox_ui.cc +++ b/gtk2_ardour/cuebox_ui.cc @@ -304,10 +304,10 @@ CueBoxUI::context_menu (uint64_t idx) void CueBoxUI::get_slots (TriggerList &triggerlist, uint64_t idx) { - boost::shared_ptr rl = _session->get_routes(); + std::shared_ptr rl = _session->get_routes(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr route = *r; - boost::shared_ptr box = route->triggerbox(); + std::shared_ptr route = *r; + std::shared_ptr 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()); + (*t)->set_region(std::shared_ptr()); } } diff --git a/gtk2_ardour/cursor_context.h b/gtk2_ardour/cursor_context.h index bfe6d91714..4ce64ac464 100644 --- a/gtk2_ardour/cursor_context.h +++ b/gtk2_ardour/cursor_context.h @@ -44,7 +44,7 @@ class CursorContext { public: /** A smart handle for a cursor change context. */ - typedef boost::shared_ptr Handle; + typedef std::shared_ptr Handle; ~CursorContext(); diff --git a/gtk2_ardour/duplicate_routes_dialog.cc b/gtk2_ardour/duplicate_routes_dialog.cc index 23484a3027..d89a7d0eb7 100644 --- a/gtk2_ardour/duplicate_routes_dialog.cc +++ b/gtk2_ardour/duplicate_routes_dialog.cc @@ -95,9 +95,9 @@ DuplicateRouteDialog::restart (Session* s) continue; } - boost::shared_ptr r (rui->route()); + std::shared_ptr r (rui->route()); - if (boost::dynamic_pointer_cast (r)) { + if (std::dynamic_pointer_cast (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 r; + std::shared_ptr r; - if ((r = boost::dynamic_pointer_cast (*s)) == 0) { + if ((r = std::dynamic_pointer_cast (*s)) == 0) { /* some other type of Stripable, not a route */ continue; } diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index b8eb65c0ac..80240bc220 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -98,7 +98,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set n) _time_clock.set_mode (AudioClock::BBT); /* Calculate absolute position of the event on time timeline */ - boost::shared_ptr region (_region_view->region ()); + std::shared_ptr 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 region (_region_view->region ()); + std::shared_ptr 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 ()); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 272ddf0ac1..7c8b866ed2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1706,8 +1706,8 @@ Editor::build_track_region_context_menu () RouteTimeAxisView* rtv = dynamic_cast (clicked_axisview); if (rtv) { - boost::shared_ptr tr; - boost::shared_ptr pl; + std::shared_ptr tr; + std::shared_ptr 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 (arv->region ())) { + if (!std::dynamic_pointer_cast (arv->region ())) { continue; } assert (dynamic_cast (&arv->get_time_axis_view ())); @@ -1753,7 +1753,7 @@ Editor::loudness_analyze_region_selection () if (!arv) { continue; } - boost::shared_ptr ar = boost::dynamic_pointer_cast (arv->region ()); + std::shared_ptr ar = std::dynamic_pointer_cast (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 pl = boost::dynamic_pointer_cast ((*i)->playlist ()); + std::shared_ptr pl = std::dynamic_pointer_cast ((*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 pl = boost::dynamic_pointer_cast ((*i)->playlist ()); + std::shared_ptr pl = std::dynamic_pointer_cast ((*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) +Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, std::shared_ptr 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 pl) +Editor::playlist_deletion_dialog (std::shared_ptr 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 pl) } int -Editor::plugin_setup (boost::shared_ptr r, boost::shared_ptr pi, ARDOUR::Route::PluginSetupOptions flags) +Editor::plugin_setup (std::shared_ptr r, std::shared_ptr 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 > playlists; + vector > 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 pl) +Editor::mapped_select_playlist_matching (RouteUI& rui, std::weak_ptr pl) { rui.select_playlist_matching (pl); } void -Editor::mapped_use_new_playlist (RouteUI& rui, std::string name, string gid, bool copy, vector > const & playlists) +Editor::mapped_use_new_playlist (RouteUI& rui, std::string name, string gid, bool copy, vector > 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 > playlists; + vector > 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 > playlists; + vector > 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 > playlists; + vector > 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 > playlists; + vector > 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(*t); if (rtv) { - boost::shared_ptr tr; - boost::shared_ptr pl; + std::shared_ptr tr; + std::shared_ptr pl; if ((tr = rtv->track()) && ((pl = tr->playlist()))) { - boost::shared_ptr regions = pl->regions_at (where); + std::shared_ptr 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(*t); if (rtv) { - boost::shared_ptr tr; - boost::shared_ptr pl; + std::shared_ptr tr; + std::shared_ptr pl; if ((tr = rtv->track()) && ((pl = tr->playlist()))) { - boost::shared_ptr regions = pl->regions_touched (where, timepos_t::max (where.time_domain())); + std::shared_ptr 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 (*i)) != 0) { - boost::shared_ptr pl; - std::vector > results; - boost::shared_ptr tr; + std::shared_ptr pl; + std::vector > results; + std::shared_ptr 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 r = pl->region_by_id (id); + std::shared_ptr 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 > > > > &selection) const +Editor::get_per_region_note_selection (list > > > > &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 region, vector& regions) +Editor::get_regionview_corresponding_to (std::shared_ptr region, vector& 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, vecto if ((tatv = dynamic_cast (*i)) != 0) { - boost::shared_ptr pl; + std::shared_ptr pl; RegionView* marv; - boost::shared_ptr tr; + std::shared_ptr tr; if ((tr = tatv->track()) == 0) { /* bus */ @@ -5463,7 +5463,7 @@ Editor::get_regionview_corresponding_to (boost::shared_ptr region, vecto } RegionView* -Editor::regionview_from_region (boost::shared_ptr region) const +Editor::regionview_from_region (std::shared_ptr 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) const } RouteTimeAxisView* -Editor::rtav_from_route (boost::shared_ptr route) const +Editor::rtav_from_route (std::shared_ptr 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 s) const +Editor::axis_view_by_stripable (std::shared_ptr 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 s) const } AxisView* -Editor::axis_view_by_control (boost::shared_ptr c) const +Editor::axis_view_by_control (std::shared_ptr 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 c) const } TrackViewList -Editor::axis_views_from_routes (boost::shared_ptr r) const +Editor::axis_views_from_routes (std::shared_ptr 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 (*v)); + sl.push_back (std::dynamic_pointer_cast (*v)); } add_stripables (sl); @@ -5781,8 +5781,8 @@ Editor::add_routes (RouteList& rlist) void Editor::add_stripables (StripableList& sl) { - boost::shared_ptr v; - boost::shared_ptr r; + std::shared_ptr v; + std::shared_ptr 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 (*s)) != 0) { + if ((v = std::dynamic_pointer_cast (*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 (*s)) != 0) { + } else if ((r = std::dynamic_pointer_cast (*s)) != 0) { if (r->is_auditioner() || r->is_monitor()) { continue; @@ -5900,7 +5900,7 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) return; } - boost::shared_ptr route = rtav->route (); + std::shared_ptr 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 (tv); RouteGroup* rg = rtv->route ()->route_group (); if (rg && rg->is_active () && rg->is_hidden () && !rg->is_select ()) { - boost::shared_ptr rl (rg->route_list ()); + std::shared_ptr 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(tav_b); assert (stav_a && stav_b); - boost::shared_ptr const& a = stav_a->stripable (); - boost::shared_ptr const& b = stav_b->stripable (); + std::shared_ptr const& a = stav_a->stripable (); + std::shared_ptr 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) +Editor::consider_auditioning (std::shared_ptr region) { - boost::shared_ptr r = boost::dynamic_pointer_cast (region); + std::shared_ptr r = std::dynamic_pointer_cast (region); if (r == 0) { _session->cancel_audition (); @@ -6126,13 +6126,13 @@ Editor::consider_auditioning (boost::shared_ptr region) } void -Editor::hide_a_region (boost::shared_ptr r) +Editor::hide_a_region (std::shared_ptr r) { r->set_hidden (true); } void -Editor::show_a_region (boost::shared_ptr r) +Editor::show_a_region (std::shared_ptr r) { r->set_hidden (false); } @@ -6531,13 +6531,13 @@ Editor::change_region_layering_order (bool from_context_menu) return; } - boost::shared_ptr track = boost::dynamic_pointer_cast (clicked_routeview->route()); + std::shared_ptr track = std::dynamic_pointer_cast (clicked_routeview->route()); if (!track) { return; } - boost::shared_ptr pl = track->playlist(); + std::shared_ptr pl = track->playlist(); if (!pl) { return; diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index a12489dc03..127c1b3595 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -224,9 +224,9 @@ public: StripableTimeAxisView* get_stripable_time_axis_by_id (const PBD::ID& id) const; - void consider_auditioning (boost::shared_ptr); - void hide_a_region (boost::shared_ptr); - void show_a_region (boost::shared_ptr); + void consider_auditioning (std::shared_ptr); + void hide_a_region (std::shared_ptr); + void show_a_region (std::shared_ptr); #ifdef USE_RUBBERBAND std::vector 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 region, Selection::Operation op = Selection::Set); + void set_selected_regionview_from_region_list (std::shared_ptr 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 midi_region); + bool process_midi_export_dialog (MidiExportDialog& dialog, std::shared_ptr 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); + void clear_playlist (std::shared_ptr); void clear_grouped_playlists (RouteUI* v); @@ -472,25 +472,25 @@ public: ARDOUR::MidiTrackNameSource mts, ARDOUR::MidiTempoMapDisposition mtd, Temporal::timepos_t& pos, - boost::shared_ptr instrument = boost::shared_ptr(), - boost::shared_ptr track = boost::shared_ptr(), + std::shared_ptr instrument = std::shared_ptr(), + std::shared_ptr track = std::shared_ptr(), bool with_markers = false); void do_embed (std::vector paths, Editing::ImportDisposition disposition, Editing::ImportMode mode, Temporal::timepos_t& pos, - boost::shared_ptr instrument = boost::shared_ptr(), - boost::shared_ptr track = boost::shared_ptr()); + std::shared_ptr instrument = std::shared_ptr(), + std::shared_ptr track = std::shared_ptr()); - void get_regionview_corresponding_to (boost::shared_ptr region, std::vector& regions); + void get_regionview_corresponding_to (std::shared_ptr region, std::vector& regions); void get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const; - void get_per_region_note_selection (std::list > > > >&) const; + void get_per_region_note_selection (std::list > > > >&) const; void center_screen (samplepos_t); - TrackViewList axis_views_from_routes (boost::shared_ptr) const; + TrackViewList axis_views_from_routes (std::shared_ptr) 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); - void set_current_movable (boost::shared_ptr); + void set_current_trimmable (std::shared_ptr); + void set_current_movable (std::shared_ptr); 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 cursor_ctx; + std::shared_ptr 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::AnalysisFeatureList&, bool can_ferret, bool select_new = false); + void split_region_at_points (std::shared_ptr, 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, Temporal::timepos_t const &, Temporal::timecnt_t const &, ARDOUR::RegionList* exclude, bool add_to_command); - void do_ripple (boost::shared_ptr, Temporal::timepos_t const &, Temporal::timecnt_t const &, boost::shared_ptr exclude, bool add_to_command); - void ripple_marks (boost::shared_ptr target_playlist, Temporal::timepos_t at, Temporal::timecnt_t const & distance); - void get_markers_to_ripple (boost::shared_ptr target_playlist, Temporal::timepos_t const & pos, std::vector& markers); - Temporal::timepos_t effective_ripple_mark_start (boost::shared_ptr target_playlist, Temporal::timepos_t pos); + void do_ripple (std::shared_ptr, Temporal::timepos_t const &, Temporal::timecnt_t const &, ARDOUR::RegionList* exclude, bool add_to_command); + void do_ripple (std::shared_ptr, Temporal::timepos_t const &, Temporal::timecnt_t const &, std::shared_ptr exclude, bool add_to_command); + void ripple_marks (std::shared_ptr target_playlist, Temporal::timepos_t at, Temporal::timecnt_t const & distance); + void get_markers_to_ripple (std::shared_ptr target_playlist, Temporal::timepos_t const & pos, std::vector& markers); + Temporal::timepos_t effective_ripple_mark_start (std::shared_ptr 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 &, PBD::PropertyID) const; void get_all_equivalent_regions (RegionView* rv, std::vector &) const; RegionSelection get_equivalent_regions (RegionSelection &, PBD::PropertyID) const; - RegionView* regionview_from_region (boost::shared_ptr) const; - RouteTimeAxisView* rtav_from_route (boost::shared_ptr) const; + RegionView* regionview_from_region (std::shared_ptr) const; + RouteTimeAxisView* rtav_from_route (std::shared_ptr) const; void mapover_tracks_with_unique_playlists (sigc::slot sl, TimeAxisView*, PBD::PropertyID) const; void mapover_all_tracks_with_unique_playlists (sigc::slot) const; @@ -819,8 +819,8 @@ private: void mapover_selected_routes (sigc::slot sl) const; void mapover_all_routes (sigc::slot sl) const; - void mapped_select_playlist_matching (RouteUI&, boost::weak_ptr pl); - void mapped_use_new_playlist (RouteUI&, std::string name, std::string gid, bool copy, std::vector > const &); + void mapped_select_playlist_matching (RouteUI&, std::weak_ptr pl); + void mapped_use_new_playlist (RouteUI&, std::string name, std::string gid, bool copy, std::vector > 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); + bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, std::weak_ptr); 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); + void add_region_context_items (Gtk::Menu_Helpers::MenuList&, std::shared_ptr); 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 find_next_region (Temporal::timepos_t const &, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView** = 0); + std::shared_ptr 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 region_boundary_cache; @@ -1231,10 +1231,10 @@ private: std::pair trackview_by_y_position (double, bool trackview_relative_offset = true) const; - AxisView* axis_view_by_stripable (boost::shared_ptr) const; - AxisView* axis_view_by_control (boost::shared_ptr) const; + AxisView* axis_view_by_stripable (std::shared_ptr) const; + AxisView* axis_view_by_control (std::shared_ptr) const; - TimeAxisView* time_axis_view_from_stripable (boost::shared_ptr s) const { + TimeAxisView* time_axis_view_from_stripable (std::shared_ptr s) const { return dynamic_cast (axis_view_by_stripable (s)); } @@ -1263,10 +1263,10 @@ private: samplepos_t cut_buffer_start; samplecnt_t cut_buffer_length; - boost::shared_ptr _press_cursor_ctx; ///< Button press cursor context + std::shared_ptr _press_cursor_ctx; ///< Button press cursor context - boost::weak_ptr _trimmable; - boost::weak_ptr _movable; + std::weak_ptr _trimmable; + std::weak_ptr _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::RegionPoint point, Temporal::timepos_t const & position); - void align_region_internal (boost::shared_ptr, ARDOUR::RegionPoint point, Temporal::timepos_t const & position); + void align_region (std::shared_ptr, ARDOUR::RegionPoint point, Temporal::timepos_t const & position); + void align_region_internal (std::shared_ptr, 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); + void audition_playlist_region_standalone (std::shared_ptr); 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 >&); + void create_region_from_selection (std::vector >&); 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& track, + std::shared_ptr& track, std::string const& pgroup_id, bool replace, bool with_markers, - boost::shared_ptr instrument = boost::shared_ptr()); + std::shared_ptr instrument = std::shared_ptr()); int embed_sndfiles (std::vector paths, bool multiple_files, @@ -1469,9 +1469,9 @@ private: Temporal::timepos_t& pos, int target_regions, int target_tracks, - boost::shared_ptr& track, + std::shared_ptr& track, std::string const& pgroup_id, - boost::shared_ptr instrument = boost::shared_ptr()); + std::shared_ptr instrument = std::shared_ptr()); int add_sources (std::vector paths, ARDOUR::SourceList& sources, @@ -1480,23 +1480,23 @@ private: Editing::ImportMode mode, int target_regions, int target_tracks, - boost::shared_ptr& track, + std::shared_ptr& track, std::string const& pgroup_id, bool add_channel_suffix, - boost::shared_ptr instrument = boost::shared_ptr()); + std::shared_ptr instrument = std::shared_ptr()); - int finish_bringing_in_material (boost::shared_ptr region, + int finish_bringing_in_material (std::shared_ptr region, uint32_t in_chans, uint32_t out_chans, Temporal::timepos_t& pos, Editing::ImportMode mode, - boost::shared_ptr& existing_track, + std::shared_ptr& existing_track, std::string const& new_track_name, std::string const& pgroup_id, - boost::shared_ptr instrument); + std::shared_ptr instrument); - boost::shared_ptr get_nth_selected_audio_track (int nth) const; - boost::shared_ptr get_nth_selected_midi_track (int nth) const; + std::shared_ptr get_nth_selected_audio_track (int nth) const; + std::shared_ptr 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 track; + std::shared_ptr track; bool replace; }; @@ -1669,7 +1669,7 @@ private: void fade_range (); - std::set > motion_frozen_playlists; + std::set > 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); + bool write_region (std::string path, std::shared_ptr); 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 last_audition_region; + std::shared_ptr 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); + void cms_new (std::shared_ptr); 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, boost::shared_ptr, ARDOUR::Route::PluginSetupOptions); + int plugin_setup (std::shared_ptr, std::shared_ptr, ARDOUR::Route::PluginSetupOptions); /* handling cleanup */ - int playlist_deletion_dialog (boost::shared_ptr); + int playlist_deletion_dialog (std::shared_ptr); PBD::ScopedConnectionList session_connections; PBD::ScopedConnection tempo_map_connection; @@ -2513,7 +2513,7 @@ private: } template - Temporal::TimeDomain drag_time_domain (boost::shared_ptr thing_with_time_domain) { + Temporal::TimeDomain drag_time_domain (std::shared_ptr thing_with_time_domain) { return thing_with_time_domain ? thing_with_time_domain->time_domain() : Temporal::AudioTime; } diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index a86686a1df..f7010b098a 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -153,7 +153,7 @@ Editor::session_import_dialog () dialog.run (); } -typedef std::map > SourceMap; +typedef std::map > 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 +std::shared_ptr 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(); + return std::shared_ptr(); } return atv->audio_track(); } -boost::shared_ptr +std::shared_ptr 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(); + return std::shared_ptr(); } return mtv->midi_track(); @@ -342,7 +342,7 @@ Editor::do_import (vector paths, MidiTempoMapDisposition smf_tempo_disposition, timepos_t& pos, ARDOUR::PluginInfoPtr instrument, - boost::shared_ptr track, + std::shared_ptr track, bool with_markers) { vector to_import; @@ -495,7 +495,7 @@ Editor::do_embed (vector paths, ImportMode mode, timepos_t& pos, ARDOUR::PluginInfoPtr instrument, - boost::shared_ptr track) + std::shared_ptr track) { bool check_sample_rate = true; vector to_embed; @@ -580,7 +580,7 @@ Editor::import_sndfiles (vector paths, timepos_t& pos, int target_regions, int target_tracks, - boost::shared_ptr& track, + std::shared_ptr& track, std::string const& pgroup_id, bool replace, bool with_markers, @@ -655,11 +655,11 @@ Editor::embed_sndfiles (vector paths, timepos_t& pos, int target_regions, int target_tracks, - boost::shared_ptr& track, + std::shared_ptr& track, std::string const& pgroup_id, ARDOUR::PluginInfoPtr instrument) { - boost::shared_ptr source; + std::shared_ptr source; SourceList sources; string linked_path; SoundFileInfo finfo; @@ -747,17 +747,17 @@ Editor::embed_sndfiles (vector paths, /* check if we have this thing embedded already */ - boost::shared_ptr s; + std::shared_ptr s; if ((s = _session->audio_source_by_path_and_channel (path, n)) == 0) { - source = boost::dynamic_pointer_cast ( + source = std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, Source::Flag (0), true, true)); } else { - source = boost::dynamic_pointer_cast (s); + source = std::dynamic_pointer_cast (s); } sources.push_back(source); @@ -787,12 +787,12 @@ Editor::add_sources (vector paths, ImportMode mode, int target_regions, int target_tracks, - boost::shared_ptr& track, + std::shared_ptr& track, std::string const& pgroup_id, bool /*add_channel_suffix*/, ARDOUR::PluginInfoPtr instrument) { - vector > regions; + vector > regions; string region_name; uint32_t input_chan = 0; uint32_t output_chan = 0; @@ -828,10 +828,10 @@ Editor::add_sources (vector paths, plist.add (ARDOUR::Properties::external, true); plist.add (ARDOUR::Properties::opaque, true); - boost::shared_ptr r = RegionFactory::create (sources, plist); + std::shared_ptr r = RegionFactory::create (sources, plist); - if (boost::dynamic_pointer_cast(r)) { - boost::dynamic_pointer_cast(r)->special_set_position(sources[0]->natural_position()); + if (std::dynamic_pointer_cast(r)) { + std::dynamic_pointer_cast(r)->special_set_position(sources[0]->natural_position()); } regions.push_back (r); @@ -855,7 +855,7 @@ Editor::add_sources (vector paths, just_one.clear (); just_one.push_back (*x); - boost::shared_ptr fs = boost::dynamic_pointer_cast (*x); + std::shared_ptr fs = std::dynamic_pointer_cast (*x); if (sources.size() > 1 && disposition == ImportDistinctChannels) { @@ -922,10 +922,10 @@ Editor::add_sources (vector paths, plist.add (ARDOUR::Properties::external, true); plist.add (ARDOUR::Properties::opaque, true); - boost::shared_ptr r = RegionFactory::create (just_one, plist); + std::shared_ptr r = RegionFactory::create (just_one, plist); - if (boost::dynamic_pointer_cast(r)) { - boost::dynamic_pointer_cast(r)->special_set_position((*x)->natural_position()); + if (std::dynamic_pointer_cast(r)) { + std::dynamic_pointer_cast(r)->special_set_position((*x)->natural_position()); } regions.push_back (r); @@ -966,16 +966,16 @@ Editor::add_sources (vector paths, */ assert (regions.size() == track_names.size()); - for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { - boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); + for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + std::shared_ptr ar = std::dynamic_pointer_cast (*r); if (use_timestamp) { if (ar) { /* get timestamp for this region */ - const boost::shared_ptr s (ar->sources().front()); - const boost::shared_ptr as = boost::dynamic_pointer_cast (s); + const std::shared_ptr s (ar->sources().front()); + const std::shared_ptr as = std::dynamic_pointer_cast (s); assert (as); @@ -1024,18 +1024,18 @@ Editor::add_sources (vector paths, } int -Editor::finish_bringing_in_material (boost::shared_ptr region, +Editor::finish_bringing_in_material (std::shared_ptr region, uint32_t in_chans, uint32_t out_chans, timepos_t& pos, ImportMode mode, - boost::shared_ptr& existing_track, + std::shared_ptr& existing_track, string const& new_track_name, string const& pgroup_id, ARDOUR::PluginInfoPtr instrument) { - boost::shared_ptr ar = boost::dynamic_pointer_cast(region); - boost::shared_ptr mr = boost::dynamic_pointer_cast(region); + std::shared_ptr ar = std::dynamic_pointer_cast(region); + std::shared_ptr mr = std::dynamic_pointer_cast(region); switch (mode) { case ImportAsRegion: @@ -1057,8 +1057,8 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, } } - boost::shared_ptr playlist = existing_track->playlist(); - boost::shared_ptr copy (RegionFactory::create (region, region->properties())); + std::shared_ptr playlist = existing_track->playlist(); + std::shared_ptr 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, { if (!existing_track) { if (ar) { - list > at ( + list > 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, if (at.empty()) { return -1; } - for (list >::iterator i = at.begin(); i != at.end(); ++i) { + for (list >::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, existing_track = at.front(); } else if (mr) { - list > mt ( + list > 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, return -1; } - for (list >::iterator i = mt.begin(); i != mt.end(); ++i) { + for (list >::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, } if (mode == ImportAsTrigger) { - boost::shared_ptr copy (RegionFactory::create (region, true)); + std::shared_ptr 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, } } } else { - boost::shared_ptr playlist = existing_track->playlist(); + std::shared_ptr playlist = existing_track->playlist(); playlist->clear_changes (); playlist->add_region (region, pos); _session->add_command (new StatefulDiffCommand (playlist)); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 0ed5021b6d..2bfecea509 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -455,13 +455,13 @@ Editor::drop_paths_part_two (const vector& paths, timepos_t const & p, d if (tv->track()) { do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, - SrcBest, SMFTrackNumber, SMFTempoIgnore, pos, boost::shared_ptr(), tv->track ()); + SrcBest, SMFTrackNumber, SMFTempoIgnore, pos, std::shared_ptr(), 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(), tv->track ()); + SrcBest, SMFTrackName, SMFTempoIgnore, pos, std::shared_ptr(), tv->track ()); } else { - do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, pos, boost::shared_ptr(), tv->track ()); + do_embed (audio_paths, Editing::ImportSerializeFiles, ImportToTrack, pos, std::shared_ptr(), 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 rl = _session->get_routes(); + std::shared_ptr rl = _session->get_routes(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*r); + std::shared_ptr tr = std::dynamic_pointer_cast (*r); if (!tr) { continue; diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 60fba2eed2..c305ab4a28 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -647,7 +647,7 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item, } struct DescendingRegionLayerSorter { - bool operator()(boost::shared_ptr a, boost::shared_ptr b) { + bool operator()(std::shared_ptr a, std::shared_ptr 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 const& context, int x, int y, guint time) { - boost::shared_ptr region; - boost::shared_ptr region_copy; + std::shared_ptr region; + std::shared_ptr region_copy; RouteTimeAxisView* rtav; GdkEvent event; double px; @@ -1250,7 +1250,7 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, samplepos_t const pos = window_event_sample (&event, &px, &py); PBD::ID rid (data.get_data_as_string ()); - boost::shared_ptr region = RegionFactory::region_by_id (rid); + std::shared_ptr region = RegionFactory::region_by_id (rid); if (!region) { return; } @@ -1261,20 +1261,20 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, rtav = dynamic_cast (tv.first); } else { try { - if (boost::dynamic_pointer_cast (region)) { + if (std::dynamic_pointer_cast (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 > audio_tracks; + list > audio_tracks; audio_tracks = session()->new_audio_track (region->sources().size(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); rtav = dynamic_cast (time_axis_view_from_stripable (audio_tracks.front())); - } else if (boost::dynamic_pointer_cast (region)) { + } else if (std::dynamic_pointer_cast (region)) { ChanCount one_midi_port (DataType::MIDI, 1); - list > midi_tracks; + list > midi_tracks; midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, Config->get_strict_io () || Profile->get_mixbus (), - boost::shared_ptr(), + std::shared_ptr(), (ARDOUR::Plugin::PresetRecord*) 0, (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true); rtav = dynamic_cast (time_axis_view_from_stripable (midi_tracks.front())); @@ -1288,10 +1288,10 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, } if (rtav != 0 && rtav->is_track ()) { - boost::shared_ptr region_copy = RegionFactory::create (region, true); + std::shared_ptr region_copy = RegionFactory::create (region, true); - if ((boost::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0) || - (boost::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0)) { + if ((std::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0) || + (std::dynamic_pointer_cast (region_copy) != 0 && dynamic_cast (rtav) != 0)) { _drags->set (new RegionInsertDrag (this, region_copy, rtav, timepos_t (pos), drag_time_domain (region_copy.get())), &event); _drags->end_grab (&event); } diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 24edc85879..c3da90b8e7 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -587,7 +587,7 @@ Drag::show_view_preview (timepos_t const & pos) } } -boost::shared_ptr +std::shared_ptr 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(); + return std::shared_ptr(); } struct TimeAxisViewStripableSorter { bool operator() (TimeAxisView* tav_a, TimeAxisView* tav_b) { - boost::shared_ptr const& a = tav_a->stripable (); - boost::shared_ptr const& b = tav_b->stripable (); + std::shared_ptr const& a = tav_a->stripable (); + std::shared_ptr 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, double> PlaylistDropzoneMap; + typedef map, 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(rv); MidiRegionView* mrv = dynamic_cast(rv); - const boost::shared_ptr original = rv->region(); - boost::shared_ptr region_copy; + const std::shared_ptr original = rv->region(); + std::shared_ptr 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_copy - = boost::dynamic_pointer_cast(region_copy); + std::shared_ptr audioregion_copy + = std::dynamic_pointer_cast(region_copy); nrv = new AudioRegionView (*arv, audioregion_copy); } else if (mrv) { - boost::shared_ptr midiregion_copy - = boost::dynamic_pointer_cast(region_copy); + std::shared_ptr midiregion_copy + = std::dynamic_pointer_cast(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, TimeAxisView* original) +RegionMoveDrag::create_destination_time_axis (std::shared_ptr 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, */ TimeAxisView* tav = 0; try { - if (boost::dynamic_pointer_cast (region)) { - list > audio_tracks; + if (std::dynamic_pointer_cast (region)) { + list > 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, tav =_editor->time_axis_view_from_stripable (audio_tracks.front()); } else { ChanCount one_midi_port (DataType::MIDI, 1); - list > midi_tracks; + list > 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(), + std::shared_ptr(), (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, RouteTimeAxisView*> PlaylistMapping; + typedef map, 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, RouteTimeAxisView*> PlaylistMapping; + typedef map, 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 > uniq; + std::set > uniq; for (list::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 = dest_rtv->playlist(); + std::shared_ptr 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 >::iterator p = frozen_playlists.begin(); p != frozen_playlists.end(); ++p) { + for (set >::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, - boost::shared_ptr playlist, + std::shared_ptr region, + std::shared_ptr playlist, PlaylistSet& modified_playlists ) { - pair >::iterator, bool> r = modified_playlists.insert (playlist); + pair >::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, + std::shared_ptr region, RouteTimeAxisView* dest_rtv, layer_t dest_layer, timepos_t const & where, PlaylistSet& modified_playlists ) { - boost::shared_ptr dest_playlist = dest_rtv->playlist (); + std::shared_ptr 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 r, RouteTimeAxisView* v, timepos_t const & pos, Temporal::TimeDomain td) +RegionInsertDrag::RegionInsertDrag (Editor* e, std::shared_ptr r, RouteTimeAxisView* v, timepos_t const & pos, Temporal::TimeDomain td) : RegionMotionDrag (e, 0, 0, list (), td) { DEBUG_TRACE (DEBUG::Drags, "New RegionInsertDrag\n"); - assert ((boost::dynamic_pointer_cast (r) && dynamic_cast (v)) || - (boost::dynamic_pointer_cast (r) && dynamic_cast (v))); + assert ((std::dynamic_pointer_cast (r) && dynamic_cast (v)) || + (std::dynamic_pointer_cast (r) && dynamic_cast (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 = dest_rtv->playlist(); + std::shared_ptr 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 >::iterator,bool> insert_result; + pair >::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 pl = rv->region()->playlist(); + std::shared_ptr 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 (rv); /* a MRV start trim may change the source length. ensure we cover all playlists here */ if (mrv && _operation == StartTrim) { - vector > all_playlists; + vector > all_playlists; _editor->session()->playlists()->get (all_playlists); - for (vector >::iterator x = all_playlists.begin(); x != all_playlists.end(); ++x) { + for (vector >::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::const_iterator i = _views.begin(); i != _views.end(); ++i) { AudioRegionView* arv = dynamic_cast (i->view); if (!arv) continue; - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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::const_iterator i = _views.begin(); i != _views.end(); ++i) { AudioRegionView* arv = dynamic_cast (i->view); if (!arv) continue; - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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 (i->view); if (arv) { - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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 (i->view); if (arv) { - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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 (i->view); if (arv) { - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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 (i->view); if (arv) { - boost::shared_ptr ar (arv->audio_region()); + std::shared_ptr 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 >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) { + for (set >::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 (_primary); - boost::shared_ptr const r = arv->audio_region (); + std::shared_ptr 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 (_primary); - boost::shared_ptr const r = arv->audio_region (); + std::shared_ptr 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 region = boost::dynamic_pointer_cast (_primary->region ()); + std::shared_ptr region = std::dynamic_pointer_cast (_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 region = boost::dynamic_pointer_cast (_primary->region ()); + std::shared_ptr region = std::dynamic_pointer_cast (_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 alist = tmp->audio_region()->fade_in(); + std::shared_ptr 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 (_primary); - boost::shared_ptr r = arv->audio_region (); + std::shared_ptr 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 (_primary); - boost::shared_ptr r = arv->audio_region (); + std::shared_ptr 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 region = boost::dynamic_pointer_cast (_primary->region ()); + std::shared_ptr region = std::dynamic_pointer_cast (_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 region = boost::dynamic_pointer_cast (_primary->region ()); + std::shared_ptr region = std::dynamic_pointer_cast (_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 alist = tmp->audio_region()->fade_out(); + std::shared_ptr 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 cons { DEBUG_TRACE (DEBUG::Drags, "New AutomationRangeDrag\n"); - list > lines; + list > lines; for (list::const_iterator i = v.begin(); i != v.end(); ++i) { if (AudioRegionView* audio_view = dynamic_cast(*i)) { @@ -6317,12 +6317,12 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, list cons * @param offset Offset from the session start to the points in the AutomationLines. */ void -AutomationRangeDrag::setup (list > const & lines) +AutomationRangeDrag::setup (list > const & lines) { /* find the lines that overlap the ranges being dragged */ - list >::const_iterator i = lines.begin (); + list >::const_iterator i = lines.begin (); while (i != lines.end ()) { - list >::const_iterator j = i; + list >::const_iterator j = i; ++j; pair r = (*i)->get_point_x_range (); @@ -6367,7 +6367,7 @@ AutomationRangeDrag::y_fraction (double global_y) const } double -AutomationRangeDrag::value (boost::shared_ptr list, timepos_t const & x) const +AutomationRangeDrag::value (std::shared_ptr 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 the_list = j->line->the_list (); + std::shared_ptr 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 the_list = j->line->the_list (); + std::shared_ptr 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 r = _region_view->region (); + std::shared_ptr 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 r (_region_view->region ()); + std::shared_ptr 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_view->region (); + std::shared_ptr 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 mr = _region_view->midi_region(); + std::shared_ptr 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 ar (arv->audio_region()); + std::shared_ptr 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 ar (arv->audio_region()); + std::shared_ptr ar (arv->audio_region()); if (start) { distance = _drags->current_pointer_x() - grab_x(); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index f2308c17f6..baa69a6b50 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -296,7 +296,7 @@ protected: /* sets snap delta from unsnapped pos */ void setup_snap_delta (Temporal::timepos_t const & pos); - boost::shared_ptr add_midi_region (MidiTimeAxisView*, bool commit); + std::shared_ptr 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 initial_playlist; + std::shared_ptr initial_playlist; TimeAxisView* initial_time_axis_view; }; @@ -393,7 +393,7 @@ protected: friend class DraggingView; protected: - typedef std::set > PlaylistSet; + typedef std::set > PlaylistSet; void add_stateful_diff_commands_for_playlists (PlaylistSet const &); private: @@ -511,7 +511,7 @@ private: ); RegionView* insert_region_into_playlist ( - boost::shared_ptr, + std::shared_ptr, RouteTimeAxisView*, ARDOUR::layer_t, Temporal::timepos_t const &, @@ -519,14 +519,14 @@ private: ); void remove_region_from_playlist ( - boost::shared_ptr, - boost::shared_ptr, + std::shared_ptr, + std::shared_ptr, PlaylistSet& modified_playlists ); void collect_new_region_view (RegionView *); - RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr, TimeAxisView* original); + RouteTimeAxisView* create_destination_time_axis (std::shared_ptr, TimeAxisView* original); bool _copy; RegionView* _new_region_view; @@ -536,7 +536,7 @@ private: class RegionInsertDrag : public RegionMotionDrag { public: - RegionInsertDrag (Editor *, boost::shared_ptr, RouteTimeAxisView*, Temporal::timepos_t const &, Temporal::TimeDomain); + RegionInsertDrag (Editor *, std::shared_ptr, 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 _region; + std::shared_ptr _region; }; /** Drags to resize MIDI notes */ @@ -1401,15 +1401,15 @@ public: } private: - void setup (std::list > const &); + void setup (std::list > const &); double y_fraction (double global_y_position) const; - double value (boost::shared_ptr list, Temporal::timepos_t const & x) const; + double value (std::shared_ptr list, Temporal::timepos_t const & x) const; std::list _ranges; /** A line that is part of the drag */ struct Line { - boost::shared_ptr line; ///< the line + std::shared_ptr line; ///< the line std::list points; ///< points to drag on the line std::pair range; ///< the range of all points on the line, in session time XMLNode* state; ///< the XML state node before the drag diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 54356a94b6..9301e7ffe6 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -202,7 +202,7 @@ Editor::export_range () } bool -Editor::process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr midi_region) +Editor::process_midi_export_dialog (MidiExportDialog& dialog, std::shared_ptr midi_region) { string path = dialog.get_path (); @@ -233,9 +233,9 @@ Editor::export_region () return; } - boost::shared_ptr r = selection->regions.front()->region(); - boost::shared_ptr audio_region = boost::dynamic_pointer_cast(r); - boost::shared_ptr midi_region = boost::dynamic_pointer_cast(r); + std::shared_ptr r = selection->regions.front()->region(); + std::shared_ptr audio_region = std::dynamic_pointer_cast(r); + std::shared_ptr midi_region = std::dynamic_pointer_cast(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> route_set; + std::set> route_set; for (auto const& i: selection->regions) { RouteTimeAxisView* rtv = dynamic_cast(&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 (selection->regions.front()->region ()); + std::shared_ptr 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 ((*i)->region()); + std::shared_ptr region ((*i)->region()); RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); - boost::shared_ptr track = boost::dynamic_pointer_cast (rtv->route()); + std::shared_ptr track = std::dynamic_pointer_cast (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 ((*i)->region()); + std::shared_ptr region ((*i)->region()); RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); - boost::shared_ptr track = boost::dynamic_pointer_cast (rtv->route()); + std::shared_ptr track = std::dynamic_pointer_cast (rtv->route()); InterThreadInfo itt; @@ -434,12 +434,12 @@ Editor::bounce_region_selection (bool with_processing) name = bounce_name; } - boost::shared_ptr r; + std::shared_ptr 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(), false, name); + r = track->bounce_range (region->position_sample(), region->position_sample() + region->length_samples(), itt, std::shared_ptr(), 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 state (new Trigger::UIState()); + std::shared_ptr 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 region) +Editor::write_region (string path, std::shared_ptr region) { - boost::shared_ptr fs; + std::shared_ptr 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 region) samplepos_t pos; char s[PATH_MAX+1]; uint32_t cnt; - vector > sources; + vector > 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 region) try { - fs = boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate())); + fs = std::dynamic_pointer_cast (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 region) this_time = min (to_read, chunk_size); uint32_t chn = 0; - for (vector >::iterator src=sources.begin(); src != sources.end(); ++src, ++chn) { + for (vector >::iterator src=sources.begin(); src != sources.end(); ++src, ++chn) { fs = (*src); @@ -563,7 +563,7 @@ Editor::write_region (string path, boost::shared_ptr region) time (&tnow); now = localtime (&tnow); - for (vector >::iterator src = sources.begin(); src != sources.end(); ++src) { + for (vector >::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 region) error_out: - for (vector >::iterator i = sources.begin(); i != sources.end(); ++i) { + for (vector >::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 playlist = boost::dynamic_pointer_cast(atv->track()->playlist()); + std::shared_ptr playlist = std::dynamic_pointer_cast(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& range) { - boost::shared_ptr fs; + std::shared_ptr 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 > sources; + vector > 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 (SourceFactory::createWritable (DataType::AUDIO, *_session, path, _session->sample_rate())); + fs = std::dynamic_pointer_cast (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 >::iterator s = sources.begin(); s != sources.end(); ++s) { + for (vector >::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 >::iterator i = sources.begin(); i != sources.end(); ++i) { + for (vector >::iterator i = sources.begin(); i != sources.end(); ++i) { (*i)->mark_for_remove (); } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index f097038a44..d2f3377420 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -534,7 +534,7 @@ Editor::LocationMarkers::~LocationMarkers () } void -Editor::get_markers_to_ripple (boost::shared_ptr target_playlist, timepos_t const & pos, std::vector& markers) +Editor::get_markers_to_ripple (std::shared_ptr target_playlist, timepos_t const & pos, std::vector& markers) { const timepos_t ripple_start = effective_ripple_mark_start (target_playlist, pos); diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 21196934c1..c99a819683 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -82,7 +82,7 @@ Editor::editor_list_button_toggled () void Editor::show_editor_mixer (bool yn) { - boost::shared_ptr r; + std::shared_ptr 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 stripable; + std::shared_ptr stripable; AutomationTimeAxisView* atv; if ((atv = dynamic_cast(&view)) != 0) { @@ -238,7 +238,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view) create_editor_mixer (); } - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr route = std::dynamic_pointer_cast (stripable); if (current_mixer_strip->route() == route) { return; } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index b456619c1a..e1c9c40dd4 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -211,9 +211,9 @@ Editor::canvas_event_sample (GdkEvent const * event, double* pcx, double* pcy) c } void -Editor::set_current_trimmable (boost::shared_ptr t) +Editor::set_current_trimmable (std::shared_ptr t) { - boost::shared_ptr st = _trimmable.lock(); + std::shared_ptr st = _trimmable.lock(); if (!st || st == t) { _trimmable = t; @@ -221,9 +221,9 @@ Editor::set_current_trimmable (boost::shared_ptr t) } void -Editor::set_current_movable (boost::shared_ptr m) +Editor::set_current_movable (std::shared_ptr m) { - boost::shared_ptr sm = _movable.lock(); + std::shared_ptr 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 (parent); assert (p); - boost::shared_ptr pl = p->track()->playlist (); + std::shared_ptr 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 prev = pl->find_next_region (t, End, -1); + std::shared_ptr 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; + std::shared_ptr playlist; if ((tatv = dynamic_cast (*i)) == 0) { continue; } if ((playlist = (*i)->playlist()) == 0) { continue; } - if (boost::dynamic_pointer_cast (playlist) == 0) { + if (std::dynamic_pointer_cast (playlist) == 0) { continue; } for (list::const_iterator j = selection->time.begin(); j != selection->time.end(); ++j) { - boost::shared_ptr rl = playlist->regions_touched (j->start(), j->end()); + std::shared_ptr 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 = rtv->playlist(); + std::shared_ptr playlist = rtv->playlist(); playlist->clear_changes (); - boost::shared_ptr new_region (RegionFactory::create (rv->region(), true)); + std::shared_ptr 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 > new_regions; + vector > 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 (new_regions.front()); + std::shared_ptr 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 = clicked_axisview->playlist(); + std::shared_ptr playlist = clicked_axisview->playlist(); playlist->clear_changes (); clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start()); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a13048b161..9f7f469d06 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -200,7 +200,7 @@ Editor::split_regions_at (timepos_t const & where, RegionSelection& regions) { bool frozen = false; - list > used_playlists; + list > used_playlists; list used_trackviews; if (regions.empty()) { @@ -234,7 +234,7 @@ Editor::split_regions_at (timepos_t const & where, RegionSelection& regions) tmp = a; ++tmp; - boost::shared_ptr pl = (*a)->region()->playlist(); + std::shared_ptr pl = (*a)->region()->playlist(); if (!pl) { a = tmp; @@ -274,7 +274,7 @@ Editor::split_regions_at (timepos_t const & where, RegionSelection& regions) } while (used_playlists.size() > 0) { - list >::iterator i = used_playlists.begin(); + list >::iterator i = used_playlists.begin(); (*i)->thaw(); used_playlists.pop_front(); } @@ -420,7 +420,7 @@ Editor::nudge_forward (bool next, bool force_playhead) begin_reversible_command (_("nudge regions forward")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); distance = get_nudge_distance (r->position(), next_distance); @@ -508,7 +508,7 @@ Editor::nudge_backward (bool next, bool force_playhead) begin_reversible_command (_("nudge regions backward")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); distance = get_nudge_distance (r->position(), next_distance); @@ -603,7 +603,7 @@ Editor::nudge_forward_capture_offset () samplepos_t const distance = _session->worst_output_latency(); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); r->clear_changes (); r->set_position (r->position() + timecnt_t (distance)); @@ -627,7 +627,7 @@ Editor::nudge_backward_capture_offset () timepos_t const distance (_session->worst_output_latency()); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); r->clear_changes (); @@ -668,7 +668,7 @@ Editor::sequence_regions () bool in_command = false; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); r->clear_changes(); @@ -731,7 +731,7 @@ Editor::build_region_boundary_cache () timepos_t pos; vector interesting_points; - boost::shared_ptr r; + std::shared_ptr r; TrackViewList tracks; bool at_end = false; @@ -770,7 +770,7 @@ Editor::build_region_boundary_cache () if (maybe_first_sample) { TrackViewList::const_iterator i; for (i = tlist.begin(); i != tlist.end(); ++i) { - boost::shared_ptr pl = (*i)->playlist(); + std::shared_ptr pl = (*i)->playlist(); if (pl && pl->count_regions_at (timepos_t())) { region_boundary_cache.push_back (timepos_t()); break; @@ -852,12 +852,12 @@ Editor::build_region_boundary_cache () _region_boundary_cache_dirty = false; } -boost::shared_ptr +std::shared_ptr Editor::find_next_region (timepos_t const & pos, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) { TrackViewList::iterator i; timecnt_t closest = timecnt_t::max (pos.time_domain()); - boost::shared_ptr ret; + std::shared_ptr ret; timepos_t rpos; timepos_t track_pos; @@ -865,7 +865,7 @@ Editor::find_next_region (timepos_t const & pos, RegionPoint point, int32_t dir, for (i = tracks.begin(); i != tracks.end(); ++i) { timecnt_t distance; - boost::shared_ptr r; + std::shared_ptr r; track_pos = pos; @@ -1014,7 +1014,7 @@ Editor::cursor_to_previous_region_boundary (bool with_selection) void Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir) { - boost::shared_ptr r; + std::shared_ptr r; timepos_t pos (cursor->current_sample ()); if (!_session) { @@ -1206,7 +1206,7 @@ Editor::selected_marker_to_previous_region_boundary (bool with_selection) void Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) { - boost::shared_ptr r; + std::shared_ptr r; timepos_t pos; Location* loc; bool ignored; @@ -2425,7 +2425,7 @@ Editor::add_locations_from_region () for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) { - boost::shared_ptr region = (*i)->region (); + std::shared_ptr region = (*i)->region (); Location *location = new Location (*_session, region->position(), region->end(), region->name(), Location::IsRangeMarker); @@ -2459,7 +2459,7 @@ Editor::add_location_from_region () _session->locations()->next_available_name(markername, "regions"); } else { RegionView* rv = *(rs.begin()); - boost::shared_ptr region = rv->region(); + std::shared_ptr region = rv->region(); markername = region->name(); } @@ -2661,7 +2661,7 @@ void Editor::insert_source_list_selection (float times) { RouteTimeAxisView *tv = 0; - boost::shared_ptr playlist; + std::shared_ptr playlist; if (clicked_routeview != 0) { tv = clicked_routeview; @@ -2681,7 +2681,7 @@ Editor::insert_source_list_selection (float times) return; } - boost::shared_ptr region = _sources->get_single_selection (); + std::shared_ptr region = _sources->get_single_selection (); if (region == 0) { return; } @@ -2693,7 +2693,7 @@ Editor::insert_source_list_selection (float times) playlist->add_region ((RegionFactory::create (region, true)), get_preferred_edit_position(), times, RecNonLayered == _session->config.get_record_mode()); //ToDo: insert_mode ? if (should_ripple()) { - do_ripple (playlist, get_preferred_edit_position(), region->length().scale (times), boost::shared_ptr(), true); + do_ripple (playlist, get_preferred_edit_position(), region->length().scale (times), std::shared_ptr(), true); } else { playlist->rdiff_and_add_command (_session); } @@ -2940,13 +2940,13 @@ Editor::do_layer_operation (LayerOperation op) break; } - set > playlists = selection->regions.playlists (); - for (set >::iterator i = playlists.begin(); i != playlists.end(); ++i) { + set > playlists = selection->regions.playlists (); + for (set >::iterator i = playlists.begin(); i != playlists.end(); ++i) { (*i)->clear_owned_changes (); } for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - boost::shared_ptr r = (*i)->region (); + std::shared_ptr r = (*i)->region (); switch (op) { case Raise: r->raise (); @@ -2962,7 +2962,7 @@ Editor::do_layer_operation (LayerOperation op) } } - for (set >::iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (set >::iterator i = playlists.begin(); i != playlists.end(); ++i) { vector cmds; (*i)->rdiff (cmds); _session->add_commands (cmds); @@ -3100,7 +3100,7 @@ Editor::play_selected_region () } void -Editor::audition_playlist_region_standalone (boost::shared_ptr region) +Editor::audition_playlist_region_standalone (std::shared_ptr region) { _session->audition_region (region); } @@ -3124,8 +3124,8 @@ Editor::region_from_selection () timecnt_t selection_cnt = start.distance (end); for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) { - boost::shared_ptr current; - boost::shared_ptr pl; + std::shared_ptr current; + std::shared_ptr pl; timecnt_t internal_start; string new_name; @@ -3147,12 +3147,12 @@ Editor::region_from_selection () plist.add (ARDOUR::Properties::name, new_name); plist.add (ARDOUR::Properties::layer, 0); - boost::shared_ptr region (RegionFactory::create (current, plist)); + std::shared_ptr region (RegionFactory::create (current, plist)); } } void -Editor::create_region_from_selection (vector >& new_regions) +Editor::create_region_from_selection (vector >& new_regions) { if (selection->time.empty() || selection->tracks.empty()) { return; @@ -3171,8 +3171,8 @@ Editor::create_region_from_selection (vector >& new_re sort_track_selection (ts); for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) { - boost::shared_ptr current; - boost::shared_ptr playlist; + std::shared_ptr current; + std::shared_ptr playlist; timecnt_t internal_start; string new_name; @@ -3206,7 +3206,7 @@ Editor::split_multichannel_region () return; } - vector< boost::shared_ptr > v; + vector< std::shared_ptr > v; for (list::iterator x = rs.begin(); x != rs.end(); ++x) { (*x)->region()->separate_by_channel (v); @@ -3273,7 +3273,7 @@ void Editor::separate_regions_between (const TimeSelection& ts) { bool in_command = false; - boost::shared_ptr playlist; + std::shared_ptr playlist; RegionSelection new_selection; TrackViewList tmptracks = get_tracks_for_range_action (); @@ -3354,7 +3354,7 @@ Editor::separate_regions_between (const TimeSelection& ts) } struct PlaylistState { - boost::shared_ptr playlist; + std::shared_ptr playlist; XMLNode* before; }; @@ -3439,7 +3439,7 @@ Editor::separate_under_selected_regions () begin_reversible_command (_("separate region under")); - list > regions_to_remove; + list > regions_to_remove; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { // we can't just remove the region(s) in this loop because @@ -3454,9 +3454,9 @@ Editor::separate_under_selected_regions () regions_to_remove.push_back ((*i)->region()); } - for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { + for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { - boost::shared_ptr playlist = (*rl)->playlist(); + std::shared_ptr playlist = (*rl)->playlist(); if (!playlist) { // is this check necessary? @@ -3517,8 +3517,8 @@ Editor::crop_region_to_selection () void Editor::crop_region_to (timepos_t const & start, timepos_t const & end) { - vector > playlists; - boost::shared_ptr playlist; + vector > playlists; + std::shared_ptr playlist; TrackViewList ts; if (selection->tracks.empty()) { @@ -3537,7 +3537,7 @@ Editor::crop_region_to (timepos_t const & start, timepos_t const & end) continue; } - boost::shared_ptr t = rtv->track(); + std::shared_ptr t = rtv->track(); if (t) { if ((playlist = rtv->playlist()) != 0) { @@ -3550,11 +3550,11 @@ Editor::crop_region_to (timepos_t const & start, timepos_t const & end) return; } - for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { - boost::shared_ptr regions_at_start = (*i)->regions_at(start); + std::shared_ptr regions_at_start = (*i)->regions_at(start); for (RegionList::const_iterator r = regions_at_start->begin(); r != regions_at_start->end(); ++r) { - boost::shared_ptr ar = boost::dynamic_pointer_cast(*r); + std::shared_ptr ar = std::dynamic_pointer_cast(*r); if (ar) { //if we cut an audio region during the fade, keep the fade handle at the same spot ar->playlist()->clear_owned_changes (); @@ -3574,9 +3574,9 @@ Editor::crop_region_to (timepos_t const & start, timepos_t const & end) _session->add_command (new StatefulDiffCommand (*r)); } - boost::shared_ptr regions_at_end = (*i)->regions_at(end); + std::shared_ptr regions_at_end = (*i)->regions_at(end); for (RegionList::const_iterator r = regions_at_end->begin(); r != regions_at_end->end(); ++r) { - boost::shared_ptr ar = boost::dynamic_pointer_cast(*r); + std::shared_ptr ar = std::dynamic_pointer_cast(*r); if (ar) { //if we cut an audio region during the fade, keep the fade handle at the same spot ar->playlist()->clear_owned_changes (); @@ -3602,7 +3602,7 @@ Editor::crop_region_to (timepos_t const & start, timepos_t const & end) void Editor::region_fill_track () { - boost::shared_ptr playlist; + std::shared_ptr playlist; RegionSelection regions = get_regions_from_selection_and_entered (); RegionSelection foo; @@ -3622,7 +3622,7 @@ Editor::region_fill_track () for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); TimeAxisView& tv = (*i)->get_time_axis_view(); RouteTimeAxisView* rtv = dynamic_cast (&tv); @@ -3668,7 +3668,7 @@ Editor::set_sync_point (timepos_t const & where, const RegionSelection& rs) continue; } - boost::shared_ptr region ((*r)->region()); + std::shared_ptr region ((*r)->region()); if (!in_command) { begin_reversible_command (_("set sync point")); @@ -3775,7 +3775,7 @@ Editor::align_regions_relative (RegionPoint point) list sorted; rs.by_position (sorted); - boost::shared_ptr r ((*sorted.begin())->region()); + std::shared_ptr r ((*sorted.begin())->region()); switch (point) { case Start: @@ -3828,7 +3828,7 @@ Editor::align_regions_relative (RegionPoint point) for (list::iterator i = sorted.begin(); i != sorted.end(); ++i) { - boost::shared_ptr region ((*i)->region()); + std::shared_ptr region ((*i)->region()); region->clear_changes (); @@ -3846,7 +3846,7 @@ Editor::align_regions_relative (RegionPoint point) } void -Editor::align_region (boost::shared_ptr region, RegionPoint point, timepos_t const & position) +Editor::align_region (std::shared_ptr region, RegionPoint point, timepos_t const & position) { begin_reversible_command (_("align region")); align_region_internal (region, point, position); @@ -3854,7 +3854,7 @@ Editor::align_region (boost::shared_ptr region, RegionPoint point, timep } void -Editor::align_region_internal (boost::shared_ptr region, RegionPoint point, timepos_t const & position) +Editor::align_region_internal (std::shared_ptr region, RegionPoint point, timepos_t const & position) { region->clear_changes (); @@ -3998,7 +3998,7 @@ Editor::trim_to_region(bool forward) RegionSelection rs = get_regions_from_selection_and_entered (); bool in_command = false; - boost::shared_ptr next_region; + std::shared_ptr next_region; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { @@ -4014,8 +4014,8 @@ Editor::trim_to_region(bool forward) continue; } - boost::shared_ptr region = arv->region(); - boost::shared_ptr playlist (region->playlist()); + std::shared_ptr region = arv->region(); + std::shared_ptr playlist (region->playlist()); region->clear_changes (); @@ -4288,9 +4288,9 @@ Editor::bounce_range_selection (BounceTarget target, bool with_processing) if (copy_to_trigger) { for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - boost::shared_ptr region ((*i)->region()); + std::shared_ptr region ((*i)->region()); RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); - boost::shared_ptr track = boost::dynamic_pointer_cast (rtv->route()); + std::shared_ptr track = std::dynamic_pointer_cast (rtv->route()); if (!track) { continue; } @@ -4325,7 +4325,7 @@ Editor::bounce_range_selection (BounceTarget target, bool with_processing) continue; } - boost::shared_ptr playlist; + std::shared_ptr playlist; if ((playlist = rtv->playlist()) == 0) { continue; @@ -4336,14 +4336,14 @@ Editor::bounce_range_selection (BounceTarget target, bool with_processing) playlist->clear_changes (); playlist->clear_owned_changes (); - boost::shared_ptr r; + std::shared_ptr r; /*make the "source" (whole-file region)*/ /*note: bounce_range() will append the playlist name to the resulting region and filename*/ if (with_processing) { r = rtv->track()->bounce_range (start.samples(), (start+cnt).samples(), itt, rtv->track()->main_outs(), false, bounce_name); } else { - r = rtv->track()->bounce_range (start.samples(), (start+cnt).samples(), itt, boost::shared_ptr(), false, bounce_name); + r = rtv->track()->bounce_range (start.samples(), (start+cnt).samples(), itt, std::shared_ptr(), false, bounce_name); } if (!r) { @@ -4369,12 +4369,12 @@ Editor::bounce_range_selection (BounceTarget target, bool with_processing) /*we don't add the whole_file region here; we insert a discrete copy*/ PropertyList plist; plist.add (ARDOUR::Properties::whole_file, false); - boost::shared_ptr copy (RegionFactory::create (r, plist)); + std::shared_ptr copy (RegionFactory::create (r, plist)); playlist->add_region (copy, start); } if (copy_to_trigger) { - boost::shared_ptr state (new Trigger::UIState()); + std::shared_ptr state (new Trigger::UIState()); state->name = bounce_name; state->tempo = tempo; rtv->track ()->triggerbox ()->enqueue_trigger_state_for_region(r, state); @@ -4555,7 +4555,7 @@ struct AutomationRecord { XMLNode* state; ///< state before any operation const AutomationLine* line; ///< line this came from - boost::shared_ptr copy; ///< copied events for the cut buffer + std::shared_ptr copy; ///< copied events for the cut buffer }; struct PointsSelectionPositionSorter { @@ -4580,7 +4580,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) _last_cut_copy_source_track = &selection->points.front()->line().trackview; /* Keep a record of the AutomationLists that we end up using in this operation */ - typedef std::map, AutomationRecord> Lists; + typedef std::map, AutomationRecord> Lists; Lists lists; /* user could select points in any order */ @@ -4589,7 +4589,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) /* Go through all selected points, making an AutomationRecord for each distinct AutomationList */ for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { const AutomationLine& line = (*sel_point)->line(); - const boost::shared_ptr al = line.the_list(); + const std::shared_ptr al = line.the_list(); if (lists.find (al) == lists.end ()) { /* We haven't seen this list yet, so make a record for it. This includes taking a copy of its current state, in case this is needed for undo later. @@ -4609,7 +4609,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) /* Add all selected points to the relevant copy ControlLists */ for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { - boost::shared_ptr al = (*sel_point)->line().the_list(); + std::shared_ptr al = (*sel_point)->line().the_list(); AutomationList::const_iterator ctrl_evt = (*sel_point)->model (); lists[al].copy->fast_simple_add ((*ctrl_evt)->when, (*ctrl_evt)->value); @@ -4622,7 +4622,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) when copying from several lists and the paste starts at the earliest copied piece of data. */ - boost::shared_ptr &al_cpy = i->second.copy; + std::shared_ptr &al_cpy = i->second.copy; for (AutomationList::iterator ctrl_evt = al_cpy->begin(); ctrl_evt != al_cpy->end(); ++ctrl_evt) { (*ctrl_evt)->when.shift_earlier (earliest); } @@ -4642,7 +4642,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) /* Remove each selected point from its AutomationList */ for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { AutomationLine& line = (*sel_point)->line (); - boost::shared_ptr al = line.the_list(); + std::shared_ptr al = line.the_list(); bool erase = true; @@ -4660,7 +4660,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time) /* Thaw the lists and add undo records for them */ for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) { - boost::shared_ptr al = i->first; + std::shared_ptr al = i->first; al->thaw (); _session->add_command (new MementoCommand (*al.get(), i->second.state, &(al->get_state ()))); } @@ -4707,7 +4707,7 @@ struct lt_playlist { struct PlaylistMapping { TimeAxisView* tv; - boost::shared_ptr pl; + std::shared_ptr pl; PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {} }; @@ -4722,15 +4722,15 @@ Editor::remove_clicked_region () begin_reversible_command (_("remove region")); - boost::shared_ptr playlist = clicked_routeview->playlist(); - boost::shared_ptr region = clicked_regionview->region(); + std::shared_ptr playlist = clicked_routeview->playlist(); + std::shared_ptr region = clicked_regionview->region(); playlist->clear_changes (); playlist->clear_owned_changes (); playlist->remove_region (region); if (should_ripple()) { - do_ripple (playlist, region->position(), - region->length(), boost::shared_ptr(), true); + do_ripple (playlist, region->position(), - region->length(), std::shared_ptr(), true); } else { playlist->rdiff_and_add_command (_session); } @@ -4746,11 +4746,11 @@ Editor::recover_regions (ARDOUR::RegionList regions) begin_reversible_command (_("recover regions")); for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - boost::shared_ptr source = (*i)->source(); + std::shared_ptr source = (*i)->source(); RouteList routes = _session->get_routelist(); for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { - boost::shared_ptr track = boost::dynamic_pointer_cast(*it); + std::shared_ptr track = std::dynamic_pointer_cast(*it); if (track) { //ToDo if (source->captured_for() == track->) { @@ -4785,7 +4785,7 @@ Editor::remove_regions (const RegionSelection& sel, bool can_ripple, bool as_par /* make a local copy */ RegionSelection rs = sel; - list > regions_to_remove; + list > regions_to_remove; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { // we can't just remove the region(s) in this loop because @@ -4800,11 +4800,11 @@ Editor::remove_regions (const RegionSelection& sel, bool can_ripple, bool as_par regions_to_remove.push_back ((*i)->region()); } - vector > playlists; + vector > playlists; - for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { + for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { - boost::shared_ptr playlist = (*rl)->playlist(); + std::shared_ptr playlist = (*rl)->playlist(); if (!playlist) { // is this check necessary? @@ -4824,11 +4824,11 @@ Editor::remove_regions (const RegionSelection& sel, bool can_ripple, bool as_par playlist->remove_region (*rl); if (can_ripple && should_ripple()) { - do_ripple (playlist, (*rl)->position(), -(*rl)->length(), boost::shared_ptr(), false); + do_ripple (playlist, (*rl)->position(), -(*rl)->length(), std::shared_ptr(), false); } } - vector >::iterator pl; + vector >::iterator pl; bool in_command = false; for (pl = playlists.begin(); pl != playlists.end(); ++pl) { @@ -4868,7 +4868,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) timepos_t first_position = timepos_t::max (Temporal::AudioTime); - typedef set > FreezeList; + typedef set > FreezeList; FreezeList freezelist; /* get ordering correct before we cut/copy */ @@ -4880,7 +4880,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) first_position = min ((*x)->region()->position(), first_position); if (op == Cut || op == Clear || op == Delete) { - boost::shared_ptr pl = (*x)->region()->playlist(); + std::shared_ptr pl = (*x)->region()->playlist(); if (pl) { FreezeList::iterator fl; @@ -4917,7 +4917,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ) { - boost::shared_ptr pl = (*x)->region()->playlist(); + std::shared_ptr pl = (*x)->region()->playlist(); if (!pl) { /* region not yet associated with a playlist (e.g. unfinished @@ -4928,7 +4928,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) } TimeAxisView& tv = (*x)->get_time_axis_view(); - boost::shared_ptr npl; + std::shared_ptr npl; RegionSelection::iterator tmp; tmp = x; @@ -4955,8 +4955,8 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) } } - boost::shared_ptr r = (*x)->region(); - boost::shared_ptr _xx; + std::shared_ptr r = (*x)->region(); + std::shared_ptr _xx; assert (r != 0); @@ -4964,7 +4964,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) case Delete: pl->remove_region (r); if (should_ripple()) { - do_ripple (pl, r->position(), -r->length(), boost::shared_ptr(), false); + do_ripple (pl, r->position(), -r->length(), std::shared_ptr(), false); } break; @@ -4973,7 +4973,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) npl->add_region (_xx, timepos_t (first_position.distance (r->position()))); pl->remove_region (r); if (should_ripple()) { - do_ripple (pl, r->position(), -r->length(), boost::shared_ptr(), false); + do_ripple (pl, r->position(), -r->length(), std::shared_ptr(), false); } break; @@ -4985,7 +4985,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) case Clear: pl->remove_region (r); if (should_ripple()) { - do_ripple (pl, r->position(), -r->length(), boost::shared_ptr(), false); + do_ripple (pl, r->position(), -r->length(), std::shared_ptr(), false); } break; } @@ -4995,7 +4995,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) if (op != Delete) { - list > foo; + list > foo; /* the pmap is in the same order as the tracks in which selected regions occurred */ @@ -5095,7 +5095,7 @@ Editor::cut_copy_ranges (CutCopyOp op) /* markers to the right of a deleted range should be rippled to the left */ /* this stores more undo memento commands */ - ripple_marks(boost::shared_ptr(), selection->time.start_time(), -selection->time.length()); + ripple_marks(std::shared_ptr(), selection->time.start_time(), -selection->time.length()); } } @@ -5252,8 +5252,8 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) return; } - boost::shared_ptr playlist; - std::set > playlists; // list of unique playlists affected by duplication + std::shared_ptr playlist; + std::set > playlists; // list of unique playlists affected by duplication RegionSelection sel = regions; // clear (below) may clear the argument list if its the current region selection RegionSelection foo; @@ -5283,14 +5283,14 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) } } - for (set >::iterator p = playlists.begin(); p != playlists.end(); ++p) { + for (set >::iterator p = playlists.begin(); p != playlists.end(); ++p) { do_ripple ((*p), start_time, span.scale (times), &exclude, false); } } for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { - boost::shared_ptr r ((*i)->region()); + std::shared_ptr r ((*i)->region()); TimeAxisView& tv = (*i)->get_time_axis_view(); RouteTimeAxisView* rtv = dynamic_cast (&tv); @@ -5330,7 +5330,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } - for (set >::iterator p = playlists.begin(); p != playlists.end(); ++p) { + for (set >::iterator p = playlists.begin(); p != playlists.end(); ++p) { (*p)->rdiff_and_add_command (_session); } @@ -5348,7 +5348,7 @@ Editor::duplicate_selection (float times) return; } - boost::shared_ptr playlist; + std::shared_ptr playlist; TrackViewList ts = selection->tracks.filter_to_unique_playlists (); @@ -5417,7 +5417,7 @@ Editor::center_edit_point () /** Caller must begin and commit a reversible command */ void -Editor::clear_playlist (boost::shared_ptr playlist) +Editor::clear_playlist (std::shared_ptr playlist) { playlist->clear_changes (); playlist->clear (); @@ -5427,7 +5427,7 @@ Editor::clear_playlist (boost::shared_ptr playlist) void Editor::nudge_track (bool use_edit, bool forwards) { - boost::shared_ptr playlist; + std::shared_ptr playlist; timecnt_t distance; timecnt_t next_distance; timepos_t start; @@ -5557,7 +5557,7 @@ Editor::tag_regions (RegionList regions) void Editor::tag_selected_region () { - std::list > rlist; + std::list > rlist; RegionSelection rs = get_regions_from_selection_and_entered (); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); r++) { @@ -5574,17 +5574,17 @@ Editor::tag_last_capture () return; } - std::list > rlist; + std::list > rlist; - std::list > srcs; + std::list > srcs; _session->get_last_capture_sources (srcs); - for (std::list >::iterator i = srcs.begin(); i != srcs.end(); ++i) { - boost::shared_ptr source = (*i); + for (std::list >::iterator i = srcs.begin(); i != srcs.end(); ++i) { + std::shared_ptr source = (*i); if (source) { - set > regions; + set > regions; RegionFactory::get_regions_using_source (source, regions); - for (set >::iterator r = regions.begin(); r != regions.end(); r++) { + for (set >::iterator r = regions.begin(); r != regions.end(); r++) { rlist.push_back(*r); } @@ -5947,7 +5947,7 @@ Editor::fork_regions_from_unselected () gdk_flush (); /* find the set of all MidiSources associated with the selected regions */ - std::set > sources_list; + std::set > sources_list; for (const auto& r : rs) { const MidiRegionView* const mrv = dynamic_cast(r); if (!mrv) @@ -5956,7 +5956,7 @@ Editor::fork_regions_from_unselected () sources_list.insert(mrv->midi_region()->midi_source()); } - std::set > affected_playlists; + std::set > affected_playlists; for (auto r : rs) { const MidiRegionView* const mrv = dynamic_cast(r); if (mrv && sources_list.find(mrv->midi_region()->midi_source()) != sources_list.end()) { @@ -5971,7 +5971,7 @@ Editor::fork_regions_from_unselected () /* iterate over sources that need to be duplicated */ for (const auto& ms : sources_list) { /* duplicate source */ - boost::shared_ptr new_source = _session->create_midi_source_for_session (ms->name()); + std::shared_ptr new_source = _session->create_midi_source_for_session (ms->name()); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { RegionSelection::iterator tmp = r; ++tmp; @@ -5992,8 +5992,8 @@ Editor::fork_regions_from_unselected () begin_reversible_command (_("Unlink from unselected")); in_command = true; } - boost::shared_ptr playlist = mrv->region()->playlist(); - boost::shared_ptr new_region = mrv->midi_region()->clone (new_source); + std::shared_ptr playlist = mrv->region()->playlist(); + std::shared_ptr new_region = mrv->midi_region()->clone (new_source); new_region->set_name (mrv->region()->name() + "-unlinked-region"); playlist->replace_region (mrv->region(), new_region, mrv->region()->position()); } catch (...) { @@ -6034,9 +6034,9 @@ Editor::fork_selected_regions () if (mrv) { try { - boost::shared_ptr playlist = mrv->region()->playlist(); - boost::shared_ptr new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track()); - boost::shared_ptr newregion = mrv->midi_region()->clone (new_source); + std::shared_ptr playlist = mrv->region()->playlist(); + std::shared_ptr new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track()); + std::shared_ptr newregion = mrv->midi_region()->clone (new_source); if (!in_command) { begin_reversible_command (_("Fork Region(s)")); @@ -6285,7 +6285,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress ++tmp; RegionView* const rv = *r; - boost::shared_ptr playlist = rv->region()->playlist(); + std::shared_ptr playlist = rv->region()->playlist(); if (progress) { progress->descend (1.0 / N); @@ -6309,7 +6309,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress } else { playlist->freeze (); - std::vector >::iterator res = filter.results.begin (); + std::vector >::iterator res = filter.results.begin (); /* first region replaces the old one */ playlist->replace_region (rv->region(), *res, (*res)->position()); @@ -6367,7 +6367,7 @@ Editor::reset_region_gain_envelopes () for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { - boost::shared_ptr alist (arv->audio_region()->envelope()); + std::shared_ptr alist (arv->audio_region()->envelope()); XMLNode& before (alist->get_state()); arv->audio_region()->set_default_envelope (); @@ -6644,8 +6644,8 @@ Editor::play_solo_selection (bool restart) TriggerEntry* entry = *ts.begin(); TriggerPtr slot = entry->trigger(); ARDOUR::SessionObject *obj = slot->box().owner(); - boost::shared_ptr shared_strip = _session->stripable_by_id(obj->id()); - StripableList sl; sl.push_back(boost::shared_ptr(shared_strip)); + std::shared_ptr shared_strip = _session->stripable_by_id(obj->id()); + StripableList sl; sl.push_back(std::shared_ptr(shared_strip)); _session->solo_selection (sl, true); _session->request_cancel_play_range(); slot->bang(); //ToDo: how will this work with Gate+Repeat ? @@ -6665,7 +6665,7 @@ Editor::toggle_solo () { bool new_state = false; bool first = true; - boost::shared_ptr cl (new ControlList); + std::shared_ptr cl (new ControlList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { StripableTimeAxisView *stav = dynamic_cast(*i); @@ -6690,7 +6690,7 @@ Editor::toggle_mute () { bool new_state = false; bool first = true; - boost::shared_ptr cl (new ControlList); + std::shared_ptr cl (new ControlList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { StripableTimeAxisView *stav = dynamic_cast(*i); @@ -6704,7 +6704,7 @@ Editor::toggle_mute () first = false; } - boost::shared_ptr mc = stav->stripable()->mute_control(); + std::shared_ptr mc = stav->stripable()->mute_control(); cl->push_back (mc); mc->start_touch (timepos_t (_session->audible_sample ())); } @@ -6780,7 +6780,7 @@ Editor::set_fade_length (bool in) continue; } - boost::shared_ptr alist; + std::shared_ptr alist; if (in) { alist = tmp->audio_region()->fade_in(); } else { @@ -6827,7 +6827,7 @@ Editor::set_fade_in_shape (FadeShape shape) continue; } - boost::shared_ptr alist = tmp->audio_region()->fade_in(); + std::shared_ptr alist = tmp->audio_region()->fade_in(); XMLNode &before = alist->get_state(); tmp->audio_region()->set_fade_in_shape (shape); @@ -6862,7 +6862,7 @@ Editor::set_fade_out_shape (FadeShape shape) continue; } - boost::shared_ptr alist = tmp->audio_region()->fade_out(); + std::shared_ptr alist = tmp->audio_region()->fade_out(); XMLNode &before = alist->get_state(); tmp->audio_region()->set_fade_out_shape (shape); @@ -6898,7 +6898,7 @@ Editor::set_fade_in_active (bool yn) } - boost::shared_ptr ar (tmp->audio_region()); + std::shared_ptr ar (tmp->audio_region()); ar->clear_changes (); ar->set_fade_in_active (yn); @@ -6932,7 +6932,7 @@ Editor::set_fade_out_active (bool yn) continue; } - boost::shared_ptr ar (tmp->audio_region()); + std::shared_ptr ar (tmp->audio_region()); ar->clear_changes (); ar->set_fade_out_active (yn); @@ -6956,7 +6956,7 @@ Editor::toggle_region_fades (int dir) return; } - boost::shared_ptr ar; + std::shared_ptr ar; bool yn = false; RegionSelection rs = get_regions_from_selection_and_entered (); @@ -6967,7 +6967,7 @@ Editor::toggle_region_fades (int dir) RegionSelection::iterator i; for (i = rs.begin(); i != rs.end(); ++i) { - if ((ar = boost::dynamic_pointer_cast((*i)->region())) != 0) { + if ((ar = std::dynamic_pointer_cast((*i)->region())) != 0) { if (dir == -1) { yn = ar->fade_out_active (); } else { @@ -6985,7 +6985,7 @@ Editor::toggle_region_fades (int dir) bool in_command = false; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((ar = boost::dynamic_pointer_cast((*i)->region())) == 0) { + if ((ar = std::dynamic_pointer_cast((*i)->region())) == 0) { continue; } ar->clear_changes (); @@ -7551,7 +7551,7 @@ Editor::split_region_at_transients () tmp = i; ++tmp; - boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i)->region()); + std::shared_ptr ar = std::dynamic_pointer_cast ((*i)->region()); if (ar) { ar->transients (positions); @@ -7567,13 +7567,13 @@ Editor::split_region_at_transients () } void -Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList& positions, bool can_ferret, bool select_new) +Editor::split_region_at_points (std::shared_ptr r, AnalysisFeatureList& positions, bool can_ferret, bool select_new) { bool use_rhythmic_rodent = false; - boost::shared_ptr pl = r->playlist(); + std::shared_ptr pl = r->playlist(); - list > new_regions; + list > new_regions; if (!pl) { return; @@ -7683,7 +7683,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList plist.add (ARDOUR::Properties::layer, 0); // TODO set transients_offset - boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); + std::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); /* because we set announce to false, manually add the new region to the * RegionFactory map */ @@ -7711,7 +7711,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList plist.add (ARDOUR::Properties::name, new_name); plist.add (ARDOUR::Properties::layer, 0); - boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); + std::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); /* because we set announce to false, manually add the new region to the RegionFactory map */ @@ -7735,7 +7735,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList if (select_new) { - for (list >::iterator i = new_regions.begin(); i != new_regions.end(); ++i){ + for (list >::iterator i = new_regions.begin(); i != new_regions.end(); ++i){ set_selected_regionview_from_region_list ((*i), Selection::Add); } } @@ -7782,7 +7782,7 @@ Editor::remove_transient(ArdourCanvas::Item* item) void Editor::snap_regions_to_grid () { - list > used_playlists; + list > used_playlists; RegionSelection rs = get_regions_from_selection_and_entered (); @@ -7794,7 +7794,7 @@ Editor::snap_regions_to_grid () for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { - boost::shared_ptr pl = (*r)->region()->playlist(); + std::shared_ptr pl = (*r)->region()->playlist(); if (!pl->frozen()) { /* we haven't seen this playlist before */ @@ -7812,7 +7812,7 @@ Editor::snap_regions_to_grid () } while (used_playlists.size() > 0) { - list >::iterator i = used_playlists.begin(); + list >::iterator i = used_playlists.begin(); (*i)->thaw(); used_playlists.pop_front(); } @@ -7823,7 +7823,7 @@ Editor::snap_regions_to_grid () void Editor::close_region_gaps () { - list > used_playlists; + list > used_playlists; RegionSelection rs = get_regions_from_selection_and_entered (); @@ -7882,13 +7882,13 @@ Editor::close_region_gaps () begin_reversible_command (_("close region gaps")); int idx = 0; - boost::shared_ptr last_region; + std::shared_ptr last_region; rs.sort_by_position_and_track(); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { - boost::shared_ptr pl = (*r)->region()->playlist(); + std::shared_ptr pl = (*r)->region()->playlist(); if (!pl->frozen()) { /* we haven't seen this playlist before */ @@ -7920,7 +7920,7 @@ Editor::close_region_gaps () } while (used_playlists.size() > 0) { - list >::iterator i = used_playlists.begin(); + list >::iterator i = used_playlists.begin(); (*i)->thaw(); used_playlists.pop_front(); } @@ -7954,9 +7954,9 @@ Editor::tab_to_transient (bool forward) RouteTimeAxisView* rtv = dynamic_cast (*t); if (rtv) { - boost::shared_ptr tr = rtv->track(); + std::shared_ptr tr = rtv->track(); if (tr) { - boost::shared_ptr pl = tr->playlist (); + std::shared_ptr pl = tr->playlist (); if (pl) { samplepos_t result = pl->find_next_transient (tpos, forward ? 1 : -1); @@ -8159,8 +8159,8 @@ Editor::_remove_tracks () const char* trackstr; const char* busstr; const char* vcastr; - vector > routes; - vector > vcas; + vector > routes; + vector > vcas; bool special_bus = false; for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { @@ -8292,13 +8292,13 @@ edit your ardour.rc file to set the\n\ PresentationInfo::ChangeSuspender cs; DisplaySuspender ds; - boost::shared_ptr rl (new RouteList); - for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { + std::shared_ptr rl (new RouteList); + for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { rl->push_back (*x); } _session->remove_routes (rl); - for (vector >::iterator x = vcas.begin(); x != vcas.end(); ++x) { + for (vector >::iterator x = vcas.begin(); x != vcas.end(); ++x) { _session->vca_manager().remove_vca (*x); } @@ -8374,13 +8374,13 @@ Editor::insert_time ( * than 1 track using playlists "from" a given track. */ - set > pl; + set > pl; if (all_playlists) { RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav && rtav->track ()) { - vector > all = _session->playlists()->playlists_for_track (rtav->track ()); - for (vector >::iterator p = all.begin(); p != all.end(); ++p) { + vector > all = _session->playlists()->playlists_for_track (rtav->track ()); + for (vector >::iterator p = all.begin(); p != all.end(); ++p) { pl.insert (*p); } } @@ -8390,7 +8390,7 @@ Editor::insert_time ( } } - for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { + for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { (*i)->clear_changes (); (*i)->clear_owned_changes (); @@ -8541,7 +8541,7 @@ Editor::remove_time (timepos_t const & pos, timecnt_t const & duration, InsertTi for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { /* regions */ - boost::shared_ptr pl = (*x)->playlist(); + std::shared_ptr pl = (*x)->playlist(); if (pl) { @@ -8948,7 +8948,7 @@ void Editor::toggle_midi_input_active (bool flip_others) { bool onoff = false; - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { RouteTimeAxisView *rtav = dynamic_cast(*i); @@ -8957,7 +8957,7 @@ Editor::toggle_midi_input_active (bool flip_others) continue; } - boost::shared_ptr mt = rtav->midi_track(); + std::shared_ptr mt = rtav->midi_track(); if (mt) { rl->push_back (rtav->route()); @@ -9058,7 +9058,7 @@ Editor::toggle_all_existing_automation () for (TrackViewList::const_iterator t = tvl.begin(); t != tvl.end(); ++t) { TimeAxisView::Children children = (*t)->get_child_list (); for (TimeAxisView::Children::const_iterator c = children.begin(); c != children.end(); ++c) { - if (boost::dynamic_pointer_cast (*c)) { + if (std::dynamic_pointer_cast (*c)) { some_automation_shown = true; break; } @@ -9140,7 +9140,7 @@ Editor::launch_playlist_selector () vector Editor::filter_to_unique_midi_region_views (RegionSelection const & ms) const { - typedef std::pair,timepos_t> MapEntry; + typedef std::pair,timepos_t> MapEntry; std::set single_region_set; vector views; @@ -9243,7 +9243,7 @@ Editor::add_region_marker () for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { - boost::shared_ptr region ((*r)->region()); + std::shared_ptr region ((*r)->region()); if (position < region->position() || position >= region->position() + region->length()) { cerr << "nope on that one\n"; @@ -9527,13 +9527,13 @@ Editor::remove_gaps (timecnt_t const & gap_threshold, timecnt_t const & leave_ga locations_before = &_session->locations()->get_state(); } - set > pl; + set > pl; /* it will not be possible to infer this from the set<>, so keep track * of it explicitly */ - boost::shared_ptr first_selected_playlist; + std::shared_ptr first_selected_playlist; for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { @@ -9550,7 +9550,7 @@ Editor::remove_gaps (timecnt_t const & gap_threshold, timecnt_t const & leave_ga } } - for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { + for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { (*i)->clear_changes (); (*i)->clear_owned_changes (); @@ -9620,7 +9620,7 @@ Editor::should_ripple_all () const } void -Editor::do_ripple (boost::shared_ptr target_playlist, timepos_t const & at, timecnt_t const & distance, boost::shared_ptr exclude, bool add_to_command) +Editor::do_ripple (std::shared_ptr target_playlist, timepos_t const & at, timecnt_t const & distance, std::shared_ptr exclude, bool add_to_command) { RegionList el; if (exclude) { @@ -9630,9 +9630,9 @@ Editor::do_ripple (boost::shared_ptr target_playlist, timepos_ } void -Editor::do_ripple (boost::shared_ptr target_playlist, timepos_t const & at, timecnt_t const & distance, RegionList* exclude, bool add_to_command) +Editor::do_ripple (std::shared_ptr target_playlist, timepos_t const & at, timecnt_t const & distance, RegionList* exclude, bool add_to_command) { - typedef std::set > UniquePlaylists; + typedef std::set > UniquePlaylists; UniquePlaylists playlists; playlists.insert (target_playlist); @@ -9640,7 +9640,7 @@ Editor::do_ripple (boost::shared_ptr target_playlist, timepos_t const if (should_ripple_all()) { TrackViewList ts = track_views.filter_to_unique_playlists (); - boost::shared_ptr pl; + std::shared_ptr pl; for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { if ((pl = (*x)->playlist()) == 0) { @@ -9702,7 +9702,7 @@ Editor::do_ripple (boost::shared_ptr target_playlist, timepos_t const } timepos_t -Editor::effective_ripple_mark_start (boost::shared_ptr target_playlist, timepos_t pos) +Editor::effective_ripple_mark_start (std::shared_ptr target_playlist, timepos_t pos) { #if 0 /* I do not agree with this behavior - at the very least it ignores regions on *other* tracks and the markers that might be associated with them -Ben */ /* in the target playlist, find the region before the target @@ -9711,7 +9711,7 @@ Editor::effective_ripple_mark_start (boost::shared_ptr target_playlist * desired/expected by many (most?) ripple-edit using folk. */ - boost::shared_ptr rl = target_playlist->region_list(); + std::shared_ptr rl = target_playlist->region_list(); timepos_t last_region_end_before_at (pos.time_domain()); for (RegionList::const_iterator r = rl->begin(); r != rl->end(); ++r) { @@ -9730,7 +9730,7 @@ Editor::effective_ripple_mark_start (boost::shared_ptr target_playlist } void -Editor::ripple_marks (boost::shared_ptr target_playlist, timepos_t at, timecnt_t const & distance) +Editor::ripple_marks (std::shared_ptr target_playlist, timepos_t at, timecnt_t const & distance) { TempoMap::SharedPtr tmap (TempoMap::use()); if (target_playlist) { diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index c5bbdcc06b..7d8121aef6 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -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 = (*iter)[_columns.region]; + std::shared_ptr 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 r ((*i)->region ()); + std::shared_ptr 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; + std::shared_ptr region; TreeIter iter; TreeModel::Path path; TreeViewColumn* column; @@ -198,7 +198,7 @@ EditorRegions::button_press (GdkEventButton* ev) } void -EditorRegions::selection_mapover (sigc::slot> sl) +EditorRegions::selection_mapover (sigc::slot> sl) { Glib::RefPtr selection = _display.get_selection (); TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows (); @@ -216,7 +216,7 @@ EditorRegions::selection_mapover (sigc::slot> sl selected (XXX maybe prevent them from being selected) */ - boost::shared_ptr r = (*iter)[_columns.region]; + std::shared_ptr r = (*iter)[_columns.region]; if (r) { sl (r); @@ -226,7 +226,7 @@ EditorRegions::selection_mapover (sigc::slot> sl } void -EditorRegions::regions_changed (boost::shared_ptr rl, const PropertyChange& what_changed) +EditorRegions::regions_changed (std::shared_ptr 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 rl, const Property RegionListBase::regions_changed (rl, what_changed); } -boost::shared_ptr +std::shared_ptr EditorRegions::get_single_selection () { Glib::RefPtr selected = _display.get_selection (); if (selected->count_selected_rows () != 1) { - return boost::shared_ptr (); + return std::shared_ptr (); } 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 (); + return std::shared_ptr (); } return (*iter)[_columns.region]; diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h index 2227646f5d..d707d5dea9 100644 --- a/gtk2_ardour/editor_regions.h +++ b/gtk2_ardour/editor_regions.h @@ -32,10 +32,10 @@ public: EditorRegions (Editor*); void set_selected (RegionSelection&); - void selection_mapover (sigc::slot>); + void selection_mapover (sigc::slot>); void remove_unused_regions (); - boost::shared_ptr get_single_selection (); + std::shared_ptr get_single_selection (); void unselect_all () { @@ -43,7 +43,7 @@ public: } protected: - void regions_changed (boost::shared_ptr, PBD::PropertyChange const&); + void regions_changed (std::shared_ptr, PBD::PropertyChange const&); private: void init (); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index eeabc7ada4..7e96dba56a 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -492,7 +492,7 @@ void Editor::mapover_tracks_with_unique_playlists (sigc::slot sl, TimeAxisView* basis, PBD::PropertyID prop) const { RouteTimeAxisView* route_basis = dynamic_cast (basis); - set > playlists; + set > playlists; if (route_basis == 0) { return; @@ -513,7 +513,7 @@ Editor::mapover_tracks_with_unique_playlists (sigc::slotroute()->route_group() == group) { - boost::shared_ptr t = v->track(); + std::shared_ptr 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 sl) const { - set > playlists; + set > playlists; set tracks; @@ -552,7 +552,7 @@ Editor::mapover_all_tracks_with_unique_playlists (sigc::slot t = v->track(); + std::shared_ptr 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* all_equivs) const { - boost::shared_ptr pl; - vector > results; + std::shared_ptr pl; + vector > results; RegionView* marv; - boost::shared_ptr tr; + std::shared_ptr 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 >::iterator ir = results.begin(); ir != results.end(); ++ir) { + for (vector >::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 s, Selection::Operation op) } void -Editor::set_selected_regionview_from_region_list (boost::shared_ptr region, Selection::Operation op) +Editor::set_selected_regionview_from_region_list (std::shared_ptr region, Selection::Operation op) { vector regionviews; @@ -1067,10 +1067,10 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr regi } bool -Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, boost::weak_ptr weak_r) +Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, std::weak_ptr weak_r) { RegionView* rv; - boost::shared_ptr r (weak_r.lock()); + std::shared_ptr 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 ((*i).stripable)) { + if (std::dynamic_pointer_cast ((*i).stripable)) { n_tracks++; n_routes++; - } else if (boost::dynamic_pointer_cast ((*i).stripable)) { + } else if (std::dynamic_pointer_cast ((*i).stripable)) { n_busses++; n_routes++; - } else if (boost::dynamic_pointer_cast ((*i).stripable)) { + } else if (std::dynamic_pointer_cast ((*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 control = (*j)->control (); + std::shared_ptr control = (*j)->control (); if (control != (*i).controllable) { continue; @@ -1433,8 +1433,8 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing) for (list::const_iterator i = rs.begin(); i != rs.end(); ++i) { - boost::shared_ptr r = (*i)->region (); - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr r = (*i)->region (); + std::shared_ptr ar = std::dynamic_pointer_cast (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 (r)) { + if (std::dynamic_pointer_cast (r)) { have_midi = true; } @@ -2372,9 +2372,9 @@ Editor::catch_up_on_midi_selection () struct ViewStripable { TimeAxisView* tav; - boost::shared_ptr stripable; + std::shared_ptr stripable; - ViewStripable (TimeAxisView* t, boost::shared_ptr s) + ViewStripable (TimeAxisView* t, std::shared_ptr s) : tav (t), stripable (s) {} }; diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc index fb62a1070f..ab4d7707c1 100644 --- a/gtk2_ardour/editor_sources.cc +++ b/gtk2_ardour/editor_sources.cc @@ -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 region = (*iter)[_columns.region]; + std::shared_ptr region = (*iter)[_columns.region]; if (!region) continue; - boost::shared_ptr source = region->source (); + std::shared_ptr source = region->source (); if (source) { - set> regions; + set> regions; RegionFactory::get_regions_using_source (source, regions); - for (set>::iterator region = regions.begin (); region != regions.end (); region++) { + for (set>::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 region = (*iter)[_columns.region]; + std::shared_ptr 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> to_be_removed; + std::list> 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 region = (*iter)[_columns.region]; + std::shared_ptr region = (*iter)[_columns.region]; if (!region) continue; - boost::shared_ptr source = region->source (); + std::shared_ptr source = region->source (); if (source) { - set> regions; + set> regions; RegionFactory::get_regions_using_source (source, regions); - for (set>::iterator region = regions.begin (); region != regions.end (); region++) { + for (set>::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>::iterator i = to_be_removed.begin (); i != to_be_removed.end (); ++i) { + for (std::list>::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& context, } } -boost::shared_ptr +std::shared_ptr EditorSources::get_single_selection () { Glib::RefPtr selected = _display.get_selection (); if (selected->count_selected_rows () != 1) { - return boost::shared_ptr (); + return std::shared_ptr (); } 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 (); + return std::shared_ptr (); } return (*iter)[_columns.region]; diff --git a/gtk2_ardour/editor_sources.h b/gtk2_ardour/editor_sources.h index a7a2959e1c..0ee9ed2f77 100644 --- a/gtk2_ardour/editor_sources.h +++ b/gtk2_ardour/editor_sources.h @@ -26,7 +26,7 @@ class EditorSources : public EditorComponent, public SourceListBase public: EditorSources (Editor*); - boost::shared_ptr get_single_selection (); + std::shared_ptr get_single_selection (); /* user actions */ void remove_selected_sources (); diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index 3514f22eb4..916c992999 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -961,7 +961,7 @@ EditorSummary::routes_added (list const & r) for (list::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 tr = boost::dynamic_pointer_cast ((*i)->route ()); + std::shared_ptr tr = std::dynamic_pointer_cast ((*i)->route ()); if (tr) { tr->PlaylistChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context ()); } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 7f12b15391..dce2dd8cb8 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -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 atav = boost::dynamic_pointer_cast (*ct); + std::shared_ptr atav = std::dynamic_pointer_cast (*ct); if (atav) { AutomationStreamView* asv = atav->automation_view (); diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 4b233a9489..5c970dff3c 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -87,10 +87,10 @@ Editor::time_stretch (RegionSelection& regions, Temporal::ratio_t const & ratio) return aret; } - set > midi_playlists_affected; + set > midi_playlists_affected; for (RegionList::iterator i = midi.begin(); i != midi.end(); ++i) { - boost::shared_ptr playlist = (*i)->playlist(); + std::shared_ptr 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 = (*i)->playlist(); + std::shared_ptr 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 >::iterator p = midi_playlists_affected.begin(); p != midi_playlists_affected.end(); ++p) { + for (set >::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 > ResultMap; + typedef std::map, std::shared_ptr > 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 region = boost::dynamic_pointer_cast (*i); - boost::shared_ptr playlist; + std::shared_ptr region = std::dynamic_pointer_cast (*i); + std::shared_ptr 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 w = i->second; + std::weak_ptr 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 = i->first; - boost::shared_ptr new_region = i->second; - boost::shared_ptr playlist = region->playlist(); + std::shared_ptr region = i->first; + std::shared_ptr new_region = i->second; + std::shared_ptr playlist = region->playlist(); playlist->clear_changes (); playlist->replace_region (region, new_region, region->position()); diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc index 875009b60e..b562c71d09 100644 --- a/gtk2_ardour/editor_videotimeline.cc +++ b/gtk2_ardour/editor_videotimeline.cc @@ -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 track; + std::shared_ptr 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 pl = track->playlist(); + std::shared_ptr pl = track->playlist(); pl->find_next_region (pos, ARDOUR::End, 0)->set_video_locked (true); } _session->save_state ("", true); diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 9cea5bd63d..e37efb16e2 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -553,7 +553,7 @@ EngineControl::build_notebook () void EngineControl::build_full_control_notebook () { - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend; + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector all_devices = backend->enumerate_input_devices (); vector available_devices; @@ -1240,7 +1240,7 @@ bool EngineControl::set_output_device_popdown_strings () { DEBUG_ECONTROL ("set_output_device_popdown_strings"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector all_devices = backend->enumerate_output_devices (); vector available_devices; @@ -1268,7 +1268,7 @@ void EngineControl::list_devices () { DEBUG_ECONTROL ("list_devices"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); assert (backend); backend->set_driver (driver_combo.get_active_text ()); @@ -1315,7 +1315,7 @@ EngineControl::driver_changed () vector EngineControl::get_sample_rates_for_all_devices () { - boost::shared_ptr backend = + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector all_rates; @@ -1347,7 +1347,7 @@ void EngineControl::set_samplerate_popdown_strings () { DEBUG_ECONTROL ("set_samplerate_popdown_strings"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); string desired; vector sr; vector s; @@ -1396,7 +1396,7 @@ EngineControl::set_samplerate_popdown_strings () vector EngineControl::get_buffer_sizes_for_all_devices () { - boost::shared_ptr backend = + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector all_sizes; @@ -1430,7 +1430,7 @@ void EngineControl::set_buffersize_popdown_strings () { DEBUG_ECONTROL ("set_buffersize_popdown_strings"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector bs; vector s; @@ -1479,7 +1479,7 @@ void EngineControl::set_nperiods_popdown_strings () { DEBUG_ECONTROL ("set_nperiods_popdown_strings"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); vector np; vector s; @@ -1508,7 +1508,7 @@ void EngineControl::device_changed () { SignalBlocker blocker (*this, "device_changed"); - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend; + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); PBD::Unwinder 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); if (!backend) { return; @@ -2690,7 +2690,7 @@ EngineControl::start_stop_button_clicked () return; } - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); if (!backend) { return; @@ -2715,7 +2715,7 @@ EngineControl::update_devices_button_clicked () return; } - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); if (!backend) { return; @@ -2748,7 +2748,7 @@ EngineControl::use_buffered_io_button_clicked () return; } - boost::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); if (backend->can_change_systemic_latency_when_running ()) { for (vector::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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr 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 backend = ARDOUR::AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = ARDOUR::AudioEngine::instance ()->current_backend (); assert (backend); connect_disconnect_button.set_label (string_compose (_("Connect to %1"), backend->name ())); diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 33882492b9..86c7e55474 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -235,7 +235,7 @@ private: } }; - typedef boost::shared_ptr MidiDeviceSettings; + typedef std::shared_ptr MidiDeviceSettings; bool _can_set_midi_latencies; std::vector _midi_devices; @@ -280,7 +280,7 @@ private: } }; - typedef boost::shared_ptr State; + typedef std::shared_ptr State; typedef std::list StateList; static bool state_sort_cmp (const State& a, const State& b); diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index f57e860f5e..60fe0a2115 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -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 port_list = r_it->get_value (route_cols.port_list_col); - std::set > route_ports; - std::set > intersection; - std::map, string> port_labels; + PortExportChannel::PortSet route_ports; + PortExportChannel::PortSet intersection; + std::map, string, std::owner_less > > 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 > cmp; + std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(), route_ports.begin(), route_ports.end(), - std::insert_iterator > > (intersection, intersection.begin())); + std::insert_iterator (intersection, intersection.begin()), + cmp); - intersection.erase (boost::weak_ptr ()); // Remove "none" selection + intersection.erase (std::weak_ptr ()); // 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 ()); + r_it->set_value (route_cols.get_channel (chn).port, std::weak_ptr ()); r_it->set_value (route_cols.get_channel (chn).label, string ("(none)")); } } - boost::weak_ptr port = *intersection.begin(); - std::map, string>::iterator label_it = port_labels.find (port); + std::weak_ptr port = *intersection.begin(); + std::map, 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 (); + row[route_cols.port_cols.port] = std::weak_ptr (); 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 ()); + it->set_value (route_cols.get_channel (n_channels).port, std::weak_ptr ()); } /* set column width */ @@ -399,8 +402,8 @@ PortExportChannelSelector::ChannelTreeView::update_config () continue; } - boost::weak_ptr weak_port = row[route_cols.get_channel (i).port]; - boost::shared_ptr port = weak_port.lock (); + std::weak_ptr weak_port = row[route_cols.get_channel (i).port]; + std::shared_ptr 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 ()); + iter->set_value (route_cols.get_channel (i).port, std::weak_ptr ()); Glib::RefPtr 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 w = (*port_it)[route_cols.port_cols.port]; + std::weak_ptr 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 (channel_list.front ())) { + if (std::dynamic_pointer_cast (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 pem; - boost::shared_ptr pec; - boost::shared_ptr rec; + std::shared_ptr pem; + std::shared_ptr pec; + std::shared_ptr rec; - if ((rec = boost::dynamic_pointer_cast (c))) { + if ((rec = std::dynamic_pointer_cast (c))) { for (auto const& i : track_list->children ()) { Gtk::TreeModel::Row row = *i; - boost::shared_ptr route = row[track_cols.route]; + std::shared_ptr route = row[track_cols.route]; if (route == rec->route ()) { row[track_cols.selected] = true; break; } } - } else if ((pem = boost::dynamic_pointer_cast (c))) { + } else if ((pem = std::dynamic_pointer_cast (c))) { bool breakout = false; for (auto const& i : track_list->children ()) { Gtk::TreeModel::Row row = *i; - boost::shared_ptr route = row[track_cols.route]; + std::shared_ptr 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 port = route->output()->midi (i); + std::shared_ptr 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 (c))) { + } else if ((pec = std::dynamic_pointer_cast (c))) { for (auto const& i : track_list->children ()) { Gtk::TreeModel::Row row = *i; - boost::shared_ptr route = row[track_cols.route]; - std::set> route_ports; - std::set> intersection; + std::shared_ptr 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 > cmp; + std::set_intersection (pec->get_ports().begin(), pec->get_ports().end(), - route_ports.begin(), route_ports.end(), - std::insert_iterator>> (intersection, intersection.begin ())); + route_ports.begin(), route_ports.end(), + std::insert_iterator (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 = row[track_cols.route]; - if (!boost::dynamic_pointer_cast (route)) { + std::shared_ptr route = row[track_cols.route]; + if (!std::dynamic_pointer_cast (route)) { continue; } - if (0 == (what & 1) && boost::dynamic_pointer_cast (route)) { + if (0 == (what & 1) && std::dynamic_pointer_cast (route)) { continue; } - if (0 == (what & 2) && boost::dynamic_pointer_cast (route)) { + if (0 == (what & 2) && std::dynamic_pointer_cast (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 = row[track_cols.route]; - if (!boost::dynamic_pointer_cast (route)) { + std::shared_ptr route = row[track_cols.route]; + if (!std::dynamic_pointer_cast (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(*it)) { + if (!std::dynamic_pointer_cast(*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(*it) || boost::dynamic_pointer_cast(*it)) { + if (std::dynamic_pointer_cast(*it) || std::dynamic_pointer_cast(*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, bool selected) +TrackExportChannelSelector::add_track (std::shared_ptr 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 = row[track_cols.route]; + std::shared_ptr 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 port = route->output()->audio (i); + std::shared_ptr port = route->output()->audio (i); if (port) { ExportChannelPtr channel (new PortExportChannel ()); PortExportChannel * pec = static_cast (channel.get()); @@ -901,7 +909,7 @@ TrackExportChannelSelector::update_config() n_midi = 0; } for (uint32_t i = 0; i < n_midi; ++i) { - boost::shared_ptr port = route->output()->midi (i); + std::shared_ptr port = route->output()->midi (i); if (port) { ExportChannelPtr channel (new PortExportMIDI ()); PortExportMIDI* pem = static_cast (channel.get()); diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index 54ec04f244..5897a12f98 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -64,9 +64,9 @@ class XMLNode; class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr { protected: - typedef boost::shared_ptr ChannelConfigPtr; + typedef std::shared_ptr ChannelConfigPtr; typedef std::list ChannelConfigList; - typedef boost::shared_ptr ProfileManagerPtr; + typedef std::shared_ptr ProfileManagerPtr; ProfileManagerPtr manager; @@ -148,7 +148,7 @@ private: public: Channel (RouteCols & cols) { cols.add (port); cols.add (label); } - Gtk::TreeModelColumn > port; + Gtk::TreeModelColumn > port; Gtk::TreeModelColumn label; }; std::list channels; @@ -166,7 +166,7 @@ private: PortCols () { add(selected); add(port); add(label); } Gtk::TreeModelColumn selected; // not used ATM - Gtk::TreeModelColumn > port; + Gtk::TreeModelColumn > port; Gtk::TreeModelColumn label; }; PortCols port_cols; @@ -232,7 +232,7 @@ private: void handle_selection (); ARDOUR::ExportProfileManager::ChannelConfigStatePtr state; - boost::shared_ptr factory; + std::shared_ptr 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 route, bool selected); + void add_track (std::shared_ptr route, bool selected); void update_config(); ChannelConfigList configs; @@ -271,7 +271,7 @@ class TrackExportChannelSelector : public ExportChannelSelector struct TrackCols : public Gtk::TreeModelColumnRecord { public: - Gtk::TreeModelColumn > route; + Gtk::TreeModelColumn > route; Gtk::TreeModelColumn label; Gtk::TreeModelColumn selected; Gtk::TreeModelColumn order_key; diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index d2c390a0e4..fc1d26f7ea 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -265,7 +265,7 @@ ExportDialog::update_warnings_and_example_filename () /* Add new warnings */ - boost::shared_ptr warnings = profile_manager->get_warnings(); + std::shared_ptr warnings = profile_manager->get_warnings(); for (std::list::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 fmp = fmt->format; + std::shared_ptr fmp = fmt->format; fmp->set_format_id (ExportFormatBase::F_None); fmp->set_type (ExportFormatBase::T_None); fmp->set_analyse (true); diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 045a648df2..d54f3d8c77 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -76,8 +76,8 @@ protected: Gtk::Dialog::on_response (response_id); } - typedef boost::shared_ptr HandlerPtr; - typedef boost::shared_ptr ManagerPtr; + typedef std::shared_ptr HandlerPtr; + typedef std::shared_ptr ManagerPtr; ARDOUR::ExportProfileManager::ExportType type; HandlerPtr handler; @@ -94,7 +94,7 @@ protected: boost::scoped_ptr channel_selector; boost::scoped_ptr file_notebook; - boost::shared_ptr soundcloud_selector; + std::shared_ptr 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 StatusPtr; + typedef std::shared_ptr StatusPtr; PublicEditor & editor; StatusPtr status; diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc index f04550dd0e..2d5a0e73d7 100644 --- a/gtk2_ardour/export_file_notebook.cc +++ b/gtk2_ardour/export_file_notebook.cc @@ -53,7 +53,7 @@ ExportFileNotebook::ExportFileNotebook () : } void -ExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr manager) +ExportFileNotebook::set_session_and_manager (ARDOUR::Session * s, std::shared_ptr manager) { SessionHandlePtr::set_session (s); profile_manager = manager; diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h index c5d1d3334a..e8b2f462f6 100644 --- a/gtk2_ardour/export_file_notebook.h +++ b/gtk2_ardour/export_file_notebook.h @@ -46,19 +46,19 @@ public: ExportFileNotebook (); - void set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr manager); + void set_session_and_manager (ARDOUR::Session * s, std::shared_ptr manager); void sync_with_manager (); void update_example_filenames(); - boost::shared_ptr soundcloud_export_selector; + std::shared_ptr soundcloud_export_selector; sigc::signal CriticalSelectionChanged; private: - typedef boost::shared_ptr ManagerPtr; - typedef boost::shared_ptr FormatPtr; - typedef boost::shared_ptr FilenamePtr; + typedef std::shared_ptr ManagerPtr; + typedef std::shared_ptr FormatPtr; + typedef std::shared_ptr FilenamePtr; class FilePage; ManagerPtr profile_manager; diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h index ad4554d9ae..553cd5f19f 100644 --- a/gtk2_ardour/export_filename_selector.h +++ b/gtk2_ardour/export_filename_selector.h @@ -40,7 +40,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr { public: - typedef boost::shared_ptr FilenamePtr; + typedef std::shared_ptr FilenamePtr; ExportFilenameSelector (); ~ExportFilenameSelector (); @@ -71,7 +71,7 @@ private: void open_browse_dialog (); void open_folder (); - boost::shared_ptr filename; + std::shared_ptr filename; Glib::RefPtr label_sizegroup; diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index 5c1ec5d1dc..dff394bb88 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -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 format_in_list = it->get_value (format_cols.ptr); + std::shared_ptr 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 hsf; + std::shared_ptr hsf; - if ((hsf = boost::dynamic_pointer_cast (*it))) { + if ((hsf = std::dynamic_pointer_cast (*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 void -ExportFormatDialog::change_selection (bool select, boost::weak_ptr w_ptr, Glib::RefPtr& list, Gtk::TreeView& view, ColsT& cols) +ExportFormatDialog::change_selection (bool select, std::weak_ptr w_ptr, Glib::RefPtr& list, Gtk::TreeView& view, ColsT& cols) { ++applying_changes_from_engine; - boost::shared_ptr ptr = w_ptr.lock (); + std::shared_ptr ptr = w_ptr.lock (); Gtk::ListStore::Children::iterator it; Glib::RefPtr selection; @@ -886,10 +886,10 @@ ExportFormatDialog::change_dither_type_compatibility (bool compatibility, WeakDi template void -ExportFormatDialog::change_compatibility (bool compatibility, boost::weak_ptr w_ptr, Glib::RefPtr& list, ColsT& cols, +ExportFormatDialog::change_compatibility (bool compatibility, std::weak_ptr w_ptr, Glib::RefPtr& list, ColsT& cols, std::string const& c_incompatible, std::string const& c_compatible) { - boost::shared_ptr ptr = w_ptr.lock (); + std::shared_ptr 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 linear_ptr; - boost::shared_ptr ogg_ptr; - boost::shared_ptr flac_ptr; - boost::shared_ptr opus_ptr; - boost::shared_ptr bwf_ptr; - boost::shared_ptr mpeg_ptr; - boost::shared_ptr ffmpeg_ptr; + std::shared_ptr linear_ptr; + std::shared_ptr ogg_ptr; + std::shared_ptr flac_ptr; + std::shared_ptr opus_ptr; + std::shared_ptr bwf_ptr; + std::shared_ptr mpeg_ptr; + std::shared_ptr ffmpeg_ptr; - if ((linear_ptr = boost::dynamic_pointer_cast (ptr))) { + if ((linear_ptr = std::dynamic_pointer_cast (ptr))) { show_linear_enconding_options (linear_ptr); - } else if ((ogg_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((ogg_ptr = std::dynamic_pointer_cast (ptr))) { show_ogg_enconding_options (ogg_ptr); - } else if ((opus_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((opus_ptr = std::dynamic_pointer_cast (ptr))) { show_opus_enconding_options (opus_ptr); - } else if ((flac_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((flac_ptr = std::dynamic_pointer_cast (ptr))) { show_flac_enconding_options (flac_ptr); - } else if ((bwf_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((bwf_ptr = std::dynamic_pointer_cast (ptr))) { show_bwf_enconding_options (bwf_ptr); - } else if ((mpeg_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((mpeg_ptr = std::dynamic_pointer_cast (ptr))) { show_mpeg_enconding_options (mpeg_ptr); - } else if ((ffmpeg_ptr = boost::dynamic_pointer_cast (ptr))) { + } else if ((ffmpeg_ptr = std::dynamic_pointer_cast (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 ptr) +ExportFormatDialog::show_linear_enconding_options (std::shared_ptr ptr) { /* Set label and pack table */ @@ -1161,13 +1161,13 @@ ExportFormatDialog::show_linear_enconding_options (boost::shared_ptr (ptr)); + fill_sample_format_lists (std::dynamic_pointer_cast (ptr)); show_all_children (); } void -ExportFormatDialog::show_ogg_enconding_options (boost::shared_ptr ptr) +ExportFormatDialog::show_ogg_enconding_options (std::shared_ptr ptr) { encoding_options_label.set_label (_("Ogg Vorbis options")); @@ -1178,7 +1178,7 @@ ExportFormatDialog::show_ogg_enconding_options (boost::shared_ptr ptr) +ExportFormatDialog::show_opus_enconding_options (std::shared_ptr 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 ptr) +ExportFormatDialog::show_flac_enconding_options (std::shared_ptr ptr) { encoding_options_label.set_label (_("FLAC options")); @@ -1198,13 +1198,13 @@ ExportFormatDialog::show_flac_enconding_options (boost::shared_ptr (ptr)); + fill_sample_format_lists (std::dynamic_pointer_cast (ptr)); show_all_children (); } void -ExportFormatDialog::show_bwf_enconding_options (boost::shared_ptr ptr) +ExportFormatDialog::show_bwf_enconding_options (std::shared_ptr ptr) { encoding_options_label.set_label (_("Broadcast Wave options")); @@ -1214,13 +1214,13 @@ ExportFormatDialog::show_bwf_enconding_options (boost::shared_ptr (ptr)); + fill_sample_format_lists (std::dynamic_pointer_cast (ptr)); show_all_children (); } void -ExportFormatDialog::show_mpeg_enconding_options (boost::shared_ptr ptr) +ExportFormatDialog::show_mpeg_enconding_options (std::shared_ptr 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 ptr) +ExportFormatDialog::show_ffmpeg_enconding_options (std::shared_ptr 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 ptr) +ExportFormatDialog::fill_sample_rate_lists (std::shared_ptr ptr) { Gtk::TreeModel::iterator iter; Gtk::TreeModel::Row row; @@ -1268,7 +1268,7 @@ ExportFormatDialog::fill_sample_rate_lists (boost::shared_ptr ptr) +ExportFormatDialog::fill_sample_format_lists (std::shared_ptr ptr) { /* Fill lists */ @@ -1311,7 +1311,7 @@ ExportFormatDialog::fill_sample_format_lists (boost::shared_ptr ptr) +ExportFormatDialog::fill_codec_quality_lists (std::shared_ptr ptr) { HasCodecQuality::CodecQualityList const& codecs = ptr->get_codec_qualities (); diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h index 81a6e2e749..4803410148 100644 --- a/gtk2_ardour/export_format_dialog.h +++ b/gtk2_ardour/export_format_dialog.h @@ -62,7 +62,7 @@ private: typedef ARDOUR::ExportFormatManager::WeakSampleFormatPtr WeakSampleFormatPtr; typedef ARDOUR::ExportFormatManager::WeakDitherTypePtr WeakDitherTypePtr; - typedef boost::shared_ptr FormatPtr; + typedef std::shared_ptr FormatPtr; public: @@ -116,7 +116,7 @@ private: void change_dither_type_selection (bool select, WeakDitherTypePtr type); template - void change_selection (bool select, boost::weak_ptr w_ptr, Glib::RefPtr & list, Gtk::TreeView & view, ColsT & cols); + void change_selection (bool select, std::weak_ptr w_ptr, Glib::RefPtr & 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 - void change_compatibility (bool compatibility, boost::weak_ptr w_ptr, Glib::RefPtr & list, ColsT & cols, + void change_compatibility (bool compatibility, std::weak_ptr w_ptr, Glib::RefPtr & 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 ptr); - void show_ogg_enconding_options (boost::shared_ptr ptr); - void show_flac_enconding_options (boost::shared_ptr ptr); - void show_bwf_enconding_options (boost::shared_ptr ptr); - void show_opus_enconding_options (boost::shared_ptr ptr); - void show_mpeg_enconding_options (boost::shared_ptr ptr); - void show_ffmpeg_enconding_options (boost::shared_ptr ptr); + void show_linear_enconding_options (std::shared_ptr ptr); + void show_ogg_enconding_options (std::shared_ptr ptr); + void show_flac_enconding_options (std::shared_ptr ptr); + void show_bwf_enconding_options (std::shared_ptr ptr); + void show_opus_enconding_options (std::shared_ptr ptr); + void show_mpeg_enconding_options (std::shared_ptr ptr); + void show_ffmpeg_enconding_options (std::shared_ptr ptr); - void fill_sample_format_lists (boost::shared_ptr ptr); - void fill_codec_quality_lists (boost::shared_ptr ptr); - void fill_sample_rate_lists (boost::shared_ptr ptr); + void fill_sample_format_lists (std::shared_ptr ptr); + void fill_codec_quality_lists (std::shared_ptr ptr); + void fill_sample_rate_lists (std::shared_ptr ptr); /*** GUI components ***/ diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h index c5c754e0db..92b0cf71e3 100644 --- a/gtk2_ardour/export_format_selector.h +++ b/gtk2_ardour/export_format_selector.h @@ -44,7 +44,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr { private: - typedef boost::shared_ptr FormatPtr; + typedef std::shared_ptr FormatPtr; typedef std::list FormatList; public: diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc index aabfafad6a..97022a7d6c 100644 --- a/gtk2_ardour/export_preset_selector.cc +++ b/gtk2_ardour/export_preset_selector.cc @@ -67,7 +67,7 @@ ExportPresetSelector::ExportPresetSelector (bool readonly) } void -ExportPresetSelector::set_manager (boost::shared_ptr manager) +ExportPresetSelector::set_manager (std::shared_ptr manager) { profile_manager = manager; current = profile_manager->preset (); diff --git a/gtk2_ardour/export_preset_selector.h b/gtk2_ardour/export_preset_selector.h index ed2c78b72a..e8688026cf 100644 --- a/gtk2_ardour/export_preset_selector.h +++ b/gtk2_ardour/export_preset_selector.h @@ -37,14 +37,14 @@ class ExportPresetSelector : public Gtk::HBox public: ExportPresetSelector (bool readonly = false); - void set_manager (boost::shared_ptr manager); + void set_manager (std::shared_ptr manager); sigc::signal CriticalSelectionChanged; Gtk::ComboBox& the_combo () { return combo; } private: - typedef boost::shared_ptr ManagerPtr; + typedef std::shared_ptr ManagerPtr; typedef ARDOUR::ExportPresetPtr PresetPtr; typedef ARDOUR::ExportProfileManager::PresetList PresetList; diff --git a/gtk2_ardour/export_report.cc b/gtk2_ardour/export_report.cc index 833f6e22e5..3d061d26c0 100644 --- a/gtk2_ardour/export_report.cc +++ b/gtk2_ardour/export_report.cc @@ -920,9 +920,9 @@ ExportReport::audition (std::string path, unsigned n_chn, int page) } if (SMFSource::valid_midi_file (path)) { return; } - boost::shared_ptr r; + std::shared_ptr r; SourceList srclist; - boost::shared_ptr afs; + std::shared_ptr 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 ( + afs = std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false)); if (afs->sample_rate() != _session->nominal_sample_rate()) { - boost::shared_ptr sfs (new SrcFileSource(*_session, afs, ARDOUR::SrcGood)); + std::shared_ptr 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 (srclist[0]); + afs = std::dynamic_pointer_cast (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 (RegionFactory::create (srclist, plist, false)); + r = std::dynamic_pointer_cast (RegionFactory::create (srclist, plist, false)); r->set_position (timepos_t ()); _session->audition_region(r); diff --git a/gtk2_ardour/export_report.h b/gtk2_ardour/export_report.h index 8a8326ee30..59bb6d471e 100644 --- a/gtk2_ardour/export_report.h +++ b/gtk2_ardour/export_report.h @@ -187,7 +187,7 @@ private: class ExportReport : public ArdourDialog { public: - typedef boost::shared_ptr StatusPtr; + typedef std::shared_ptr StatusPtr; ExportReport (ARDOUR::Session*, StatusPtr); ExportReport (const std::string & title, const ARDOUR::AnalysisResults & ar); int run (); diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h index 3c65bb2ea5..e5b65ee79c 100644 --- a/gtk2_ardour/export_timespan_selector.h +++ b/gtk2_ardour/export_timespan_selector.h @@ -63,11 +63,11 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr { protected: typedef std::list LocationList; - typedef boost::shared_ptr HandlerPtr; - typedef boost::shared_ptr ProfileManagerPtr; + typedef std::shared_ptr HandlerPtr; + typedef std::shared_ptr ProfileManagerPtr; typedef std::list TimespanList; - typedef boost::shared_ptr TimespanListPtr; + typedef std::shared_ptr TimespanListPtr; typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr; public: diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index a7e7030359..b1fe8ee215 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -472,9 +472,9 @@ ExportVideoDialog::launch_export () /* export audio track */ ExportTimespanPtr tsp = _session->get_export_handler ()->add_timespan (); - boost::shared_ptr ccp = _session->get_export_handler ()->add_channel_config (); - boost::shared_ptr fnp = _session->get_export_handler ()->add_filename (); - boost::shared_ptr b; + std::shared_ptr ccp = _session->get_export_handler ()->add_channel_config (); + std::shared_ptr fnp = _session->get_export_handler ()->add_filename (); + std::shared_ptr b; XMLTree tree; string vtl_normalize = _normalize ? "true" : "false"; @@ -527,7 +527,7 @@ ExportVideoDialog::launch_export () .c_str ()); /* clang-format on */ - boost::shared_ptr fmp = _session->get_export_handler ()->add_format (*tree.root ()); + std::shared_ptr fmp = _session->get_export_handler ()->add_format (*tree.root ()); /* set up range */ samplepos_t start, end; diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h index bae362f4a1..dc990403ba 100644 --- a/gtk2_ardour/export_video_dialog.h +++ b/gtk2_ardour/export_video_dialog.h @@ -75,7 +75,7 @@ private: bool _aborted; bool _normalize; - boost::shared_ptr status; + std::shared_ptr status; TimeSelection _export_range; sigc::connection _audio_progress_connection; diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc index 7590602df2..9c1dda82df 100644 --- a/gtk2_ardour/foldback_strip.cc +++ b/gtk2_ardour/foldback_strip.cc @@ -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 snd, boost::shared_ptr sr, boost::shared_ptr fr, uint32_t wd) +FoldbackSend::FoldbackSend (std::shared_ptr snd, std::shared_ptr sr, std::shared_ptr fr, uint32_t wd) : _button (ArdourButton::led_default_elements) , _send (snd) , _send_route (sr) @@ -71,7 +71,7 @@ FoldbackSend::FoldbackSend (boost::shared_ptr snd, boost::shared_ptrget_max_gain ()), 0, 1, 0.01, 0.1) - , _slider (&_adjustment, boost::shared_ptr (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ()))) + , _slider (&_adjustment, std::shared_ptr (), 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 snd, boost::shared_ptrinput ()->n_ports ().n_audio () == 2) { _button.set_layout_ellipsize_width (PX_SCALE (_width - 19) * PANGO_SCALE); - boost::shared_ptr pannable = _send->panner ()->pannable (); + std::shared_ptr 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 snd, boost::shared_ptrpan_azimuth_control); _pan_control.set_name (_send->panner_linked_to_route () ? "trim knob" : "pan knob"); } - boost::shared_ptr lc; + std::shared_ptr lc; lc = _send->gain_control (); _slider.set_controllable (lc); _slider.set_name ("ProcessorControlSlider"); @@ -131,13 +131,13 @@ FoldbackSend::FoldbackSend (boost::shared_ptr snd, boost::shared_ptr ()); - _pan_control.set_controllable (boost::shared_ptr ()); - _send = boost::shared_ptr (); - _send_route = boost::shared_ptr (); - _foldback_route = boost::shared_ptr (); - _send_proc = boost::shared_ptr (); - _send_del = boost::shared_ptr (); + _slider.set_controllable (std::shared_ptr ()); + _pan_control.set_controllable (std::shared_ptr ()); + _send = std::shared_ptr (); + _send_route = std::shared_ptr (); + _foldback_route = std::shared_ptr (); + _send_proc = std::shared_ptr (); + _send_del = std::shared_ptr (); } void @@ -221,7 +221,7 @@ FoldbackSend::send_state_changed () void FoldbackSend::send_pan_changed () { - boost::shared_ptr pannable = _send->panner ()->pannable (); + std::shared_ptr 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 lc = _send->gain_control (); + std::shared_ptr lc = _send->gain_control (); if (!lc) { return; @@ -244,7 +244,7 @@ FoldbackSend::level_adjusted () void FoldbackSend::level_changed () { - boost::shared_ptr lc = _send->gain_control (); + std::shared_ptr lc = _send->gain_control (); if (!lc) { return; } @@ -263,7 +263,7 @@ FoldbackSend::level_changed () void FoldbackSend::set_tooltip () { - boost::shared_ptr lc = _send->gain_control (); + std::shared_ptr 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 lc = _send->gain_control (); + std::shared_ptr 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 new_snd_rt = _send_route; - boost::shared_ptr new_fb_rt = _foldback_route; + std::shared_ptr new_snd_rt = _send_route; + std::shared_ptr 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 = _send_del->panner ()->pannable (); - boost::shared_ptr ac; + std::shared_ptr pannable = _send_del->panner ()->pannable (); + std::shared_ptr 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 snd = new_snd_rt->internal_send_for (new_fb_rt); + std::shared_ptr snd = new_snd_rt->internal_send_for (new_fb_rt); if (snd) { snd->gain_control ()->set_value (new_level, Controllable::NoGroup); - boost::shared_ptr snd_proc = boost::dynamic_pointer_cast (snd); + std::shared_ptr snd_proc = std::dynamic_pointer_cast (snd); snd_proc->enable (new_enable); if (is_pan) { - boost::shared_ptr new_del = boost::dynamic_pointer_cast (snd); - boost::shared_ptr pannable = new_del->panner ()->pannable (); - boost::shared_ptr ac; + std::shared_ptr new_del = std::dynamic_pointer_cast (snd); + std::shared_ptr pannable = new_del->panner ()->pannable (); + std::shared_ptr 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 send_proc = boost::dynamic_pointer_cast (_send); + std::shared_ptr send_proc = std::dynamic_pointer_cast (_send); _connections.drop_connections (); _send_route->remove_processor (send_proc); } @@ -372,7 +372,7 @@ FoldbackSend::remove_me () PBD::Signal1 FoldbackStrip::CatchDeletion; -FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt) +FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, std::shared_ptr rt) : SessionHandlePtr (sess) , RouteUI (sess) , _mixer (mx) @@ -573,7 +573,7 @@ FoldbackStrip::name () const } void -FoldbackStrip::set_route (boost::shared_ptr rt) +FoldbackStrip::set_route (std::shared_ptr rt) { if (!rt) { clear_send_box (); @@ -659,7 +659,7 @@ FoldbackStrip::set_route (boost::shared_ptr rt) } struct StripableByPresentationOrder { - bool operator() (const boost::shared_ptr& a, const boost::shared_ptr& b) const + bool operator() (const std::shared_ptr& a, const std::shared_ptr& 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 s_sp = *it; - boost::shared_ptr s_rt = boost::dynamic_pointer_cast (s_sp); - boost::shared_ptr snd = s_rt->internal_send_for (_route); + std::shared_ptr s_sp = *it; + std::shared_ptr s_rt = std::dynamic_pointer_cast (s_sp); + std::shared_ptr 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 = (*s); + std::shared_ptr 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 previous = boost::shared_ptr (); + std::shared_ptr previous = std::shared_ptr (); _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 s) +FoldbackStrip::spill_change (std::shared_ptr 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 peak_meter = _route->shared_peak_meter (); + std::shared_ptr 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 slist (new StripableList); + std::shared_ptr 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 rt = boost::dynamic_pointer_cast (*i); + std::shared_ptr rt = std::dynamic_pointer_cast (*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 new_fb; - boost::shared_ptr old_fb = _route; + std::shared_ptr new_fb; + std::shared_ptr 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 old_snd = rt->internal_send_for (old_fb); + std::shared_ptr old_snd = rt->internal_send_for (old_fb); if (old_snd) { - boost::shared_ptr old_proc = old_snd; + std::shared_ptr 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 new_snd = rt->internal_send_for (new_fb); + std::shared_ptr 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 next = boost::shared_ptr (); - boost::shared_ptr old_route = _route; + std::shared_ptr next = std::shared_ptr (); + std::shared_ptr 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 (*s); + next = std::dynamic_pointer_cast (*s); break; } } diff --git a/gtk2_ardour/foldback_strip.h b/gtk2_ardour/foldback_strip.h index 8213978ae5..d86cc6e4c0 100644 --- a/gtk2_ardour/foldback_strip.h +++ b/gtk2_ardour/foldback_strip.h @@ -78,7 +78,7 @@ class ArdourWindow; class FoldbackSend : public Gtk::VBox { public: - FoldbackSend (boost::shared_ptr, boost::shared_ptr sr, boost::shared_ptr fr, uint32_t wd); + FoldbackSend (std::shared_ptr, std::shared_ptr sr, std::shared_ptr fr, uint32_t wd); ~FoldbackSend (); private: @@ -100,11 +100,11 @@ private: Gtk::Menu* build_send_menu (); ArdourWidgets::ArdourButton _button; - boost::shared_ptr _send; - boost::shared_ptr _send_route; - boost::shared_ptr _foldback_route; - boost::shared_ptr _send_proc; - boost::shared_ptr _send_del; + std::shared_ptr _send; + std::shared_ptr _send_route; + std::shared_ptr _foldback_route; + std::shared_ptr _send_proc; + std::shared_ptr _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); + FoldbackStrip (Mixer_UI&, ARDOUR::Session*, std::shared_ptr); ~FoldbackStrip (); std::string name () const; @@ -125,7 +125,7 @@ public: PluginSelector* plugin_selector (); void fast_update (); - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); void set_button_names (); PannerUI& panner_ui () @@ -133,13 +133,13 @@ public: return _panners; } - boost::shared_ptr stripable () const + std::shared_ptr stripable () const { return RouteUI::stripable (); } /** The delivery that we are handling the level for with our fader has changed */ - PBD::Signal1 > DeliveryChanged; + PBD::Signal1 > DeliveryChanged; static PBD::Signal1 CatchDeletion; @@ -176,7 +176,7 @@ private: void update_panner_choices (); void update_output_display (); - void spill_change (boost::shared_ptr); + void spill_change (std::shared_ptr); void route_property_changed (const PBD::PropertyChange&); void presentation_info_changed (PBD::PropertyChange const&); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 87a7e9e0f6..74aa5a4187 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -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(), fader_length, fader_girth)); + gain_slider = manage (new HSliderController (&gain_adjustment, std::shared_ptr(), 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(), fader_length, fader_girth)); + gain_slider = manage (new VSliderController (&gain_adjustment, std::shared_ptr(), fader_length, fader_girth)); gain_slider->set_tweaks (ArdourFader::NoButtonForward); } @@ -224,10 +224,10 @@ GainMeterBase::~GainMeterBase () } void -GainMeterBase::set_controls (boost::shared_ptr r, - boost::shared_ptr pm, - boost::shared_ptr amp, - boost::shared_ptr control) +GainMeterBase::set_controls (std::shared_ptr r, + std::shared_ptr pm, + std::shared_ptr amp, + std::shared_ptr control) { connections.clear (); model_connections.drop_connections (); @@ -236,7 +236,7 @@ GainMeterBase::set_controls (boost::shared_ptr r, if (!pm && !control) { level_meter->set_meter (0); - gain_slider->set_controllable (boost::shared_ptr()); + gain_slider->set_controllable (std::shared_ptr()); _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 r, - boost::shared_ptr meter, - boost::shared_ptr amp, - boost::shared_ptr control) +GainMeter::set_controls (std::shared_ptr r, + std::shared_ptr meter, + std::shared_ptr amp, + std::shared_ptr control) { if (meter_hbox.get_parent()) { hbox.remove (meter_hbox); @@ -1095,13 +1095,13 @@ GainMeter::on_style_changed (const Glib::RefPtr&) peak_display.queue_draw(); } -boost::shared_ptr +std::shared_ptr GainMeterBase::get_controllable() { if (_amp) { return _control; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -1124,8 +1124,8 @@ GainMeter::meter_configuration_changed (ChanCount c) } } - bool is_audio_track = _route && boost::dynamic_pointer_cast(_route) != 0; - bool is_midi_track = _route && boost::dynamic_pointer_cast(_route) != 0; + bool is_audio_track = _route && std::dynamic_pointer_cast(_route) != 0; + bool is_midi_track = _route && std::dynamic_pointer_cast(_route) != 0; if (!is_audio_track && (is_midi_track || /* MIDI Bus */ (type == (1 << DataType::MIDI)))) { if (!_route || _route->active()) { diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 9e42be827e..2e1aa87997 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -80,10 +80,10 @@ public: GainMeterBase (ARDOUR::Session*, bool horizontal, int, int); virtual ~GainMeterBase (); - virtual void set_controls (boost::shared_ptr route, - boost::shared_ptr meter, - boost::shared_ptr amp, - boost::shared_ptr control); + virtual void set_controls (std::shared_ptr route, + std::shared_ptr meter, + std::shared_ptr amp, + std::shared_ptr control); void update_gain_sensitive (); void update_meters (); @@ -101,7 +101,7 @@ public: virtual void setup_meters (int len=0); - boost::shared_ptr get_controllable(); + std::shared_ptr 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 _route; - boost::shared_ptr _meter; - boost::shared_ptr _amp; - boost::shared_ptr _control; + std::shared_ptr _route; + std::shared_ptr _meter; + std::shared_ptr _amp; + std::shared_ptr _control; std::vector 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 route, - boost::shared_ptr meter, - boost::shared_ptr amp, - boost::shared_ptr control); + virtual void set_controls (std::shared_ptr route, + std::shared_ptr meter, + std::shared_ptr amp, + std::shared_ptr control); int get_gm_width (); void setup_meters (int len=0); diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 254795e953..128c91a3b7 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -84,7 +84,7 @@ using namespace ArdourWidgets; using namespace Gtk; using namespace ARDOUR_UI_UTILS; -GenericPluginUI::GenericPluginUI (boost::shared_ptr pib, bool scrollable) +GenericPluginUI::GenericPluginUI (std::shared_ptr pib, bool scrollable) : PlugUIBase (pib) , automation_menu (0) , is_scrollable(scrollable) @@ -172,7 +172,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pib, bool sc continue; } const Evoral::Parameter param(PluginAutomation, 0, i); - boost::shared_ptr c (boost::dynamic_pointer_cast(_pib->control (param))); + std::shared_ptr c (std::dynamic_pointer_cast(_pib->control (param))); if (!c) { continue; } @@ -202,7 +202,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr 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(_pi)), gui_context()); + _pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, std::weak_ptr(_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 c (boost::dynamic_pointer_cast(_pib->control (param))); + std::shared_ptr c (std::dynamic_pointer_cast(_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 c (boost::dynamic_pointer_cast(_pib->control (param))); + std::shared_ptr c (std::dynamic_pointer_cast(_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 cns = + std::shared_ptr 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 (_pi->owner()) : NULL; if (mt) { /* send to track */ - boost::shared_ptr bank_msb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); - boost::shared_ptr bank_lsb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); - boost::shared_ptr program = mt->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true); + std::shared_ptr bank_msb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); + std::shared_ptr bank_lsb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); + std::shared_ptr 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 mcontrol, + std::shared_ptr mcontrol, float value, bool is_input, bool use_knob) @@ -1292,7 +1292,7 @@ GenericPluginUI::output_update () for (vector::iterator i = output_controls.begin(); i != output_controls.end(); ++i) { float val = plugin->get_parameter ((*i)->parameter().id()); char buf[32]; - boost::shared_ptr c = _pib->control_output ((*i)->parameter().id()); + std::shared_ptr 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'; diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index f1d173c338..f9cf876817 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -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 note = i->first; + std::shared_ptr 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 parent) +MidiGhostRegion::find_event (std::shared_ptr parent) { /* we are using _optimization_iterator to speed up the common case where a caller is going through our notes in order. diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index 6fbd7258be..d5ea845448 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -134,9 +134,9 @@ private: MidiRegionView& parent_mrv; typedef Evoral::Note NoteType; - MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr); + MidiGhostRegion::GhostEvent* find_event (std::shared_ptr); - typedef boost::unordered_map, MidiGhostRegion::GhostEvent* > EventList; + typedef boost::unordered_map, MidiGhostRegion::GhostEvent* > EventList; EventList events; EventList::iterator _optimization_iterator; }; diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index aa16b4a29c..7962276715 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -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 p = _session->engine().get_port_by_name (*i); - boost::shared_ptr q = _session->engine().get_port_by_name (*j); + std::shared_ptr p = _session->engine().get_port_by_name (*i); + std::shared_ptr 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 p = AudioEngine::instance()->get_port_by_name (*i); - boost::shared_ptr q = AudioEngine::instance()->get_port_by_name (*j); + std::shared_ptr p = AudioEngine::instance()->get_port_by_name (*i); + std::shared_ptr q = AudioEngine::instance()->get_port_by_name (*j); if (!p && !q) { /* two non-Ardour ports; things are slightly more involved */ diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index bb142a75f0..141aa45d14 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -218,7 +218,7 @@ GroupTabs::on_button_release_event (GdkEventButton*) if (_dragging_new_tab) { run_new_group_dialog (&routes, false); } else { - boost::shared_ptr r = _session->get_routes (); + std::shared_ptr 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 rl = g->route_list(); + std::shared_ptr 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 master; + std::shared_ptr 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 master = _session->vca_manager().vca_by_number (which); + std::shared_ptr 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 master; + std::shared_ptr master; bool set_name = false; if (which == 0) { @@ -584,10 +584,10 @@ GroupTabs::get_rec_enabled () return rec_enabled; } - boost::shared_ptr rl = _session->get_routes (); + std::shared_ptr rl = _session->get_routes (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr trk (boost::dynamic_pointer_cast (*i)); + std::shared_ptr trk (std::dynamic_pointer_cast (*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 group_routes = g->route_list (); + std::shared_ptr 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 rl (g->route_list ()); + std::shared_ptr 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 w) +GroupTabs::route_added_to_route_group (RouteGroup*, std::weak_ptr w) { /* Similarly-spirited hack as in route_group_property_changed */ - boost::shared_ptr r = w.lock (); + std::shared_ptr r = w.lock (); if (!r) { return; } @@ -890,11 +890,11 @@ GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) } void -GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w) +GroupTabs::route_removed_from_route_group (RouteGroup*, std::weak_ptr w) { /* Similarly-spirited hack as in route_group_property_changed */ - boost::shared_ptr r = w.lock (); + std::shared_ptr r = w.lock (); if (!r) { return; } @@ -905,7 +905,7 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w } void -GroupTabs::emit_gui_changed_for_members (boost::shared_ptr rl) +GroupTabs::emit_gui_changed_for_members (std::shared_ptr rl) { PresentationInfo::ChangeSuspender cs; diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index b883a97902..29656cf247 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -81,7 +81,7 @@ protected: }; private: - static void emit_gui_changed_for_members (boost::shared_ptr); + static void emit_gui_changed_for_members (std::shared_ptr); /** Compute all the tabs for this widget. * @return Tabs. @@ -136,8 +136,8 @@ private: Tab * click_to_tab (double, std::list::iterator *, std::list::iterator *); void route_group_property_changed (ARDOUR::RouteGroup *); - void route_added_to_route_group (ARDOUR::RouteGroup *, boost::weak_ptr); - void route_removed_from_route_group (ARDOUR::RouteGroup *, boost::weak_ptr); + void route_added_to_route_group (ARDOUR::RouteGroup *, std::weak_ptr); + void route_removed_from_route_group (ARDOUR::RouteGroup *, std::weak_ptr); 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; diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc index 643770b44a..434efe24db 100644 --- a/gtk2_ardour/hit.cc +++ b/gtk2_ardour/hit.cc @@ -29,7 +29,7 @@ using namespace ARDOUR; using namespace ArdourCanvas; -Hit::Hit (MidiRegionView& region, Item* parent, double size, const boost::shared_ptr note, bool with_events) +Hit::Hit (MidiRegionView& region, Item* parent, double size, const std::shared_ptr note, bool with_events) : NoteBase (region, with_events, note) { _polygon = new ArdourCanvas::Polygon (parent); diff --git a/gtk2_ardour/hit.h b/gtk2_ardour/hit.h index b12e68e7a6..6dbbda5954 100644 --- a/gtk2_ardour/hit.h +++ b/gtk2_ardour/hit.h @@ -35,7 +35,7 @@ public: Hit (MidiRegionView& region, ArdourCanvas::Item* parent, double size, - const boost::shared_ptr note = boost::shared_ptr(), + const std::shared_ptr note = std::shared_ptr(), bool with_events = true); ~Hit(); diff --git a/gtk2_ardour/io_button.cc b/gtk2_ardour/io_button.cc index 01da51130a..b4c0515720 100644 --- a/gtk2_ardour/io_button.cc +++ b/gtk2_ardour/io_button.cc @@ -54,7 +54,7 @@ IOButtonBase::maybe_update (PropertyChange const& what_changed) } static bool -exclusively_connected (boost::shared_ptr dest_io, boost::shared_ptr io, DataType dt, uint32_t tcnt, std::string const& name, ostringstream& label) +exclusively_connected (std::shared_ptr dest_io, std::shared_ptr 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 dest_io, boost::shared_ptr io, } DataType -IOButtonBase::guess_main_type (boost::shared_ptr io) +IOButtonBase::guess_main_type (std::shared_ptr 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) * '-----------------------------------------------' */ void -IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, boost::shared_ptr& bndl, boost::shared_ptr io) +IOButtonBase::set_label (IOButtonBase& self, ARDOUR::Session& session, std::shared_ptr& bndl, std::shared_ptr 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 routes = session.get_routes (); + std::shared_ptr routes = session.get_routes (); for (auto const& route : *routes) { - boost::shared_ptr dest_io = input ? route->output () : route->input (); + std::shared_ptr 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 bundles = session.bundles (); - boost::shared_ptr ap = boost::dynamic_pointer_cast (session.vkbd_output_port ()); + std::shared_ptr bundles = session.bundles (); + std::shared_ptr ap = std::dynamic_pointer_cast (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 (bundle) == 0) { + if (std::dynamic_pointer_cast (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 i = input ? iop->output () : iop->input (); + std::shared_ptr 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 rt, RouteUI* routeui) +IOButton::set_route (std::shared_ptr rt, RouteUI* routeui) { _connections.drop_connections (); _bundle_connections.drop_connections (); @@ -457,16 +457,16 @@ IOButton::~IOButton () { } -boost::shared_ptr +std::shared_ptr IOButton::io () const { return _input ? _route->input () : _route->output (); } -boost::shared_ptr +std::shared_ptr IOButton::track () const { - return boost::dynamic_pointer_cast (_route); + return std::dynamic_pointer_cast (_route); } void @@ -478,10 +478,10 @@ IOButton::port_pretty_name_changed (std::string pn) } void -IOButton::port_connected_or_disconnected (boost::weak_ptr wa, boost::weak_ptr wb) +IOButton::port_connected_or_disconnected (std::weak_ptr wa, std::weak_ptr wb) { - boost::shared_ptr a = wa.lock (); - boost::shared_ptr b = wb.lock (); + std::shared_ptr a = wa.lock (); + std::shared_ptr 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 wa, boost::weak_ } void -IOButton::bundle_chosen (boost::shared_ptr c) +IOButton::bundle_chosen (std::shared_ptr 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 a, boost::shared_ptr b) + bool operator() (std::shared_ptr a, std::shared_ptr 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 b = _route->session ().bundles (); + std::shared_ptr 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 (*i)) { + if (std::dynamic_pointer_cast (*i)) { maybe_add_bundle_to_menu (*i, current); } } for (ARDOUR::BundleList::iterator i = b->begin (); i != b->end (); ++i) { - if (boost::dynamic_pointer_cast (*i) == 0) { + if (std::dynamic_pointer_cast (*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 master = _route->session ().master_out (); + std::shared_ptr master = _route->session ().master_out (); if (master) { maybe_add_bundle_to_menu (master->input ()->bundle (), current, intended_type); } } - boost::shared_ptr routes = _route->session ().get_routes (); + std::shared_ptr 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 (*i)) { + if (std::dynamic_pointer_cast (*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 (*i) == 0) { + if (std::dynamic_pointer_cast (*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 bundle; + std::shared_ptr 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 b, ARDOUR::BundleList const& /*current*/, ARDOUR::DataType type) +IOButton::maybe_add_bundle_to_menu (std::shared_ptr 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 b, ARDOUR::BundleL } /* Don't add the monitor input unless we are Master */ - boost::shared_ptr monitor = _route->session ().monitor_out (); + std::shared_ptr 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 b, ARDOUR::BundleL } /* Avoid adding duplicates */ - list>::iterator i = _menu_bundles.begin (); + list>::iterator i = _menu_bundles.begin (); while (i != _menu_bundles.end () && b->has_same_ports (*i) == false) { ++i; } diff --git a/gtk2_ardour/io_button.h b/gtk2_ardour/io_button.h index 7d6466f3fb..4cc87abfb7 100644 --- a/gtk2_ardour/io_button.h +++ b/gtk2_ardour/io_button.h @@ -52,8 +52,8 @@ public: virtual ~IOButtonBase () {} protected: - static void set_label (IOButtonBase&, ARDOUR::Session&, boost::shared_ptr&, boost::shared_ptr); - static ARDOUR::DataType guess_main_type (boost::shared_ptr); + static void set_label (IOButtonBase&, ARDOUR::Session&, std::shared_ptr&, std::shared_ptr); + static ARDOUR::DataType guess_main_type (std::shared_ptr); 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, RouteUI*); + void set_route (std::shared_ptr, 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, boost::weak_ptr); - void maybe_add_bundle_to_menu (boost::shared_ptr, ARDOUR::BundleList const&, ARDOUR::DataType = ARDOUR::DataType::NIL); + void port_connected_or_disconnected (std::weak_ptr, std::weak_ptr); + void maybe_add_bundle_to_menu (std::shared_ptr, ARDOUR::BundleList const&, ARDOUR::DataType = ARDOUR::DataType::NIL); void disconnect (); void add_port (ARDOUR::DataType); - void bundle_chosen (boost::shared_ptr); + void bundle_chosen (std::shared_ptr); - boost::shared_ptr io () const; - boost::shared_ptr track () const; + std::shared_ptr io () const; + std::shared_ptr track () const; bool _input; - boost::shared_ptr _route; + std::shared_ptr _route; RouteUI* _route_ui; Gtk::Menu _menu; - std::list > _menu_bundles; + std::list > _menu_bundles; }; #endif diff --git a/gtk2_ardour/io_plugin_window.cc b/gtk2_ardour/io_plugin_window.cc index 24d3c6b1ab..36c4c28e59 100644 --- a/gtk2_ardour/io_plugin_window.cc +++ b/gtk2_ardour/io_plugin_window.cc @@ -125,7 +125,7 @@ IOPluginWindow::refill () if (!_session) { return; } - boost::shared_ptr iop (_session->io_plugs ()); + std::shared_ptr 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 (new IOPlug (*_session, *p, _is_pre))); + _session->load_io_plugin (std::shared_ptr (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 (new IOPlug (*_session, p, _is_pre))); + _session->load_io_plugin (std::shared_ptr (new IOPlug (*_session, p, _is_pre))); } bool @@ -235,7 +235,7 @@ IOPluginWindow::PluginBox::drag_data_received (Glib::RefPtr co for (auto const& i : nfos) { PluginPtr p = i->load (*_session); if (p) { - _session->load_io_plugin (boost::shared_ptr (new IOPlug (*_session, p, _is_pre))); + _session->load_io_plugin (std::shared_ptr (new IOPlug (*_session, p, _is_pre))); } } @@ -260,7 +260,7 @@ IOPluginWindow::PluginBox::drag_data_received (Glib::RefPtr co /* ****************************************************************************/ -IOPluginWindow::IOPlugUI::IOPlugUI (boost::shared_ptr iop) +IOPluginWindow::IOPlugUI::IOPlugUI (std::shared_ptr 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 plugin) +IOPluginWindow::PluginWindowProxy::PluginWindowProxy (std::string const& name, std::weak_ptr plugin) : WM::ProxyBase (name, std::string ()) , _pib (plugin) , _is_custom (true) , _want_custom (true) { - boost::shared_ptr p = _pib.lock (); + std::shared_ptr p = _pib.lock (); if (!p) { return; } @@ -394,7 +394,7 @@ IOPluginWindow::PluginWindowProxy::~PluginWindowProxy () Gtk::Window* IOPluginWindow::PluginWindowProxy::get (bool create) { - boost::shared_ptr p = _pib.lock (); + std::shared_ptr 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 iop = boost::dynamic_pointer_cast (p); + std::shared_ptr iop = std::dynamic_pointer_cast (p); assert (iop); _window->set_title (iop->name ()); setup (); @@ -478,7 +478,7 @@ IOPluginWindow::PluginWindowProxy::plugin_going_away () /* ****************************************************************************/ -IOPluginWindow::IOButton::IOButton (boost::shared_ptr io, bool pre) +IOPluginWindow::IOButton::IOButton (std::shared_ptr 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 wa, boost::weak_ptr wb) +IOPluginWindow::IOButton::port_connected_or_disconnected (std::weak_ptr wa, std::weak_ptr wb) { - boost::shared_ptr a = wa.lock (); - boost::shared_ptr b = wb.lock (); + std::shared_ptr a = wa.lock (); + std::shared_ptr 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 bundle; + std::shared_ptr 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 a, boost::shared_ptr b) + bool operator() (std::shared_ptr a, std::shared_ptr 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 b = _io->session ().bundles (); - boost::shared_ptr routes = _io->session ().get_routes (); + std::shared_ptr b = _io->session ().bundles (); + std::shared_ptr 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 (i)) { + if (std::dynamic_pointer_cast (i)) { maybe_add_bundle_to_menu (i); } } for (auto const& i : *b) { - if (boost::dynamic_pointer_cast (i) == 0) { + if (std::dynamic_pointer_cast (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 (i)) { + if (std::dynamic_pointer_cast (i)) { maybe_add_bundle_to_menu (i); } } for (auto const& i : *b) { - if (boost::dynamic_pointer_cast (i) == 0) { + if (std::dynamic_pointer_cast (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 c) +IOPluginWindow::IOButton::bundle_chosen (std::shared_ptr c) { _io->connect_ports_to_bundle (c, true, this); } void -IOPluginWindow::IOButton::maybe_add_bundle_to_menu (boost::shared_ptr b) +IOPluginWindow::IOButton::maybe_add_bundle_to_menu (std::shared_ptr b) { using namespace Menu_Helpers; diff --git a/gtk2_ardour/io_plugin_window.h b/gtk2_ardour/io_plugin_window.h index 388f710c8e..683357daec 100644 --- a/gtk2_ardour/io_plugin_window.h +++ b/gtk2_ardour/io_plugin_window.h @@ -51,7 +51,7 @@ public: class PluginWindowProxy : public WM::ProxyBase { public: - PluginWindowProxy (std::string const&, boost::weak_ptr); + PluginWindowProxy (std::string const&, std::weak_ptr); ~PluginWindowProxy (); Gtk::Window* get (bool create = false); @@ -73,7 +73,7 @@ public: private: void plugin_going_away (); - boost::weak_ptr _pib; + std::weak_ptr _pib; bool _is_custom; bool _want_custom; @@ -108,7 +108,7 @@ private: class IOButton : public IOButtonBase { public: - IOButton (boost::shared_ptr, bool pre); + IOButton (std::shared_ptr, 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, boost::weak_ptr); - void maybe_add_bundle_to_menu (boost::shared_ptr); + void port_connected_or_disconnected (std::weak_ptr, std::weak_ptr); + void maybe_add_bundle_to_menu (std::shared_ptr); void disconnect (); - void bundle_chosen (boost::shared_ptr); + void bundle_chosen (std::shared_ptr); void edit_io_configuration (); - boost::shared_ptr _io; + std::shared_ptr _io; bool _pre; Gtk::Menu _menu; IOSelectorWindow* _io_selector; @@ -132,7 +132,7 @@ private: class IOPlugUI : public Gtk::Alignment { public: - IOPlugUI (boost::shared_ptr); + IOPlugUI (std::shared_ptr); private: bool button_press_event (GdkEventButton*); @@ -147,7 +147,7 @@ private: IOButton _btn_output; ArdourWidgets::ArdourButton _btn_ioplug; PluginWindowProxy* _window_proxy; - boost::shared_ptr _iop; + std::shared_ptr _iop; PBD::ScopedConnection _going_away_connection; }; diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index ab4a4d65f0..4f671074e4 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -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 io) +IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, std::shared_ptr 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 f = _session->engine().get_port_by_name (*i); + std::shared_ptr 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 f = _session->engine().get_port_by_name (*i); + std::shared_ptr 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 io, bool /*can_cancel*/) +IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, std::shared_ptr io, bool /*can_cancel*/) : ArdourWindow (_("I/O selector")) , _selector (this, session, io) { diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h index fb1fa020f4..8468790e79 100644 --- a/gtk2_ardour/io_selector.h +++ b/gtk2_ardour/io_selector.h @@ -29,7 +29,7 @@ class IOSelector : public PortMatrix { public: - IOSelector (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr); + IOSelector (Gtk::Window*, ARDOUR::Session *, std::shared_ptr); void set_state (ARDOUR::BundleChannel c[2], bool); PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const; @@ -40,7 +40,7 @@ public: ARDOUR::Session* session() const { return _session; } uint32_t n_io_ports () const; - boost::shared_ptr const io () { return _io; } + std::shared_ptr const io () { return _io; } void setup_ports (int); bool list_is_global (int) const; @@ -64,8 +64,8 @@ private: int _other; int _ours; - boost::shared_ptr _io; - boost::shared_ptr _port_group; + std::shared_ptr _io; + std::shared_ptr _port_group; bool _find_inputs_for_io_outputs; PBD::ScopedConnection _io_connection; }; @@ -73,7 +73,7 @@ private: class IOSelectorWindow : public ArdourWindow { public: - IOSelectorWindow (ARDOUR::Session *, boost::shared_ptr, bool can_cancel = false); + IOSelectorWindow (ARDOUR::Session *, std::shared_ptr, bool can_cancel = false); IOSelector& selector() { return _selector; } diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h index c6052c214f..838e01d848 100644 --- a/gtk2_ardour/latency_gui.h +++ b/gtk2_ardour/latency_gui.h @@ -69,7 +69,7 @@ class LatencyBarController : public ArdourWidgets::BarController { public: LatencyBarController (Gtk::Adjustment& adj, LatencyGUI* g) - : BarController (adj, boost::shared_ptr (new LatencyGUIControllable (g))) + : BarController (adj, std::shared_ptr (new LatencyGUIControllable (g))) , _latency_gui (g) { set_digits (0); diff --git a/gtk2_ardour/loudness_dialog.cc b/gtk2_ardour/loudness_dialog.cc index 3a2732da9a..b2167a72fd 100644 --- a/gtk2_ardour/loudness_dialog.cc +++ b/gtk2_ardour/loudness_dialog.cc @@ -442,9 +442,9 @@ LoudnessDialog::analyze () ExportTimespanPtr tsp = _session->get_export_handler ()->add_timespan (); - boost::shared_ptr ccp = _session->get_export_handler ()->add_channel_config (); - boost::shared_ptr fnp = _session->get_export_handler ()->add_filename (); - boost::shared_ptr fmp = _session->get_export_handler ()->add_format (); + std::shared_ptr ccp = _session->get_export_handler ()->add_channel_config (); + std::shared_ptr fnp = _session->get_export_handler ()->add_filename (); + std::shared_ptr fmp = _session->get_export_handler ()->add_format (); /* setup format */ fmp->set_sample_format (ExportFormatBase::SF_Float); @@ -470,7 +470,7 @@ LoudnessDialog::analyze () } /* do audio export */ - boost::shared_ptr b; + std::shared_ptr b; _session->get_export_handler ()->reset (); _session->get_export_handler ()->add_export_config (tsp, ccp, fmp, fnp, b); _session->get_export_handler ()->do_export (); diff --git a/gtk2_ardour/loudness_dialog.h b/gtk2_ardour/loudness_dialog.h index eb6c0e20d7..6c525111b6 100644 --- a/gtk2_ardour/loudness_dialog.h +++ b/gtk2_ardour/loudness_dialog.h @@ -75,7 +75,7 @@ private: void test_conformity (); - void plot_graph (boost::shared_ptr); + void plot_graph (std::shared_ptr); void graph_size_request (Gtk::Requisition*); bool graph_expose_event (GdkEventExpose*); @@ -87,7 +87,7 @@ private: ARDOUR::Session* _session; ARDOUR::TimelineRange const& _range; - boost::shared_ptr _status; + std::shared_ptr _status; bool _autostart; Gtk::VBox _setup_box; diff --git a/gtk2_ardour/loudness_settings.cc b/gtk2_ardour/loudness_settings.cc index a129f32dfc..7d56c383bc 100644 --- a/gtk2_ardour/loudness_settings.cc +++ b/gtk2_ardour/loudness_settings.cc @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include + #include #include "pbd/gstdio_compat.h" diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc index 5d0b32869e..3ff8a65338 100644 --- a/gtk2_ardour/luadialog.cc +++ b/gtk2_ardour/luadialog.cc @@ -248,7 +248,7 @@ public: : LuaDialogWidget (key, title) , _db_adjustment (ARDOUR::gain_to_slider_position_with_max (1.0, ARDOUR::Config->get_max_gain ()), 0, 1, 0.01, 0.1) { - _db_slider = Gtk::manage (new ArdourWidgets::HSliderController (&_db_adjustment, boost::shared_ptr (), 220, 18)); + _db_slider = Gtk::manage (new ArdourWidgets::HSliderController (&_db_adjustment, std::shared_ptr (), 220, 18)); _fader_centering_box.pack_start (*_db_slider, true, false); diff --git a/gtk2_ardour/luainstance.h b/gtk2_ardour/luainstance.h index fe3b65f015..d77b0e2563 100644 --- a/gtk2_ardour/luainstance.h +++ b/gtk2_ardour/luainstance.h @@ -96,7 +96,7 @@ private: template void proxy_4 (enum LuaSignal::LuaSignal, T, C1, C2, C3, C4); }; -typedef boost::shared_ptr LuaCallbackPtr; +typedef std::shared_ptr LuaCallbackPtr; typedef std::map LuaCallbackMap; diff --git a/gtk2_ardour/luawindow.h b/gtk2_ardour/luawindow.h index 787c21dec8..d049cc77be 100644 --- a/gtk2_ardour/luawindow.h +++ b/gtk2_ardour/luawindow.h @@ -107,7 +107,7 @@ private: ArdourWidgets::ArdourDropdown script_select; - typedef boost::shared_ptr ScriptBufferPtr; + typedef std::shared_ptr ScriptBufferPtr; typedef std::vector ScriptBufferList; ScriptBufferList script_buffers; diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index a8c41ad614..1455c603d7 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -64,7 +64,7 @@ LV2PluginUI::write_from_ui(void* controller, return; } - boost::shared_ptr ac = me->_controllables[port_index]; + std::shared_ptr ac = me->_controllables[port_index]; me->_updates.insert (port_index); @@ -75,7 +75,7 @@ LV2PluginUI::write_from_ui(void* controller, const int cnt = me->_pib->get_count(); for (int i=0; i < cnt; i++ ) { - boost::shared_ptr lv2i = boost::dynamic_pointer_cast (me->_pib->plugin(i)); + std::shared_ptr lv2i = std::dynamic_pointer_cast (me->_pib->plugin(i)); lv2i->write_from_ui(port_index, format, buffer_size, (const uint8_t*)buffer); } } @@ -296,8 +296,8 @@ LV2PluginUI::output_update() _updates.clear (); } -LV2PluginUI::LV2PluginUI(boost::shared_ptr pib, - boost::shared_ptr lv2p) +LV2PluginUI::LV2PluginUI(std::shared_ptr pib, + std::shared_ptr lv2p) : PlugUIBase(pib) , _pib(pib) , _lv2(lv2p) @@ -472,7 +472,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) */ _values_last_sent_to_ui[port] = _lv2->get_parameter(port); - _controllables[port] = boost::dynamic_pointer_cast ( + _controllables[port] = std::dynamic_pointer_cast ( _pib->control(Evoral::Parameter(PluginAutomation, 0, port))); if (_lv2->parameter_is_control(port) && _lv2->parameter_is_input(port)) { diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h index 857e8058fc..7e910c1467 100644 --- a/gtk2_ardour/lv2_plugin_ui.h +++ b/gtk2_ardour/lv2_plugin_ui.h @@ -51,8 +51,8 @@ namespace ARDOUR { class LV2PluginUI : public PlugUIBase, public Gtk::VBox { public: - LV2PluginUI (boost::shared_ptr, - boost::shared_ptr); + LV2PluginUI (std::shared_ptr, + std::shared_ptr); ~LV2PluginUI (); gint get_preferred_height (); @@ -69,10 +69,10 @@ private: void control_changed (uint32_t); - typedef boost::shared_ptr ControllableRef; + typedef std::shared_ptr ControllableRef; - boost::shared_ptr _pib; - boost::shared_ptr _lv2; + std::shared_ptr _pib; + std::shared_ptr _lv2; std::vector _output_ports; sigc::connection _screen_update_connection; sigc::connection _message_update_connection; diff --git a/gtk2_ardour/lxvst_plugin_ui.cc b/gtk2_ardour/lxvst_plugin_ui.cc index abe45d4592..7f8236609b 100644 --- a/gtk2_ardour/lxvst_plugin_ui.cc +++ b/gtk2_ardour/lxvst_plugin_ui.cc @@ -33,7 +33,7 @@ using namespace Gtk; using namespace ARDOUR; using namespace PBD; -LXVSTPluginUI::LXVSTPluginUI (boost::shared_ptr pib, boost::shared_ptr lxvp) +LXVSTPluginUI::LXVSTPluginUI (std::shared_ptr pib, std::shared_ptr lxvp) : VSTPluginUI (pib, lxvp) { vstfx_run_editor (_vst->state ()); diff --git a/gtk2_ardour/lxvst_plugin_ui.h b/gtk2_ardour/lxvst_plugin_ui.h index 98a4561622..eb68591665 100644 --- a/gtk2_ardour/lxvst_plugin_ui.h +++ b/gtk2_ardour/lxvst_plugin_ui.h @@ -33,7 +33,7 @@ namespace ARDOUR { class LXVSTPluginUI : public VSTPluginUI { public: - LXVSTPluginUI (boost::shared_ptr, boost::shared_ptr); + LXVSTPluginUI (std::shared_ptr, std::shared_ptr); ~LXVSTPluginUI (); int get_preferred_height (); diff --git a/gtk2_ardour/mac_vst_plugin_ui.h b/gtk2_ardour/mac_vst_plugin_ui.h index 7f3e2c62f3..f10bc45308 100644 --- a/gtk2_ardour/mac_vst_plugin_ui.h +++ b/gtk2_ardour/mac_vst_plugin_ui.h @@ -44,7 +44,7 @@ class MacVSTPluginUI; class MacVSTPluginUI : public VSTPluginUI { public: - MacVSTPluginUI (boost::shared_ptr, boost::shared_ptr); + MacVSTPluginUI (std::shared_ptr, std::shared_ptr); ~MacVSTPluginUI (); bool start_updating (GdkEventAny*) { return false; } diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 67a5d2c738..da4647a36d 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -124,7 +124,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt) UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); } -MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) +MeterStrip::MeterStrip (Session* sess, std::shared_ptr rt) : SessionHandlePtr (sess) , RouteUI ((Session*) 0) , _route (rt) @@ -290,7 +290,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) nfo_vbox.show(); namenumberbx.show(); - if (boost::dynamic_pointer_cast(_route)) { + if (std::dynamic_pointer_cast(_route)) { monitor_input_button->show(); monitor_disk_button->show(); } else { @@ -329,12 +329,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) if (_route->is_master()) { _strip_type = 4; } - else if (boost::dynamic_pointer_cast(_route) == 0 - && boost::dynamic_pointer_cast(_route) == 0) { + else if (std::dynamic_pointer_cast(_route) == 0 + && std::dynamic_pointer_cast(_route) == 0) { /* non-master bus */ _strip_type = 3; } - else if (boost::dynamic_pointer_cast(_route)) { + else if (std::dynamic_pointer_cast(_route)) { _strip_type = 2; } else { @@ -475,8 +475,8 @@ MeterStrip::meter_configuration_changed (ChanCount c) } } - bool is_audio_track = _route && boost::dynamic_pointer_cast(_route) != 0; - bool is_midi_track = _route && boost::dynamic_pointer_cast(_route) != 0; + bool is_audio_track = _route && std::dynamic_pointer_cast(_route) != 0; + bool is_midi_track = _route && std::dynamic_pointer_cast(_route) != 0; if (!is_audio_track && (is_midi_track || /* MIDI Bus */ (type == (1 << DataType::MIDI)))) { meter_ticks1_area.set_name ("MidiTrackMetricsLeft"); diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h index 03c454bb7a..ea1b690748 100644 --- a/gtk2_ardour/meter_strip.h +++ b/gtk2_ardour/meter_strip.h @@ -49,18 +49,18 @@ namespace ARDOUR { class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI { public: - MeterStrip (ARDOUR::Session*, boost::shared_ptr); + MeterStrip (ARDOUR::Session*, std::shared_ptr); MeterStrip (int, ARDOUR::MeterType); ~MeterStrip (); std::string name() const; Gdk::Color color () const; - boost::shared_ptr stripable() const { return RouteUI::stripable(); } + std::shared_ptr stripable() const { return RouteUI::stripable(); } void set_session (ARDOUR::Session* s); void fast_update (); - boost::shared_ptr route() { return _route; } + std::shared_ptr route() { return _route; } static PBD::Signal1 CatchDeletion; static PBD::Signal0 MetricChanged; @@ -83,7 +83,7 @@ public: bool selected() const { return false; } protected: - boost::shared_ptr _route; + std::shared_ptr _route; PBD::ScopedConnectionList meter_route_connections; PBD::ScopedConnectionList level_meter_connection; void self_delete (); diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index e62ece8d66..65adca2ce4 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -529,7 +529,7 @@ Meterbridge::add_strips (RouteList& routes) { MeterStrip* strip; for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { - boost::shared_ptr route = (*x); + std::shared_ptr route = (*x); if (route->is_auditioner()) { continue; } @@ -599,8 +599,8 @@ Meterbridge::sync_order_keys () (*i).visible = false; } } - else if (boost::dynamic_pointer_cast((*i).s->route()) == 0 - && boost::dynamic_pointer_cast((*i).s->route()) == 0 + else if (std::dynamic_pointer_cast((*i).s->route()) == 0 + && std::dynamic_pointer_cast((*i).s->route()) == 0 ) { /* non-master bus */ if (_show_busses) { @@ -612,7 +612,7 @@ Meterbridge::sync_order_keys () (*i).visible = false; } } - else if (boost::dynamic_pointer_cast((*i).s->route())) { + else if (std::dynamic_pointer_cast((*i).s->route())) { if (_show_midi) { (*i).s->show(); (*i).visible = true; diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h index 3b1254146f..8f381cd502 100644 --- a/gtk2_ardour/meterbridge.h +++ b/gtk2_ardour/meterbridge.h @@ -96,8 +96,8 @@ private: struct MeterOrderRouteSorter { bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) { - boost::shared_ptr a = ma.s->route(); - boost::shared_ptr b = mb.s->route(); + std::shared_ptr a = ma.s->route(); + std::shared_ptr b = mb.s->route(); if (a->is_master() || a->is_monitor()) { /* "a" is a special route (master, monitor, etc), and comes * last in the mixer ordering diff --git a/gtk2_ardour/midi_automation_line.cc b/gtk2_ardour/midi_automation_line.cc index 8c008d71d0..7fc0ed41cd 100644 --- a/gtk2_ardour/midi_automation_line.cc +++ b/gtk2_ardour/midi_automation_line.cc @@ -35,8 +35,8 @@ MidiAutomationLine::MidiAutomationLine ( const std::string& name, TimeAxisView& tav, ArdourCanvas::Item& parent, - boost::shared_ptr list, - boost::shared_ptr region, + std::shared_ptr list, + std::shared_ptr region, Evoral::Parameter parameter) : AutomationLine (name, tav, parent, list, parameter) , _region (region) @@ -81,7 +81,7 @@ MidiAutomationLine::get_verbose_cursor_string (double fraction) const } const uint8_t channel = mtv->get_preferred_midi_channel(); - boost::shared_ptr value_names = mtv->route()->instrument_info().value_name_list_by_control (channel, _parameter.id()); + std::shared_ptr value_names = mtv->route()->instrument_info().value_name_list_by_control (channel, _parameter.id()); if (!value_names) { return AutomationLine::get_verbose_cursor_string(fraction); @@ -89,7 +89,7 @@ MidiAutomationLine::get_verbose_cursor_string (double fraction) const const uint16_t cc_value = floor(std::max(std::min(fraction * 127.0, 127.0), 0.0)); - boost::shared_ptr value = value_names->max_value_below(cc_value); + std::shared_ptr value = value_names->max_value_below(cc_value); if (!value) { return AutomationLine::get_verbose_cursor_string(fraction); } diff --git a/gtk2_ardour/midi_automation_line.h b/gtk2_ardour/midi_automation_line.h index ebf5d44be4..3e7fc664b1 100644 --- a/gtk2_ardour/midi_automation_line.h +++ b/gtk2_ardour/midi_automation_line.h @@ -31,8 +31,8 @@ class MidiAutomationLine : public AutomationLine { public: MidiAutomationLine (const std::string&, TimeAxisView&, ArdourCanvas::Item&, - boost::shared_ptr, - boost::shared_ptr, + std::shared_ptr, + std::shared_ptr, Evoral::Parameter); MementoCommandBinder* memento_command_binder (); @@ -41,6 +41,6 @@ public: Temporal::timepos_t get_origin() const; private: - boost::shared_ptr _region; + std::shared_ptr _region; Evoral::Parameter _parameter; }; diff --git a/gtk2_ardour/midi_channel_selector.cc b/gtk2_ardour/midi_channel_selector.cc index 58ef463281..99279ab3de 100644 --- a/gtk2_ardour/midi_channel_selector.cc +++ b/gtk2_ardour/midi_channel_selector.cc @@ -327,7 +327,7 @@ MidiMultipleChannelSelector::invert_selection(void) /*-----------------------------------------*/ -MidiChannelSelectorWindow::MidiChannelSelectorWindow (boost::shared_ptr mt) +MidiChannelSelectorWindow::MidiChannelSelectorWindow (std::shared_ptr mt) : ArdourWindow (_("MIDI Channel Control")) , track (mt) , playback_all_button (playback_button_group, _("Playback all channels")) diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h index d4ca76d80f..bc035c8f0d 100644 --- a/gtk2_ardour/midi_channel_selector.h +++ b/gtk2_ardour/midi_channel_selector.h @@ -123,14 +123,14 @@ protected: class MidiChannelSelectorWindow : public ArdourWindow, public PBD::ScopedConnectionList { public: - MidiChannelSelectorWindow (boost::shared_ptr); + MidiChannelSelectorWindow (std::shared_ptr); ~MidiChannelSelectorWindow (); void set_channel_colors (const uint32_t new_channel_colors[16]); void set_default_channel_color(); private: - boost::shared_ptr track; + std::shared_ptr track; std::vector playback_buttons; std::vector capture_buttons; diff --git a/gtk2_ardour/midi_clip_editor.cc b/gtk2_ardour/midi_clip_editor.cc index 8b04125e65..e2301a2962 100644 --- a/gtk2_ardour/midi_clip_editor.cc +++ b/gtk2_ardour/midi_clip_editor.cc @@ -113,7 +113,7 @@ MidiClipEditorBox::set_session (Session* s) } void -MidiClipEditorBox::set_region (boost::shared_ptr r, TriggerReference /*notused*/) +MidiClipEditorBox::set_region (std::shared_ptr r, TriggerReference /*notused*/) { set_session (&r->session ()); diff --git a/gtk2_ardour/midi_clip_editor.h b/gtk2_ardour/midi_clip_editor.h index eec4aeeb55..406dd4f6bf 100644 --- a/gtk2_ardour/midi_clip_editor.h +++ b/gtk2_ardour/midi_clip_editor.h @@ -69,7 +69,7 @@ public: void set_session (ARDOUR::Session*); - void set_region (boost::shared_ptr, ARDOUR::TriggerReference); + void set_region (std::shared_ptr, ARDOUR::TriggerReference); void region_changed (const PBD::PropertyChange& what_changed); private: @@ -80,7 +80,7 @@ private: PBD::ScopedConnection state_connection; - boost::shared_ptr _region; + std::shared_ptr _region; }; #endif /* __midi_region_trimmer_box_h__ */ diff --git a/gtk2_ardour/midi_export_dialog.cc b/gtk2_ardour/midi_export_dialog.cc index 7c16604e87..2aeb97adb0 100644 --- a/gtk2_ardour/midi_export_dialog.cc +++ b/gtk2_ardour/midi_export_dialog.cc @@ -33,7 +33,7 @@ using namespace ARDOUR; -MidiExportDialog::MidiExportDialog (PublicEditor&, boost::shared_ptr region) +MidiExportDialog::MidiExportDialog (PublicEditor&, std::shared_ptr region) : ArdourDialog (string_compose (_("Export MIDI: %1"), region->name())) , file_chooser (Gtk::FILE_CHOOSER_ACTION_SAVE) { diff --git a/gtk2_ardour/midi_export_dialog.h b/gtk2_ardour/midi_export_dialog.h index 11c6fcc5eb..5fb67872e4 100644 --- a/gtk2_ardour/midi_export_dialog.h +++ b/gtk2_ardour/midi_export_dialog.h @@ -30,7 +30,7 @@ class MidiExportDialog : public ArdourDialog { public: - MidiExportDialog (PublicEditor& editor, boost::shared_ptr); + MidiExportDialog (PublicEditor& editor, std::shared_ptr); ~MidiExportDialog (); void set_session (ARDOUR::Session*); diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc index dc56bff41a..e5950f1b07 100644 --- a/gtk2_ardour/midi_list_editor.cc +++ b/gtk2_ardour/midi_list_editor.cc @@ -64,7 +64,7 @@ fill_note_length_map () note_length_map.insert (make_pair (Temporal::ticks_per_beat/64, _("Sixty-fourth"))); } -MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr r, boost::shared_ptr tr) +MidiListEditor::MidiListEditor (Session* s, std::shared_ptr r, std::shared_ptr tr) : ArdourWindow (r->name()) , buttons (1, 1) , region (r) @@ -270,7 +270,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) if (apply) { - boost::shared_ptr m (region->midi_source(0)->model()); + std::shared_ptr m (region->midi_source(0)->model()); MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (opname); vector previous_selection; @@ -280,7 +280,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows (); TreeModel::iterator iter; - boost::shared_ptr note; + std::shared_ptr note; for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { @@ -330,7 +330,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev) previous_selection.push_back (path); if (iter) { - boost::shared_ptr note = (*iter)[columns._note]; + std::shared_ptr note = (*iter)[columns._note]; switch (prop) { case MidiModel::NoteDiffCommand::StartTime: @@ -450,9 +450,9 @@ MidiListEditor::key_release (GdkEventKey* ev) TreeViewColumn* col; TreeModel::iterator iter; MidiModel::NoteDiffCommand* cmd; - boost::shared_ptr m (region->midi_source(0)->model()); - boost::shared_ptr note; - boost::shared_ptr copy; + std::shared_ptr m (region->midi_source(0)->model()); + std::shared_ptr note; + std::shared_ptr copy; switch (ev->keyval) { case GDK_Insert: @@ -512,19 +512,19 @@ MidiListEditor::delete_selected_note () return; } - typedef vector > Notes; + typedef vector > Notes; Notes to_delete; for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { TreeIter iter; if ((iter = model->get_iter (*i))) { - boost::shared_ptr note = (*iter)[columns._note]; + std::shared_ptr note = (*iter)[columns._note]; to_delete.push_back (note); } } - boost::shared_ptr m (region->midi_source(0)->model()); + std::shared_ptr m (region->midi_source(0)->model()); MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (_("delete notes (from list)")); for (Notes::iterator i = to_delete.begin(); i != to_delete.end(); ++i) { @@ -583,7 +583,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text) return; } - boost::shared_ptr note = (*iter)[columns._note]; + std::shared_ptr note = (*iter)[columns._note]; MidiModel::NoteDiffCommand::Property prop (MidiModel::NoteDiffCommand::NoteNumber); Temporal::Beats bval; @@ -700,7 +700,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text) if (apply) { - boost::shared_ptr m (region->midi_source(0)->model()); + std::shared_ptr m (region->midi_source(0)->model()); MidiModel::NoteDiffCommand* cmd = m->new_note_diff_command (opname); TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows (); @@ -754,7 +754,7 @@ MidiListEditor::redisplay_model () if (_session) { - boost::shared_ptr m (region->midi_source(0)->model()); + std::shared_ptr m (region->midi_source(0)->model()); TreeModel::Row row; stringstream ss; @@ -806,7 +806,7 @@ MidiListEditor::selection_changed () TreeModel::Path path; TreeModel::iterator iter; - boost::shared_ptr note; + std::shared_ptr note; TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows (); NotePlayer* player = new NotePlayer (track); diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h index 422ba4aba0..adf82aed4e 100644 --- a/gtk2_ardour/midi_list_editor.h +++ b/gtk2_ardour/midi_list_editor.h @@ -46,8 +46,8 @@ class MidiListEditor : public ArdourWindow public: typedef Evoral::Note NoteType; - MidiListEditor(ARDOUR::Session*, boost::shared_ptr, - boost::shared_ptr); + MidiListEditor(ARDOUR::Session*, std::shared_ptr, + std::shared_ptr); ~MidiListEditor(); private: @@ -68,7 +68,7 @@ private: Gtk::TreeModelColumn velocity; Gtk::TreeModelColumn start; Gtk::TreeModelColumn length; - Gtk::TreeModelColumn > _note; + Gtk::TreeModelColumn > _note; }; struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord @@ -95,8 +95,8 @@ private: Gtk::VBox vbox; Gtk::ToggleButton sound_notes_button; - boost::shared_ptr region; - boost::shared_ptr track; + std::shared_ptr region; + std::shared_ptr track; /** connection used to connect to model's ContentChanged signal */ PBD::ScopedConnectionList content_connections; diff --git a/gtk2_ardour/midi_region_properties_box.cc b/gtk2_ardour/midi_region_properties_box.cc index 28675b2652..353e9b8e6f 100644 --- a/gtk2_ardour/midi_region_properties_box.cc +++ b/gtk2_ardour/midi_region_properties_box.cc @@ -76,7 +76,7 @@ MidiRegionPropertiesBox::~MidiRegionPropertiesBox () } void -MidiRegionPropertiesBox::set_region (boost::shared_ptr r) +MidiRegionPropertiesBox::set_region (std::shared_ptr r) { RegionPropertiesBox::set_region (r); diff --git a/gtk2_ardour/midi_region_properties_box.h b/gtk2_ardour/midi_region_properties_box.h index ba0fcb1c84..2360c8a8c5 100644 --- a/gtk2_ardour/midi_region_properties_box.h +++ b/gtk2_ardour/midi_region_properties_box.h @@ -45,7 +45,7 @@ public: MidiRegionPropertiesBox (); ~MidiRegionPropertiesBox (); - void set_region (boost::shared_ptr); + void set_region (std::shared_ptr); private: void region_changed (const PBD::PropertyChange& what_changed); diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index bc5abdafdb..90df08839a 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -103,7 +103,7 @@ using Gtkmm2ext::Keyboard; MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, RouteTimeAxisView& tv, - boost::shared_ptr r, + std::shared_ptr r, double spu, uint32_t basic_color) : RegionView (parent, tv, r, spu, basic_color) @@ -144,7 +144,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, RouteTimeAxisView& tv, - boost::shared_ptr r, + std::shared_ptr r, double spu, uint32_t basic_color, bool recording, @@ -226,8 +226,8 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) init (false); } -MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr region) - : RegionView (other, boost::shared_ptr (region)) +MidiRegionView::MidiRegionView (const MidiRegionView& other, std::shared_ptr region) + : RegionView (other, std::shared_ptr (region)) , _current_range_min(0) , _current_range_max(0) , _active_notes(0) @@ -302,10 +302,10 @@ MidiRegionView::instrument_info () const return route_ui->route()->instrument_info(); } -const boost::shared_ptr +const std::shared_ptr MidiRegionView::midi_region() const { - return boost::dynamic_pointer_cast(_region); + return std::dynamic_pointer_cast(_region); } void @@ -876,7 +876,7 @@ MidiRegionView::create_note_at (timepos_t const & t, double y, Temporal::Beats l MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); - boost::shared_ptr mr = boost::dynamic_pointer_cast (_region); + std::shared_ptr mr = std::dynamic_pointer_cast (_region); if (!mr) { return; @@ -890,7 +890,7 @@ MidiRegionView::create_note_at (timepos_t const & t, double y, Temporal::Beats l const uint8_t chan = get_channel_for_add(region_start); const uint8_t velocity = get_velocity_for_add (region_start); - const boost::shared_ptr new_note (new NoteType (chan, region_start, length, (uint8_t)note, velocity)); + const std::shared_ptr new_note (new NoteType (chan, region_start, length, (uint8_t)note, velocity)); if (_model->contains (new_note)) { return; @@ -932,7 +932,7 @@ MidiRegionView::clear_events () } void -MidiRegionView::display_model (boost::shared_ptr model) +MidiRegionView::display_model (std::shared_ptr model) { _model = model; @@ -955,7 +955,7 @@ MidiRegionView::start_note_diff_command (string name) } void -MidiRegionView::note_diff_add_note (const boost::shared_ptr note, bool selected, bool show_velocity) +MidiRegionView::note_diff_add_note (const std::shared_ptr note, bool selected, bool show_velocity) { if (_note_diff_command) { _note_diff_command->add (note); @@ -1038,7 +1038,7 @@ MidiRegionView::abort_note_diff() } NoteBase* -MidiRegionView::find_canvas_note (boost::shared_ptr note) +MidiRegionView::find_canvas_note (std::shared_ptr note) { if (_optimization_iterator != _events.end()) { @@ -1072,7 +1072,7 @@ MidiRegionView::find_canvas_note (Evoral::event_id_t id) return 0; } -boost::shared_ptr +std::shared_ptr MidiRegionView::find_canvas_patch_change (MidiModel::PatchChangePtr p) { PatchChanges::const_iterator f = _patch_changes.find (p); @@ -1081,10 +1081,10 @@ MidiRegionView::find_canvas_patch_change (MidiModel::PatchChangePtr p) return f->second; } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr MidiRegionView::find_canvas_sys_ex (MidiModel::SysExPtr s) { SysExes::const_iterator f = _sys_exes.find (s); @@ -1093,7 +1093,7 @@ MidiRegionView::find_canvas_sys_ex (MidiModel::SysExPtr s) return f->second; } - return boost::shared_ptr(); + return std::shared_ptr(); } void @@ -1178,7 +1178,7 @@ MidiRegionView::model_changed() for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { - boost::shared_ptr note (*n); + std::shared_ptr note (*n); bool visible; if (note_in_region_range (note, visible)) { @@ -1243,7 +1243,7 @@ MidiRegionView::model_changed() } for (MidiModel::Notes::iterator n = missing_notes.begin(); n != missing_notes.end(); ++n) { - boost::shared_ptr note (*n); + std::shared_ptr note (*n); NoteBase* cne; bool visible; @@ -1366,7 +1366,7 @@ void MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_channel) { for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) { - boost::shared_ptr p; + std::shared_ptr p; if ((*i)->channel() != channel) { continue; @@ -1400,7 +1400,7 @@ MidiRegionView::update_patch_changes () { for (PatchChanges::iterator p = _patch_changes.begin(); p != _patch_changes.end(); ++p) { - boost::shared_ptr pc (p->second); + std::shared_ptr pc (p->second); const timepos_t region_time = _region->source_beats_to_region_time (p->first->time()); @@ -1454,7 +1454,7 @@ MidiRegionView::display_sysexes() display_periodic_messages = false; } - const boost::shared_ptr mregion (midi_region()); + const std::shared_ptr mregion (midi_region()); for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { MidiModel::SysExPtr sysex_ptr = *i; @@ -1482,10 +1482,10 @@ MidiRegionView::display_sysexes() // CAIROCANVAS: no longer passing *i (the sysex event) to the // SysEx canvas object!!! - boost::shared_ptr sysex = find_canvas_sys_ex (sysex_ptr); + std::shared_ptr sysex = find_canvas_sys_ex (sysex_ptr); if (!sysex) { - sysex = boost::shared_ptr( + sysex = std::shared_ptr( new SysEx (*this, _note_group, text, height, x, 1.0, sysex_ptr)); _sys_exes.insert (make_pair (sysex_ptr, sysex)); } else { @@ -1510,7 +1510,7 @@ MidiRegionView::update_sysexes () for (SysExes::iterator s = _sys_exes.begin(); s != _sys_exes.end(); ++s) { const timepos_t time (s->first->time()); - boost::shared_ptr sysex (s->second); + std::shared_ptr sysex (s->second); // Show unless message is beyond the region bounds if (_region->source_relative_position (time) >= _region->length() || time < _region->start()) { @@ -1689,7 +1689,7 @@ MidiRegionView::extend_active_notes() } void -MidiRegionView::play_midi_note(boost::shared_ptr note) +MidiRegionView::play_midi_note(std::shared_ptr note) { if (_no_sound_notes || !UIConfiguration::instance().get_sound_midi_notes()) { return; @@ -1709,14 +1709,14 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) } void -MidiRegionView::start_playing_midi_note(boost::shared_ptr note) +MidiRegionView::start_playing_midi_note(std::shared_ptr note) { - const std::vector< boost::shared_ptr > notes(1, note); + const std::vector< std::shared_ptr > notes(1, note); start_playing_midi_chord(notes); } void -MidiRegionView::start_playing_midi_chord (vector > notes) +MidiRegionView::start_playing_midi_chord (vector > notes) { if (_no_sound_notes || !UIConfiguration::instance().get_sound_midi_notes()) { return; @@ -1730,7 +1730,7 @@ MidiRegionView::start_playing_midi_chord (vector > n NotePlayer* player = new NotePlayer (route_ui->midi_track()); - for (vector >::iterator n = notes.begin(); n != notes.end(); ++n) { + for (vector >::iterator n = notes.begin(); n != notes.end(); ++n) { player->add (*n); } @@ -1739,9 +1739,9 @@ MidiRegionView::start_playing_midi_chord (vector > n bool -MidiRegionView::note_in_region_range (const boost::shared_ptr note, bool& visible) const +MidiRegionView::note_in_region_range (const std::shared_ptr note, bool& visible) const { - const boost::shared_ptr midi_reg = midi_region(); + const std::shared_ptr midi_reg = midi_region(); /* must compare double explicitly as Beats::operator< rounds to ppqn */ const bool outside = (timepos_t (note->time()) < _region->start()) || (timepos_t (note->time()) >= _region->start() + _region->length()); @@ -1771,8 +1771,8 @@ MidiRegionView::update_note (NoteBase* note, bool update_ghost_regions) void MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) { - const boost::shared_ptr mr = midi_region(); - boost::shared_ptr note = ev->note(); + const std::shared_ptr mr = midi_region(); + std::shared_ptr note = ev->note(); const timepos_t note_start (note->time()); timepos_t note_end (note->end_time()); @@ -1862,7 +1862,7 @@ MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) void MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) { - boost::shared_ptr note = ev->note(); + std::shared_ptr note = ev->note(); const timepos_t note_time = _region->source_beats_to_absolute_time (note->time()); const double x = trackview.editor().time_to_pixel(note_time) - trackview.editor().time_to_pixel (_region->position()); @@ -1892,7 +1892,7 @@ MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) * corresponding note off event arrives, to properly display the note. */ NoteBase* -MidiRegionView::add_note(const boost::shared_ptr note, bool visible) +MidiRegionView::add_note(const std::shared_ptr note, bool visible) { NoteBase* event = 0; @@ -1958,7 +1958,7 @@ void MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity, Temporal::Beats pos, Temporal::Beats len) { - boost::shared_ptr new_note (new NoteType (channel, pos, len, number, velocity)); + std::shared_ptr new_note (new NoteType (channel, pos, len, number, velocity)); /* potentially extend region to hold new note */ @@ -2008,7 +2008,7 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch) // so we need to do something more sophisticated to keep its color // appearance (MidiPatchChangeFill/MidiPatchChangeInactiveChannelFill) // up to date. - boost::shared_ptr patch_change = boost::shared_ptr( + std::shared_ptr patch_change = std::shared_ptr( new PatchChange(*this, group, height, x, 1.0, instrument_info(), @@ -2220,7 +2220,7 @@ MidiRegionView::delete_selection() } void -MidiRegionView::delete_note (boost::shared_ptr n) +MidiRegionView::delete_note (std::shared_ptr n) { start_note_diff_command (_("delete note")); _note_diff_command->remove (n); @@ -2393,7 +2393,7 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { - boost::shared_ptr note (*n); + std::shared_ptr note (*n); NoteBase* cne; bool select = false; @@ -2428,7 +2428,7 @@ MidiRegionView::toggle_matching_notes (uint8_t notenum, uint16_t channel_mask) for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { - boost::shared_ptr note (*n); + std::shared_ptr note (*n); NoteBase* cne; if (note->note() == notenum && (((0x0001 << note->channel()) & channel_mask) != 0)) { @@ -2645,7 +2645,7 @@ MidiRegionView::earliest_in_selection () void MidiRegionView::move_selection(timecnt_t const & dx_qn, double dy, double cumulative_dy) { - typedef vector > PossibleChord; + typedef vector > PossibleChord; Editor* editor = dynamic_cast (&trackview.editor()); PossibleChord to_play; Temporal::Beats earliest = earliest_in_selection(); @@ -2688,7 +2688,7 @@ MidiRegionView::move_selection(timecnt_t const & dx_qn, double dy, double cumula PossibleChord shifted; for (PossibleChord::iterator n = to_play.begin(); n != to_play.end(); ++n) { - boost::shared_ptr moved_note (new NoteType (**n)); + std::shared_ptr moved_note (new NoteType (**n)); moved_note->set_note (moved_note->note() + cumulative_dy); shifted.push_back (moved_note); } @@ -2697,7 +2697,7 @@ MidiRegionView::move_selection(timecnt_t const & dx_qn, double dy, double cumula } else if (!to_play.empty()) { - boost::shared_ptr moved_note (new NoteType (*to_play.front())); + std::shared_ptr moved_note (new NoteType (*to_play.front())); moved_note->set_note (moved_note->note() + cumulative_dy); start_playing_midi_note (moved_note); } @@ -2717,7 +2717,7 @@ MidiRegionView::copy_selection (NoteBase* primary) NoteBase* ret = 0; for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { - boost::shared_ptr g (new NoteType (*((*i)->note()))); + std::shared_ptr g (new NoteType (*((*i)->note()))); if (midi_view()->note_mode() == Sustained) { Note* n = new Note (*this, _note_group, g); update_sustained (n, false); @@ -2741,7 +2741,7 @@ MidiRegionView::copy_selection (NoteBase* primary) void MidiRegionView::move_copies (timecnt_t const & dx_qn, double dy, double cumulative_dy) { - typedef vector > PossibleChord; + typedef vector > PossibleChord; Editor* editor = dynamic_cast (&trackview.editor()); PossibleChord to_play; Temporal::Beats earliest = earliest_in_selection(); @@ -2783,7 +2783,7 @@ MidiRegionView::move_copies (timecnt_t const & dx_qn, double dy, double cumulati PossibleChord shifted; for (PossibleChord::iterator n = to_play.begin(); n != to_play.end(); ++n) { - boost::shared_ptr moved_note (new NoteType (**n)); + std::shared_ptr moved_note (new NoteType (**n)); moved_note->set_note (moved_note->note() + cumulative_dy); shifted.push_back (moved_note); } @@ -2792,7 +2792,7 @@ MidiRegionView::move_copies (timecnt_t const & dx_qn, double dy, double cumulati } else if (!to_play.empty()) { - boost::shared_ptr moved_note (new NoteType (*to_play.front())); + std::shared_ptr moved_note (new NoteType (*to_play.front())); moved_note->set_note (moved_note->note() + cumulative_dy); start_playing_midi_note (moved_note); } @@ -3793,7 +3793,7 @@ MidiRegionView::selection_as_cut_buffer () const for (Selection::const_iterator i = _selection.begin(); i != _selection.end(); ++i) { NoteType* n = (*i)->note().get(); - notes.insert (boost::shared_ptr (new NoteType (*n))); + notes.insert (std::shared_ptr (new NoteType (*n))); } MidiCutBuffer* cb = new MidiCutBuffer (trackview.session()); @@ -3907,7 +3907,7 @@ MidiRegionView::paste_internal (timepos_t const & pos, unsigned paste_count, flo for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) { - boost::shared_ptr copied_note (new NoteType (*((*i).get()))); + std::shared_ptr copied_note (new NoteType (*((*i).get()))); copied_note->set_time (quarter_note + copied_note->time() - first_time); copied_note->set_id (Evoral::next_event_id()); @@ -4133,7 +4133,7 @@ MidiRegionView::create_ghost_note (double x, double y, uint32_t state) { remove_ghost_note (); - boost::shared_ptr g (new NoteType); + std::shared_ptr g (new NoteType); if (midi_view()->note_mode() == Sustained) { _ghost_note = new Note (*this, _note_group, g); } else { @@ -4285,14 +4285,14 @@ MidiRegionView::set_step_edit_cursor_width (Temporal::Beats beats) * @param w Source that the data will end up in. */ void -MidiRegionView::data_recorded (boost::weak_ptr w) +MidiRegionView::data_recorded (std::weak_ptr w) { if (!_active_notes) { /* we aren't actively being recorded to */ return; } - boost::shared_ptr src = w.lock (); + std::shared_ptr src = w.lock (); if (!src || src != midi_region()->midi_source()) { /* recorded data was not destined for our source */ return; @@ -4300,7 +4300,7 @@ MidiRegionView::data_recorded (boost::weak_ptr w) MidiTimeAxisView* mtv = dynamic_cast (&trackview); - boost::shared_ptr buf = mtv->midi_track()->get_gui_feed_buffer (); + std::shared_ptr buf = mtv->midi_track()->get_gui_feed_buffer (); samplepos_t back = max_samplepos; @@ -4325,7 +4325,7 @@ MidiRegionView::data_recorded (boost::weak_ptr w) if (ev.type() == MIDI_CMD_NOTE_ON) { - boost::shared_ptr note (new NoteType (ev.channel(), time_beats, std::numeric_limits::max() - time_beats, ev.note(), ev.velocity())); + std::shared_ptr note (new NoteType (ev.channel(), time_beats, std::numeric_limits::max() - time_beats, ev.note(), ev.velocity())); assert (note->end_time() == std::numeric_limits::max()); @@ -4422,7 +4422,7 @@ MidiRegionView::delete_sysex (SysEx* /*sysex*/) } std::string -MidiRegionView::get_note_name (boost::shared_ptr n, uint8_t note_value) const +MidiRegionView::get_note_name (std::shared_ptr n, uint8_t note_value) const { using namespace MIDI::Name; std::string name; @@ -4445,7 +4445,7 @@ MidiRegionView::get_note_name (boost::shared_ptr n, uint8_t note_value } void -MidiRegionView::show_verbose_cursor_for_new_note_value(boost::shared_ptr current_note, +MidiRegionView::show_verbose_cursor_for_new_note_value(std::shared_ptr current_note, uint8_t new_value) const { MidiTimeAxisView* mtv = dynamic_cast(&trackview); @@ -4457,7 +4457,7 @@ MidiRegionView::show_verbose_cursor_for_new_note_value(boost::shared_ptr n) const +MidiRegionView::show_verbose_cursor (std::shared_ptr n) const { show_verbose_cursor_for_new_note_value(n, n->note()); } diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index f5ff024604..0800cd3af5 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -76,13 +76,13 @@ public: MidiRegionView (ArdourCanvas::Container* parent, RouteTimeAxisView& tv, - boost::shared_ptr r, + std::shared_ptr r, double samples_per_pixel, uint32_t basic_color); MidiRegionView (ArdourCanvas::Container* parent, RouteTimeAxisView& tv, - boost::shared_ptr r, + std::shared_ptr r, double samples_per_pixel, uint32_t basic_color, bool recording, @@ -90,7 +90,7 @@ public: MidiRegionView (const MidiRegionView& other); - MidiRegionView (const MidiRegionView& other, boost::shared_ptr); + MidiRegionView (const MidiRegionView& other, std::shared_ptr); ~MidiRegionView (); @@ -98,7 +98,7 @@ public: void set_selected (bool yn); - const boost::shared_ptr midi_region() const; + const std::shared_ptr midi_region() const; inline MidiTimeAxisView* midi_view() const { return dynamic_cast(&trackview); } @@ -124,7 +124,7 @@ public: GhostRegion* add_ghost (TimeAxisView&); - NoteBase* add_note(const boost::shared_ptr note, bool visible); + NoteBase* add_note(const std::shared_ptr note, bool visible); void cut_copy_clear (Editing::CutCopyOp); bool paste (Temporal::timepos_t const & pos, const ::Selection& selection, PasteContext& ctx); @@ -179,14 +179,14 @@ public: void end_write(); void extend_active_notes(); - void display_model(boost::shared_ptr model); + void display_model(std::shared_ptr model); /* note_diff commands should start here; this initiates an undo record */ void start_note_diff_command (std::string name = "midi edit"); void note_diff_add_change (NoteBase* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, uint8_t val); void note_diff_add_change (NoteBase* ev, ARDOUR::MidiModel::NoteDiffCommand::Property, Temporal::Beats val); - void note_diff_add_note (const boost::shared_ptr note, bool selected, bool show_velocity = false); + void note_diff_add_note (const std::shared_ptr note, bool selected, bool show_velocity = false); void note_diff_remove_note (NoteBase* ev); /* note_diff commands should be completed with one of these calls; they may (or may not) commit the undo record */ @@ -204,7 +204,7 @@ public: void note_selected(NoteBase* ev, bool add, bool extend=false); void note_deselected(NoteBase* ev); void delete_selection(); - void delete_note (boost::shared_ptr); + void delete_note (std::shared_ptr); size_t selection_size() { return _selection.size(); } void select_all_notes (); void select_range(Temporal::timepos_t const & start, Temporal::timepos_t const & end); @@ -228,7 +228,7 @@ public: * @param visible will be set to true if the note is within the visible note range, false otherwise. * @return true iff the note is within the (time) extent of the region. */ - bool note_in_region_range(const boost::shared_ptr note, bool& visible) const; + bool note_in_region_range(const std::shared_ptr note, bool& visible) const; /** Get the region position in pixels relative to session. */ double get_position_pixels(); @@ -324,7 +324,7 @@ public: void note_deleted (NoteBase*); - void show_verbose_cursor_for_new_note_value(boost::shared_ptr current_note, uint8_t new_note) const; + void show_verbose_cursor_for_new_note_value(std::shared_ptr current_note, uint8_t new_note) const; protected: void region_resized (const PBD::PropertyChange&); @@ -407,9 +407,9 @@ public: /** Play the NoteOn event of the given note immediately * and schedule the playback of the corresponding NoteOff event. */ - void play_midi_note (boost::shared_ptr note); - void start_playing_midi_note (boost::shared_ptr note); - void start_playing_midi_chord (std::vector > notes); + void play_midi_note (std::shared_ptr note); + void start_playing_midi_note (std::shared_ptr note); + void start_playing_midi_chord (std::vector > notes); /** Clear the note selection of just this midi region */ @@ -439,10 +439,10 @@ public: void add_to_selection (NoteBase*); void remove_from_selection (NoteBase*); - std::string get_note_name (boost::shared_ptr note, uint8_t note_value) const; + std::string get_note_name (std::shared_ptr note, uint8_t note_value) const; void show_verbose_cursor (std::string const &, double, double) const; - void show_verbose_cursor (boost::shared_ptr) const; + void show_verbose_cursor (std::shared_ptr) const; uint8_t get_velocity_for_add (ARDOUR::MidiModel::TimeType time) const; uint8_t get_channel_for_add (ARDOUR::MidiModel::TimeType time) const; @@ -450,12 +450,12 @@ public: uint8_t _current_range_min; uint8_t _current_range_max; - typedef boost::unordered_map, NoteBase*> Events; - typedef boost::unordered_map > PatchChanges; - typedef boost::unordered_map > SysExes; + typedef boost::unordered_map, NoteBase*> Events; + typedef boost::unordered_map > PatchChanges; + typedef boost::unordered_map > SysExes; typedef std::vector CopyDragEvents; - boost::shared_ptr _model; + std::shared_ptr _model; Events _events; CopyDragEvents _copy_drag_events; PatchChanges _patch_changes; @@ -481,26 +481,26 @@ public: /** New notes (created in the current command) which should be selected * when they appear after the command is applied. */ - std::set< boost::shared_ptr > _marked_for_selection; + std::set< std::shared_ptr > _marked_for_selection; /** Notes that should be selected when the model is redisplayed. */ std::set _pending_note_selection; /** New notes (created in the current command) which should have visible velocity * when they appear after the command is applied. */ - std::set< boost::shared_ptr > _marked_for_velocity; + std::set< std::shared_ptr > _marked_for_velocity; std::vector _resize_data; /** connection used to connect to model's ContentChanged signal */ PBD::ScopedConnection content_connection; - NoteBase* find_canvas_note (boost::shared_ptr); + NoteBase* find_canvas_note (std::shared_ptr); NoteBase* find_canvas_note (Evoral::event_id_t id); Events::iterator _optimization_iterator; - boost::shared_ptr find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p); - boost::shared_ptr find_canvas_sys_ex (ARDOUR::MidiModel::SysExPtr s); + std::shared_ptr find_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr p); + std::shared_ptr find_canvas_sys_ex (ARDOUR::MidiModel::SysExPtr s); void update_note (NoteBase*, bool update_ghost_regions = true); void update_sustained (Note *, bool update_ghost_regions = true); @@ -531,7 +531,7 @@ public: void display_patch_changes_on_channel (uint8_t, bool); void connect_to_diskstream (); - void data_recorded (boost::weak_ptr); + void data_recorded (std::weak_ptr); /** Get grid type as beats, or default to 1 if not snapped to beats. */ Temporal::Beats get_grid_beats(Temporal::timepos_t const & pos) const; @@ -559,7 +559,7 @@ public: PBD::ScopedConnection _mouse_mode_connection; - boost::shared_ptr _press_cursor_ctx; + std::shared_ptr _press_cursor_ctx; ARDOUR::ChannelMode get_channel_mode() const; uint16_t get_selected_channels () const; diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 2cb7b1517a..d2e264a814 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -123,9 +123,9 @@ MidiStreamView::parameter_changed (string const & param) } RegionView* -MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, bool recording) +MidiStreamView::create_region_view (std::shared_ptr r, bool /*wfd*/, bool recording) { - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); if (region == 0) { return 0; @@ -148,9 +148,9 @@ MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, b } RegionView* -MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_data, bool recording) +MidiStreamView::add_region_view_internal (std::shared_ptr r, bool wait_for_data, bool recording) { - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); if (!region) { return 0; @@ -189,7 +189,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wait } /* catch regionview going away */ - boost::weak_ptr wr (region); // make this explicit + std::weak_ptr wr (region); // make this explicit region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, wr), gui_context()); RegionViewAdded (region_view); @@ -208,7 +208,7 @@ MidiStreamView::display_region (MidiRegionView* region_view, bool) region_view->set_height (child_height()); - boost::shared_ptr source (region_view->midi_region()->midi_source(0)); + std::shared_ptr source (region_view->midi_region()->midi_source(0)); if (!source) { error << _("attempt to display MIDI region with no source") << endmsg; @@ -228,7 +228,7 @@ MidiStreamView::display_region (MidiRegionView* region_view, bool) void -MidiStreamView::display_track (boost::shared_ptr tr) +MidiStreamView::display_track (std::shared_ptr tr) { StreamView::display_track (tr); @@ -238,9 +238,9 @@ MidiStreamView::display_track (boost::shared_ptr tr) } void -MidiStreamView::update_contents_metrics(boost::shared_ptr r) +MidiStreamView::update_contents_metrics(std::shared_ptr r) { - boost::shared_ptr mr = boost::dynamic_pointer_cast(r); + std::shared_ptr mr = std::dynamic_pointer_cast(r); if (mr) { Source::ReaderLock lm (mr->midi_source(0)->mutex()); @@ -514,7 +514,7 @@ MidiStreamView::setup_rec_box () plist.add (ARDOUR::Properties::name, string()); plist.add (ARDOUR::Properties::layer, 0); - boost::shared_ptr region (boost::dynamic_pointer_cast + std::shared_ptr region (std::dynamic_pointer_cast (RegionFactory::create (sources, plist, false))); if (region) { @@ -565,8 +565,8 @@ MidiStreamView::setup_rec_box () /* remove temp regions */ - for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { - list,RegionView*> >::iterator tmp; + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { + list,RegionView*> >::iterator tmp; tmp = iter; ++tmp; @@ -643,7 +643,7 @@ MidiStreamView::update_rec_box () } /* Update the region being recorded to reflect where we currently are */ - boost::shared_ptr region = rec_regions.back().first; + std::shared_ptr region = rec_regions.back().first; region->set_length (timecnt_t (_trackview.track()->current_capture_end () - _trackview.track()->current_capture_start())); MidiRegionView* mrv = dynamic_cast (rec_regions.back().second); @@ -716,7 +716,7 @@ MidiStreamView::paste (timepos_t const & pos, const Selection& selection, PasteC prev = i; } - boost::shared_ptr r = (*prev)->region (); + std::shared_ptr r = (*prev)->region (); /* If *prev doesn't cover pos, it's no good */ if (r->position() > pos || ((r->position() + r->length()) < pos)) { diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h index 334c5981d9..d844007f57 100644 --- a/gtk2_ardour/midi_streamview.h +++ b/gtk2_ardour/midi_streamview.h @@ -104,7 +104,7 @@ public: sigc::signal NoteRangeChanged; - RegionView* create_region_view (boost::shared_ptr, bool, bool); + RegionView* create_region_view (std::shared_ptr, bool, bool); bool paste (Temporal::timepos_t const & pos, const Selection& selection, PasteContext& ctx); @@ -128,18 +128,18 @@ protected: private: RegionView* add_region_view_internal ( - boost::shared_ptr, + std::shared_ptr, bool wait_for_waves, bool recording = false); void display_region(MidiRegionView* region_view, bool load_model); - void display_track (boost::shared_ptr tr); + void display_track (std::shared_ptr tr); void update_contents_height (); void draw_note_lines(); bool update_data_note_range(uint8_t min, uint8_t max); - void update_contents_metrics(boost::shared_ptr r); + void update_contents_metrics(std::shared_ptr r); void color_handler (); diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 5a5c002907..5f75adc4c5 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -146,7 +146,7 @@ MidiTimeAxisView::set_note_highlight (uint8_t note) { } void -MidiTimeAxisView::set_route (boost::shared_ptr rt) +MidiTimeAxisView::set_route (std::shared_ptr rt) { _route = rt; @@ -827,7 +827,7 @@ MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items, sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track), fully_qualified_param))); - boost::shared_ptr track = automation_child (fully_qualified_param); + std::shared_ptr track = automation_child (fully_qualified_param); bool visible = false; if (track) { @@ -859,7 +859,7 @@ MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items, sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track), fully_qualified_param))); - boost::shared_ptr track = automation_child (fully_qualified_param); + std::shared_ptr track = automation_child (fully_qualified_param); bool visible = false; if (track) { @@ -900,7 +900,7 @@ MidiTimeAxisView::add_single_channel_controller_item(Menu_Helpers::MenuList& ctl fully_qualified_param))); dynamic_cast (ctl_items.back().get_child())->set_use_markup (true); - boost::shared_ptr track = automation_child ( + std::shared_ptr track = automation_child ( fully_qualified_param); bool visible = false; @@ -955,7 +955,7 @@ MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_ sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track), fully_qualified_param))); - boost::shared_ptr track = automation_child ( + std::shared_ptr track = automation_child ( fully_qualified_param); bool visible = false; @@ -1021,7 +1021,7 @@ MidiTimeAxisView::build_controller_menu () uint16_t channels = _route->instrument_info().channels_for_control_list (l->first); bool multi_channel = 0 != (channels & (channels - 1)); - boost::shared_ptr name_list = l->second; + std::shared_ptr name_list = l->second; Menu* ctl_menu = NULL; for (ControlNameList::Controls::const_iterator c = name_list->controls().begin(); @@ -1279,7 +1279,7 @@ MidiTimeAxisView::show_all_automation (bool apply_to_selection) continue; } - boost::shared_ptr control_names = _route->instrument_info().control_name_list (chn); + std::shared_ptr control_names = _route->instrument_info().control_name_list (chn); if (!control_names) { continue; } @@ -1346,8 +1346,8 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool return; } - boost::shared_ptr track; - boost::shared_ptr control; + std::shared_ptr track; + std::shared_ptr control; switch (param.type()) { @@ -1382,7 +1382,7 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool track.reset (new AutomationTimeAxisView ( _session, _route, - control ? _route : boost::shared_ptr (), + control ? _route : std::shared_ptr (), control, param, _editor, @@ -1552,7 +1552,7 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note) } void -MidiTimeAxisView::get_per_region_note_selection (list > > > >& selection) +MidiTimeAxisView::get_per_region_note_selection (list > > > >& selection) { _view->foreach_regionview ( sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::get_per_region_note_selection_region_view), sigc::ref(selection))); @@ -1583,12 +1583,12 @@ MidiTimeAxisView::toggle_note_selection_region_view (RegionView* rv, uint8_t not } void -MidiTimeAxisView::get_per_region_note_selection_region_view (RegionView* rv, list > > > > &selection) +MidiTimeAxisView::get_per_region_note_selection_region_view (RegionView* rv, list > > > > &selection) { Evoral::Sequence::Notes selected; dynamic_cast(rv)->selection_as_notelist (selected, false); - std::set > > notes; + std::set > > notes; Evoral::Sequence::Notes::iterator sel_it; for (sel_it = selected.begin(); sel_it != selected.end(); ++sel_it) { @@ -1615,7 +1615,7 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t) for (uint32_t chn = 0; chn < 16; ++chn) { Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl); - boost::shared_ptr track = automation_child (fully_qualified_param); + std::shared_ptr track = automation_child (fully_qualified_param); if (!track) { continue; @@ -1667,7 +1667,7 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) return 0; } -boost::shared_ptr +std::shared_ptr MidiTimeAxisView::add_region (timepos_t const & f, timecnt_t const & length, bool commit) { Editor* real_editor = dynamic_cast (&_editor); @@ -1680,11 +1680,11 @@ MidiTimeAxisView::add_region (timepos_t const & f, timecnt_t const & length, boo real_editor->snap_to (pos, Temporal::RoundNearest); - boost::shared_ptr src = _session->create_midi_source_by_stealing_name (view()->trackview().track()); + std::shared_ptr src = _session->create_midi_source_by_stealing_name (view()->trackview().track()); const Temporal::timecnt_t start (Temporal::BeatTime); /* zero beats */ - boost::shared_ptr region; + std::shared_ptr region; /* Create the (empty) whole-file region that will show up in the source * list. This is NOT used in any playlists. @@ -1719,7 +1719,7 @@ MidiTimeAxisView::add_region (timepos_t const & f, timecnt_t const & length, boo real_editor->commit_reversible_command (); } - return boost::dynamic_pointer_cast(region); + return std::dynamic_pointer_cast(region); } void diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index b6a4d9f222..b5d911e764 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -81,14 +81,14 @@ public: MidiTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); virtual ~MidiTimeAxisView (); - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); MidiStreamView* midi_view(); void set_height (uint32_t, TrackHeightMode m = OnlySelf, bool from_idle = false); void set_layer_display (LayerDisplay d); - boost::shared_ptr add_region (Temporal::timepos_t const &, Temporal::timecnt_t const &, bool); + std::shared_ptr add_region (Temporal::timepos_t const &, Temporal::timecnt_t const &, bool); void show_all_automation (bool apply_to_selection = false); void show_existing_automation (bool apply_to_selection = false); @@ -111,7 +111,7 @@ public: uint8_t get_preferred_midi_channel () const; - void get_per_region_note_selection (std::list > > > >&); + void get_per_region_note_selection (std::list > > > >&); void use_midnam_info (); protected: @@ -190,7 +190,7 @@ private: void add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask); void extend_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask); void toggle_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask); - void get_per_region_note_selection_region_view (RegionView*, std::list > > > >&); + void get_per_region_note_selection_region_view (RegionView*, std::list > > > >&); void ensure_step_editor (); diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc index 0153b6414e..3cde7629bf 100644 --- a/gtk2_ardour/midi_tracer.cc +++ b/gtk2_ardour/midi_tracer.cc @@ -67,8 +67,8 @@ MidiTracer::MidiTracer () g_atomic_int_set (&_update_queued, 0); std::string portname (string_compose(X_("x-MIDI-tracer-%1"), ++window_count)); - boost::shared_ptr port = AudioEngine::instance()->register_input_port (DataType::MIDI, portname, false, PortFlags (IsInput | Hidden | IsTerminal)); - tracer_port = boost::dynamic_pointer_cast (port); + std::shared_ptr port = AudioEngine::instance()->register_input_port (DataType::MIDI, portname, false, PortFlags (IsInput | Hidden | IsTerminal)); + tracer_port = std::dynamic_pointer_cast (port); _midi_port_list = ListStore::create (_midi_port_cols); _midi_port_combo.set_model (_midi_port_list); @@ -233,12 +233,12 @@ MidiTracer::port_changed () std::string const pn = (*r)[_midi_port_cols.port_name]; - boost::shared_ptr p = AudioEngine::instance()->get_port_by_name (pn); + std::shared_ptr p = AudioEngine::instance()->get_port_by_name (pn); if (!p) { /* connect to external port */ if (0 == tracer_port->connect (pn)) { - _midi_parser = boost::shared_ptr (new MIDI::Parser); + _midi_parser = std::shared_ptr (new MIDI::Parser); _midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4)); tracer_port->set_trace (_midi_parser.get ()); } else { @@ -247,7 +247,7 @@ MidiTracer::port_changed () return; } - boost::shared_ptr mp = boost::dynamic_pointer_cast (p); + std::shared_ptr mp = std::dynamic_pointer_cast (p); /* The inheritance hierarchy makes this messy. AsyncMIDIPort has two * available MIDI::Parsers what we could connect to, ::self_parser() @@ -260,20 +260,20 @@ MidiTracer::port_changed () * If not use our local parser and tell the port that we need it to be called. */ - boost::shared_ptr async = boost::dynamic_pointer_cast (p); + std::shared_ptr async = std::dynamic_pointer_cast (p); if (!async) { - boost::shared_ptr mp = boost::dynamic_pointer_cast (p); + std::shared_ptr mp = std::dynamic_pointer_cast (p); if (mp) { if (mp->flags() & TransportMasterPort) { - boost::shared_ptr tm = TransportMasterManager::instance().master_by_port(boost::dynamic_pointer_cast (p)); - boost::shared_ptr tm_midi = boost::dynamic_pointer_cast (tm); + std::shared_ptr tm = TransportMasterManager::instance().master_by_port(std::dynamic_pointer_cast (p)); + std::shared_ptr tm_midi = std::dynamic_pointer_cast (tm); if (tm_midi) { tm_midi->transport_parser().any.connect_same_thread(_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4)); } } else { - _midi_parser = boost::shared_ptr (new MIDI::Parser); + _midi_parser = std::shared_ptr (new MIDI::Parser); _midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4)); mp->set_trace (_midi_parser.get ()); traced_port = mp; diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h index 5a3122543f..6bb6abc281 100644 --- a/gtk2_ardour/midi_tracer.h +++ b/gtk2_ardour/midi_tracer.h @@ -115,10 +115,10 @@ private: void disconnect (); PBD::ScopedConnection _parser_connection; PBD::ScopedConnection _manager_connection; - boost::shared_ptr _midi_parser; + std::shared_ptr _midi_parser; - boost::shared_ptr tracer_port; - boost::shared_ptr traced_port; + std::shared_ptr tracer_port; + std::shared_ptr traced_port; static unsigned int window_count; }; diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 2d887f6d20..26d2715922 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -198,7 +198,7 @@ MixerGroupTabs::selected_routes () const { RouteList rl; BOOST_FOREACH (AxisView* r, _mixer->selection().axes) { - boost::shared_ptr rp = boost::dynamic_pointer_cast (r->stripable()); + std::shared_ptr rp = std::dynamic_pointer_cast (r->stripable()); if (rp) { rl.push_back (rp); } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index c009ca1ad0..3feabd17a1 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -143,7 +143,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) } } -MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt, bool in_mixer) +MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, std::shared_ptr rt, bool in_mixer) : SessionHandlePtr (sess) , RouteUI (sess) , _mixer(mx) @@ -434,17 +434,17 @@ MixerStrip::~MixerStrip () } void -MixerStrip::vca_assign (boost::shared_ptr vca) +MixerStrip::vca_assign (std::shared_ptr vca) { - boost::shared_ptr sl = boost::dynamic_pointer_cast ( route() ); + std::shared_ptr sl = std::dynamic_pointer_cast ( route() ); if (sl) sl->assign(vca); } void -MixerStrip::vca_unassign (boost::shared_ptr vca) +MixerStrip::vca_unassign (std::shared_ptr vca) { - boost::shared_ptr sl = boost::dynamic_pointer_cast ( route() ); + std::shared_ptr sl = std::dynamic_pointer_cast ( route() ); if (sl) sl->unassign(vca); } @@ -498,7 +498,7 @@ MixerStrip::update_trim_control () trim_control.set_controllable (route()->trim()->gain_control()); } else { trim_control.hide (); - boost::shared_ptr none; + std::shared_ptr none; trim_control.set_controllable (none); } } @@ -522,7 +522,7 @@ MixerStrip::trim_end_touch () } void -MixerStrip::set_route (boost::shared_ptr rt) +MixerStrip::set_route (std::shared_ptr rt) { //the rec/monitor stuff only shows up for tracks. //the show_sends only shows up for buses. @@ -547,7 +547,7 @@ MixerStrip::set_route (boost::shared_ptr rt) set_trigger_display (rt->triggerbox()); - control_slave_ui.set_stripable (boost::dynamic_pointer_cast (rt)); + control_slave_ui.set_stripable (std::dynamic_pointer_cast (rt)); /* ProcessorBox needs access to _route so that it can read GUI object state. @@ -610,7 +610,7 @@ MixerStrip::set_route (boost::shared_ptr rt) if (route()->is_master() && _volume_controller == 0) { assert (_loudess_analysis_button == 0); assert (route()->volume_control()); - boost::shared_ptr ac = route()->volume_control (); + std::shared_ptr ac = route()->volume_control (); _volume_controller = AutomationController::create (ac->parameter (), ParameterDescriptor (ac->parameter ()), ac, false); _volume_controller->set_name (X_("ProcessorControlSlider")); @@ -672,7 +672,7 @@ MixerStrip::set_route (boost::shared_ptr rt) } if (is_audio_track()) { - boost::shared_ptr at = audio_track(); + std::shared_ptr at = audio_track(); at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context()); } @@ -807,7 +807,7 @@ MixerStrip::set_width_enum (Width w, void* owner) gpm.set_width (w); panners.set_width (w); - boost::shared_ptr gain_automation = _route->gain_control()->alist(); + std::shared_ptr gain_automation = _route->gain_control()->alist(); _width_owner = owner; @@ -887,7 +887,7 @@ MixerStrip::connect_to_pan () return; } - boost::shared_ptr p = _route->pannable (); + std::shared_ptr p = _route->pannable (); p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); @@ -1138,7 +1138,7 @@ MixerStrip::build_route_ops_menu () items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins))); } - if (active && (boost::dynamic_pointer_cast(_route) || _route->the_instrument ())) { + if (active && (std::dynamic_pointer_cast(_route) || _route->the_instrument ())) { items.push_back (MenuElem (_("Patch Selector..."), sigc::mem_fun(*this, &RouteUI::select_midi_patch))); } @@ -1376,7 +1376,7 @@ MixerStrip::map_frozen () { ENSURE_GUI_THREAD (*this, &MixerStrip::map_frozen) - boost::shared_ptr at = audio_track(); + std::shared_ptr at = audio_track(); bool en = _route->active () || ARDOUR::Profile->get_mixbus(); @@ -1403,9 +1403,9 @@ MixerStrip::hide_redirect_editors () } void -MixerStrip::hide_processor_editor (boost::weak_ptr p) +MixerStrip::hide_processor_editor (std::weak_ptr p) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor) { return; } @@ -1420,7 +1420,7 @@ MixerStrip::hide_processor_editor (boost::weak_ptr p) void MixerStrip::reset_strip_style () { - if (_current_delivery && boost::dynamic_pointer_cast(_current_delivery)) { + if (_current_delivery && std::dynamic_pointer_cast(_current_delivery)) { gpm.unset_fader_fg (); gpm.set_fader_name ("SendStripBase"); @@ -1576,12 +1576,12 @@ MixerStrip::meter_changed () * @param send_to New bus that we are displaying sends to, or 0. */ void -MixerStrip::bus_send_display_changed (boost::shared_ptr send_to) +MixerStrip::bus_send_display_changed (std::shared_ptr send_to) { RouteUI::bus_send_display_changed (send_to); if (send_to) { - boost::shared_ptr send = _route->internal_send_for (send_to); + std::shared_ptr send = _route->internal_send_for (send_to); if (send) { show_send (send); @@ -1596,9 +1596,9 @@ MixerStrip::bus_send_display_changed (boost::shared_ptr send_to) void MixerStrip::drop_send () { - boost::shared_ptr current_send; + std::shared_ptr current_send; - if (_current_delivery && ((current_send = boost::dynamic_pointer_cast(_current_delivery)) != 0)) { + if (_current_delivery && ((current_send = std::dynamic_pointer_cast(_current_delivery)) != 0)) { current_send->set_metering (false); } @@ -1607,7 +1607,7 @@ MixerStrip::drop_send () } void -MixerStrip::set_current_delivery (boost::shared_ptr d) +MixerStrip::set_current_delivery (std::shared_ptr d) { _current_delivery = d; setup_invert_buttons (); @@ -1616,7 +1616,7 @@ MixerStrip::set_current_delivery (boost::shared_ptr d) } void -MixerStrip::show_send (boost::shared_ptr send) +MixerStrip::show_send (std::shared_ptr send) { assert (send != 0); @@ -1767,13 +1767,13 @@ MixerStrip::input_active_button_press (GdkEventButton*) bool MixerStrip::input_active_button_release (GdkEventButton* ev) { - boost::shared_ptr mt = midi_track (); + std::shared_ptr mt = midi_track (); if (!mt) { return true; } - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (route()); @@ -1786,7 +1786,7 @@ MixerStrip::input_active_button_release (GdkEventButton* ev) void MixerStrip::midi_input_status_changed () { - boost::shared_ptr mt = midi_track (); + std::shared_ptr mt = midi_track (); assert (mt); midi_input_enable_button.set_active (mt->input_active ()); } @@ -1873,8 +1873,8 @@ void MixerStrip::update_sensitivity () { bool en = _route->active () || ARDOUR::Profile->get_mixbus(); - bool send = _current_delivery && boost::dynamic_pointer_cast(_current_delivery) != 0; - bool aux = _current_delivery && boost::dynamic_pointer_cast(_current_delivery) != 0; + bool send = _current_delivery && std::dynamic_pointer_cast(_current_delivery) != 0; + bool aux = _current_delivery && std::dynamic_pointer_cast(_current_delivery) != 0; if (route()->is_master()) { solo_iso_table.set_sensitive (false); @@ -1956,7 +1956,7 @@ MixerStrip::ab_plugins () bool MixerStrip::level_meter_button_press (GdkEventButton* ev) { - if (_current_delivery && boost::dynamic_pointer_cast(_current_delivery)) { + if (_current_delivery && std::dynamic_pointer_cast(_current_delivery)) { return false; } if (ev->button == 3) { @@ -2008,12 +2008,12 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) if (_route->is_master()) { _strip_type = 4; } - else if (boost::dynamic_pointer_cast(_route) == 0 - && boost::dynamic_pointer_cast(_route) == 0) { + else if (std::dynamic_pointer_cast(_route) == 0 + && std::dynamic_pointer_cast(_route) == 0) { /* non-master bus */ _strip_type = 3; } - else if (boost::dynamic_pointer_cast(_route)) { + else if (std::dynamic_pointer_cast(_route)) { _strip_type = 2; } else { @@ -2123,7 +2123,7 @@ MixerStrip::hide_master_spacer (bool yn) } void -MixerStrip::set_trigger_display (boost::shared_ptr tb) +MixerStrip::set_trigger_display (std::shared_ptr tb) { _tmaster->set_triggerbox (tb); trigger_display.set_triggerbox (tb.get()); diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 9367fc6503..8198980cf8 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -89,7 +89,7 @@ class TriggerBoxWidget; class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox { public: - MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr, bool in_mixer = true); + MixerStrip (Mixer_UI&, ARDOUR::Session*, std::shared_ptr, bool in_mixer = true); MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true); ~MixerStrip (); @@ -98,7 +98,7 @@ public: bool marked_for_display () const; bool set_marked_for_display (bool); - boost::shared_ptr stripable() const { return RouteUI::stripable(); } + std::shared_ptr stripable() const { return RouteUI::stripable(); } void set_width_enum (Width, void* owner); Width get_width_enum () const { return _width; } @@ -111,15 +111,15 @@ public: void fast_update (); void set_embedded (bool); - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); void set_button_names (); - void show_send (boost::shared_ptr); + void show_send (std::shared_ptr); void revert_to_default_display (); /** @return the delivery that is being edited using our fader; it will be the * last send passed to \ref show_send() , or our route's main out delivery. */ - boost::shared_ptr current_delivery () const { + std::shared_ptr current_delivery () const { return _current_delivery; } @@ -135,7 +135,7 @@ public: sigc::signal WidthChanged; /** The delivery that we are handling the level for with our fader has changed */ - PBD::Signal1 > DeliveryChanged; + PBD::Signal1 > DeliveryChanged; static PBD::Signal1 CatchDeletion; @@ -155,7 +155,7 @@ public: void set_selected (bool yn); - void set_trigger_display (boost::shared_ptr); + void set_trigger_display (std::shared_ptr); static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; } @@ -202,8 +202,8 @@ private: Gtk::Table master_volume_table; Gtk::Table bottom_button_table; - void vca_assign (boost::shared_ptr); - void vca_unassign (boost::shared_ptr); + void vca_assign (std::shared_ptr); + void vca_unassign (std::shared_ptr); void meter_changed (); void monitor_changed (); @@ -238,7 +238,7 @@ private: Gtk::Menu* _master_volume_menu; ArdourWidgets::ArdourButton* _loudess_analysis_button; - boost::shared_ptr _volume_controller; + std::shared_ptr _volume_controller; void trim_start_touch (); void trim_end_touch (); @@ -287,16 +287,16 @@ private: void name_changed (); void update_speed_display (); void map_frozen (); - void hide_processor_editor (boost::weak_ptr processor); + void hide_processor_editor (std::weak_ptr processor); void hide_redirect_editors (); bool ignore_speed_adjustment; static MixerStrip* _entered_mixer_strip; - virtual void bus_send_display_changed (boost::shared_ptr); + virtual void bus_send_display_changed (std::shared_ptr); - void set_current_delivery (boost::shared_ptr); + void set_current_delivery (std::shared_ptr); void drop_send (); PBD::ScopedConnection send_gone_connection; diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index fd7f3b9f6e..beb4e54155 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -453,8 +453,8 @@ Mixer_UI::~Mixer_UI () struct MixerStripSorter { bool operator() (const MixerStrip* ms_a, const MixerStrip* ms_b) { - boost::shared_ptr const& a = ms_a->stripable (); - boost::shared_ptr const& b = ms_b->stripable (); + std::shared_ptr const& a = ms_a->stripable (); + std::shared_ptr const& b = ms_b->stripable (); return ARDOUR::Stripable::Sorter(true)(a, b); } }; @@ -560,7 +560,7 @@ Mixer_UI::add_masters (VCAList& vlist) StripableList sl; for (VCAList::iterator v = vlist.begin(); v != vlist.end(); ++v) { - sl.push_back (boost::dynamic_pointer_cast (*v)); + sl.push_back (std::dynamic_pointer_cast (*v)); } add_stripables (sl); @@ -588,7 +588,7 @@ Mixer_UI::add_stripables (StripableList& slist) slist.sort (Stripable::Sorter()); for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) { - boost::shared_ptr s = (*it)[stripable_columns.stripable]; + std::shared_ptr s = (*it)[stripable_columns.stripable]; if (!s) { continue; @@ -612,10 +612,10 @@ Mixer_UI::add_stripables (StripableList& slist) for (StripableList::iterator s = slist.begin(); s != slist.end(); ++s) { - boost::shared_ptr route; - boost::shared_ptr vca; + std::shared_ptr route; + std::shared_ptr vca; - if ((vca = boost::dynamic_pointer_cast (*s))) { + if ((vca = std::dynamic_pointer_cast (*s))) { VCAMasterStrip* vms = new VCAMasterStrip (_session, vca); @@ -628,7 +628,7 @@ Mixer_UI::add_stripables (StripableList& slist) vms->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::vca_button_release_event), vms)); - } else if ((route = boost::dynamic_pointer_cast (*s))) { + } else if ((route = std::dynamic_pointer_cast (*s))) { if (route->is_auditioner()) { continue; @@ -707,8 +707,8 @@ Mixer_UI::add_stripables (StripableList& slist) strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); } - (*s)->presentation_info().PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr(*s)), gui_context()); - (*s)->PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr(*s)), gui_context()); + (*s)->presentation_info().PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, std::weak_ptr(*s)), gui_context()); + (*s)->PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, std::weak_ptr(*s)), gui_context()); } } catch (const std::exception& e) { @@ -855,7 +855,7 @@ Mixer_UI::sync_presentation_info_from_treeview () for (ri = rows.begin(); ri != rows.end(); ++ri) { bool visible = (*ri)[stripable_columns.visible]; - boost::shared_ptr stripable = (*ri)[stripable_columns.stripable]; + std::shared_ptr stripable = (*ri)[stripable_columns.stripable]; #ifndef NDEBUG // these should not exist in the mixer's treeview if (!stripable) { @@ -910,7 +910,7 @@ Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_chan TreeOrderKeys sorted; for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) { - boost::shared_ptr stripable = (*ri)[stripable_columns.stripable]; + std::shared_ptr stripable = (*ri)[stripable_columns.stripable]; sorted.push_back (TreeOrderKey (old_order, stripable)); } @@ -944,7 +944,7 @@ Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_chan PresentationInfo::ChangeSuspender cs; for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { - boost::shared_ptr stripable = (*i)->stripable(); + std::shared_ptr stripable = (*i)->stripable(); if (stripable && stripable->is_selected()) { _selection.add (*i); } else { @@ -973,16 +973,16 @@ Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_chan } void -Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) +Mixer_UI::fan_out (std::weak_ptr wr, bool to_busses, bool group) { - boost::shared_ptr route = wr.lock (); + std::shared_ptr route = wr.lock (); if (!ARDOUR_UI_UTILS::engine_is_running () || ! route) { return; } DisplaySuspender ds; - boost::shared_ptr pi = boost::dynamic_pointer_cast (route->the_instrument ()); + std::shared_ptr pi = std::dynamic_pointer_cast (route->the_instrument ()); assert (pi); const uint32_t n_outputs = pi->output_streams ().n_audio (); @@ -997,7 +997,7 @@ Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) #define BUSNAME pd.group_name + "(" + route->name () + ")" /* count busses and channels/bus */ - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr plugin = pi->plugin (); std::map busnames; for (uint32_t p = 0; p < n_outputs; ++p) { const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p)); @@ -1019,7 +1019,7 @@ Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) route->output ()->disconnect (this); route->panner_shell ()->set_bypassed (true); - boost::shared_ptr msac = route->master_send_enable_controllable (); + std::shared_ptr msac = route->master_send_enable_controllable (); if (msac) { msac->start_touch (timepos_t (msac->session().transport_sample())); msac->set_value (0, PBD::Controllable::NoGroup); @@ -1029,7 +1029,7 @@ Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) for (uint32_t p = 0; p < n_outputs; ++p) { const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p)); std::string bn = BUSNAME; - boost::shared_ptr r = _session->route_by_name (bn); + std::shared_ptr r = _session->route_by_name (bn); if (!r) { try { if (to_busses) { @@ -1037,17 +1037,17 @@ Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) r = rl.front (); assert (r); } else { - list > tl = _session->new_audio_track (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::max_order, Normal, false); + list > tl = _session->new_audio_track (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::max_order, Normal, false); r = tl.front (); assert (r); - boost::shared_ptr cl (new ControlList); + std::shared_ptr cl (new ControlList); cl->push_back (r->monitoring_control ()); _session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup); } } catch (...) { if (!to_group.empty()) { - boost::shared_ptr rl (&to_group); + std::shared_ptr rl (&to_group); _session->remove_routes (rl); } return; @@ -1081,7 +1081,7 @@ Mixer_UI::fan_out (boost::weak_ptr wr, bool to_busses, bool group) } MixerStrip* -Mixer_UI::strip_by_route (boost::shared_ptr r) const +Mixer_UI::strip_by_route (std::shared_ptr r) const { for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { if ((*i)->route() == r) { @@ -1093,7 +1093,7 @@ Mixer_UI::strip_by_route (boost::shared_ptr r) const } MixerStrip* -Mixer_UI::strip_by_stripable (boost::shared_ptr s) const +Mixer_UI::strip_by_stripable (std::shared_ptr s) const { for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { if ((*i)->stripable() == s) { @@ -1105,7 +1105,7 @@ Mixer_UI::strip_by_stripable (boost::shared_ptr s) const } AxisView* -Mixer_UI::axis_view_by_stripable (boost::shared_ptr s) const +Mixer_UI::axis_view_by_stripable (std::shared_ptr s) const { for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { if ((*i)->stripable() == s) { @@ -1126,7 +1126,7 @@ Mixer_UI::axis_view_by_stripable (boost::shared_ptr s) const } AxisView* -Mixer_UI::axis_view_by_control (boost::shared_ptr c) const +Mixer_UI::axis_view_by_control (std::shared_ptr c) const { for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { if ((*i)->control() == c) { @@ -1502,8 +1502,8 @@ Mixer_UI::set_all_audio_midi_visibility (int tracks, bool yn) continue; } - boost::shared_ptr at = strip->audio_track(); - boost::shared_ptr mt = strip->midi_track(); + std::shared_ptr at = strip->audio_track(); + std::shared_ptr mt = strip->midi_track(); switch (tracks) { case 0: @@ -1610,14 +1610,14 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&) } void -Mixer_UI::spill_redisplay (boost::shared_ptr s) +Mixer_UI::spill_redisplay (std::shared_ptr s) { - boost::shared_ptr vca = boost::dynamic_pointer_cast (s); - boost::shared_ptr r = boost::dynamic_pointer_cast (s); + std::shared_ptr vca = std::dynamic_pointer_cast (s); + std::shared_ptr r = std::dynamic_pointer_cast (s); TreeModel::Children rows = track_model->children(); - std::list > vcas; + std::list > vcas; if (vca) { vcas.push_back (vca); @@ -1654,7 +1654,7 @@ Mixer_UI::spill_redisplay (boost::shared_ptr s) } if (vca) { - for (std::list >::const_iterator m = vcas.begin(); m != vcas.end(); ++m) { + for (std::list >::const_iterator m = vcas.begin(); m != vcas.end(); ++m) { if (strip->route()->slaved_to (*m)) { slaved = true; break; @@ -1700,9 +1700,9 @@ Mixer_UI::redisplay_track_list () return; } - boost::shared_ptr ss = spilled_strip.lock (); + std::shared_ptr ss = spilled_strip.lock (); if (ss) { - boost::shared_ptr sv = boost::dynamic_pointer_cast (ss); + std::shared_ptr sv = std::dynamic_pointer_cast (ss); if (sv) { if (_spill_scroll_position <= 0 && scroller.get_hscrollbar()) { _spill_scroll_position = scroller.get_hscrollbar()->get_adjustment()->get_value(); @@ -1734,7 +1734,7 @@ Mixer_UI::redisplay_track_list () AxisView* s = (*i)[stripable_columns.strip]; bool const visible = (*i)[stripable_columns.visible]; - boost::shared_ptr stripable = (*i)[stripable_columns.stripable]; + std::shared_ptr stripable = (*i)[stripable_columns.stripable]; if (!s) { /* we're in the middle of changing a row, don't worry */ @@ -1844,7 +1844,7 @@ Mixer_UI::strip_width_changed () struct PresentationInfoMixerSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { if (a->is_master()) { /* master after everything else */ return false; @@ -1864,7 +1864,7 @@ Mixer_UI::initial_track_display () _session->get_stripables (sl); _session->get_stripables (fb, PresentationInfo::FoldbackBus); if (fb.size()) { - boost::shared_ptr _current_foldback = *(fb.begin()); + std::shared_ptr _current_foldback = *(fb.begin()); sl.push_back (_current_foldback); } @@ -1901,7 +1901,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) if (track_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { TreeIter iter = track_model->get_iter (path); if ((*iter)[stripable_columns.visible]) { - boost::shared_ptr s = (*iter)[stripable_columns.stripable]; + std::shared_ptr s = (*iter)[stripable_columns.stripable]; move_stripable_into_view (s); } } @@ -1911,7 +1911,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) } void -Mixer_UI::move_vca_into_view (boost::shared_ptr s) +Mixer_UI::move_vca_into_view (std::shared_ptr s) { if (!vca_scroller.get_hscrollbar()) { return; @@ -1949,7 +1949,7 @@ Mixer_UI::move_vca_into_view (boost::shared_ptr s) } void -Mixer_UI::move_stripable_into_view (boost::shared_ptr s) +Mixer_UI::move_stripable_into_view (std::shared_ptr s) { if (!scroller.get_hscrollbar()) { return; @@ -2013,13 +2013,13 @@ Mixer_UI::build_track_menu () } void -Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, boost::weak_ptr ws) +Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, std::weak_ptr ws) { if (!what_changed.contains (ARDOUR::Properties::hidden) && !what_changed.contains (ARDOUR::Properties::name)) { return; } - boost::shared_ptr s = ws.lock (); + std::shared_ptr s = ws.lock (); if (!s) { return; @@ -2029,7 +2029,7 @@ Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, boost: TreeModel::Children::iterator i; for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr ss = (*i)[stripable_columns.stripable]; + std::shared_ptr ss = (*i)[stripable_columns.stripable]; if (s == ss) { @@ -3017,13 +3017,13 @@ Mixer_UI::monitor_section_going_away () void Mixer_UI::toggle_midi_input_active (bool flip_others) { - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); bool onoff = false; set_axis_targets_for_operation (); for (AxisViewSelection::iterator r = _axis_targets.begin(); r != _axis_targets.end(); ++r) { - boost::shared_ptr mt = boost::dynamic_pointer_cast ((*r)->stripable()); + std::shared_ptr mt = std::dynamic_pointer_cast ((*r)->stripable()); if (mt) { rl->push_back (mt); @@ -3462,7 +3462,7 @@ Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition PluginInfoPtr pip = ppp->_pip; for (AxisViewSelection::iterator i = _selection.axes.begin(); i != _selection.axes.end(); ++i) { - boost::shared_ptr rt = boost::dynamic_pointer_cast ((*i)->stripable()); + std::shared_ptr rt = std::dynamic_pointer_cast ((*i)->stripable()); if (!rt) { continue; @@ -3479,7 +3479,7 @@ Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition } Route::ProcessorStreams err; - boost::shared_ptr processor (new PluginInsert (*_session, rt->time_domain(), p)); + std::shared_ptr processor (new PluginInsert (*_session, rt->time_domain(), p)); switch (pos) { case AddTop: @@ -3493,15 +3493,15 @@ Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition int idx = 0; int pos = 0; for (;;++idx) { - boost::shared_ptr np = rt->nth_processor (idx); + std::shared_ptr np = rt->nth_processor (idx); if (!np) { break; } if (!np->display_to_user()) { continue; } - if (boost::dynamic_pointer_cast (np) && // Fader, not Trim - boost::dynamic_pointer_cast (np)->gain_control()->parameter().type() == GainAutomation) { + if (std::dynamic_pointer_cast (np) && // Fader, not Trim + std::dynamic_pointer_cast (np)->gain_control()->parameter().type() == GainAutomation) { break; } ++pos; @@ -3587,23 +3587,23 @@ Mixer_UI::plugin_drop (const Glib::RefPtr&, const Gtk::Selecti } void -Mixer_UI::do_vca_assign (boost::shared_ptr vca) +Mixer_UI::do_vca_assign (std::shared_ptr vca) { /* call protected MixerActor:: method */ vca_assign (vca); } void -Mixer_UI::do_vca_unassign (boost::shared_ptr vca) +Mixer_UI::do_vca_unassign (std::shared_ptr vca) { /* call protected MixerActor:: method */ vca_unassign (vca); } void -Mixer_UI::show_spill (boost::shared_ptr s) +Mixer_UI::show_spill (std::shared_ptr s) { - boost::shared_ptr ss = spilled_strip.lock(); + std::shared_ptr ss = spilled_strip.lock(); if (ss == s) { return; } @@ -3624,11 +3624,11 @@ Mixer_UI::show_spill (boost::shared_ptr s) void Mixer_UI::spill_nothing () { - show_spill (boost::shared_ptr ()); + show_spill (std::shared_ptr ()); } bool -Mixer_UI::showing_spill_for (boost::shared_ptr s) const +Mixer_UI::showing_spill_for (std::shared_ptr s) const { return s == spilled_strip.lock(); } @@ -3705,17 +3705,17 @@ Mixer_UI::load_bindings () } template void -Mixer_UI::control_action (boost::shared_ptr (Stripable::*get_control)() const) +Mixer_UI::control_action (std::shared_ptr (Stripable::*get_control)() const) { - boost::shared_ptr cl (new ControlList); - boost::shared_ptr ac; + std::shared_ptr cl (new ControlList); + std::shared_ptr ac; bool val = false; bool have_val = false; set_axis_targets_for_operation (); BOOST_FOREACH(AxisView* r, _axis_targets) { - boost::shared_ptr s = r->stripable(); + std::shared_ptr s = r->stripable(); if (s) { ac = (s.get()->*get_control)(); if (ac) { @@ -3758,7 +3758,7 @@ Mixer_UI::selected_gaincontrols () BOOST_FOREACH(AxisView* r, _axis_targets) { MixerStrip* ms = dynamic_cast (r); if (ms) { - boost::shared_ptr ac (ms->route()->gain_control()); + std::shared_ptr ac (ms->route()->gain_control()); ControlList cl (ac->grouped_controls()); for (ControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) { rv.insert (*c); @@ -3774,7 +3774,7 @@ Mixer_UI::step_gain_up_action () { ControllableSet acs = selected_gaincontrols (); for (ControllableSet::const_iterator i = acs.begin(); i != acs.end (); ++i) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (*i); + std::shared_ptr ac = std::dynamic_pointer_cast (*i); assert (ac); ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) + 0.1), Controllable::NoGroup); } @@ -3785,7 +3785,7 @@ Mixer_UI::step_gain_down_action () { ControllableSet acs = selected_gaincontrols (); for (ControllableSet::const_iterator i = acs.begin(); i != acs.end (); ++i) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (*i); + std::shared_ptr ac = std::dynamic_pointer_cast (*i); assert (ac); ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) - 0.1), Controllable::NoGroup); } @@ -3797,9 +3797,9 @@ Mixer_UI::unity_gain_action () set_axis_targets_for_operation (); BOOST_FOREACH(AxisView* r, _axis_targets) { - boost::shared_ptr s = r->stripable(); + std::shared_ptr s = r->stripable(); if (s) { - boost::shared_ptr ac = s->gain_control(); + std::shared_ptr ac = s->gain_control(); if (ac) { ac->set_value (1.0, Controllable::UseGroup); } @@ -3881,7 +3881,7 @@ Mixer_UI::ab_plugins () } void -Mixer_UI::vca_assign (boost::shared_ptr vca) +Mixer_UI::vca_assign (std::shared_ptr vca) { set_axis_targets_for_operation (); BOOST_FOREACH(AxisView* r, _axis_targets) { @@ -3893,7 +3893,7 @@ Mixer_UI::vca_assign (boost::shared_ptr vca) } void -Mixer_UI::vca_unassign (boost::shared_ptr vca) +Mixer_UI::vca_unassign (std::shared_ptr vca) { set_axis_targets_for_operation (); BOOST_FOREACH(AxisView* r, _axis_targets) { @@ -3914,7 +3914,7 @@ Mixer_UI::store_mixer_scene (size_t n) std::string str; /* if it already exists, prompt the user to overwrite an existing scene */ - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); if (ms && !ms->empty ()) { ArdourMessageDialog md (_("Scene is already set. Overwrite it?"), false, MESSAGE_QUESTION, BUTTONS_YES_NO); if (md.run () != RESPONSE_YES) { @@ -3945,7 +3945,7 @@ Mixer_UI::store_mixer_scene (size_t n) name_prompter.hide (); if (result.length()) { _session->store_nth_mixer_scene (n); - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); ms->set_name(result); done = true; } else { @@ -3967,7 +3967,7 @@ Mixer_UI::recall_mixer_scene (size_t n, bool interactive, bool for_selection) return; } - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); if (!ms || ms->empty ()) { return; } @@ -4013,7 +4013,7 @@ Mixer_UI::clear_mixer_scene (size_t n, bool interactive) return; } - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); if (!ms) { return; } @@ -4055,7 +4055,7 @@ Mixer_UI::rename_mixer_scene (size_t n) return; } - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); if (!ms) { return; } @@ -4076,7 +4076,7 @@ Mixer_UI::rename_mixer_scene (size_t n) name_prompter.get_result (result); name_prompter.hide (); if (result.length()) { - boost::shared_ptr ms = _session->nth_mixer_scene (n, false); + std::shared_ptr ms = _session->nth_mixer_scene (n, false); ms->set_name(result); done = true; } else { @@ -4099,7 +4099,7 @@ Mixer_UI::popup_scene_menu (GdkEventButton* ev, int scn_idx) items.push_back(Gtk::Menu_Helpers::MenuElem(_("Store"), sigc::bind(sigc::mem_fun(*this, &Mixer_UI::store_mixer_scene), scn_idx))); - boost::shared_ptr ms = _session->nth_mixer_scene (scn_idx); + std::shared_ptr ms = _session->nth_mixer_scene (scn_idx); if(ms && !ms->empty()) { items.push_back(Gtk::Menu_Helpers::MenuElem(_("Clear"), sigc::bind(sigc::mem_fun(*this, &Mixer_UI::clear_mixer_scene), scn_idx, true))); items.push_back(Gtk::Menu_Helpers::MenuElem(_("Rename"), sigc::bind(sigc::mem_fun(*this, &Mixer_UI::rename_mixer_scene), scn_idx))); @@ -4151,7 +4151,7 @@ Mixer_UI::scene_button_release (GdkEventButton* ev, int idx) bool Mixer_UI::scene_label_press (GdkEventButton* ev, int idx) { - boost::shared_ptr scn = _session->nth_mixer_scene (idx); + std::shared_ptr scn = _session->nth_mixer_scene (idx); if (!scn || scn->empty()) { return false; } @@ -4172,7 +4172,7 @@ Mixer_UI::update_scene_buttons () } bool all_unset = true; for (size_t idx = 0; idx < _mixer_scene_buttons.size (); ++idx) { - boost::shared_ptr scn; + std::shared_ptr scn; bool last = false; if (_session) { @@ -4291,10 +4291,10 @@ void Mixer_UI::toggle_monitor_action (MonitorChoice monitor_choice, bool group_override, bool all) { MonitorChoice mc; - boost::shared_ptr rl; + std::shared_ptr rl; for (AxisViewSelection::iterator i = _selection.axes.begin(); i != _selection.axes.end(); ++i) { - boost::shared_ptr rt = boost::dynamic_pointer_cast ((*i)->stripable()); + std::shared_ptr rt = std::dynamic_pointer_cast ((*i)->stripable()); if (!rt->monitoring_control ()) { /* skip busses */ diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index b05f2181ad..d9967a8ba5 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -128,13 +128,13 @@ public: void clear_mixer_scene (size_t, bool interactive = true); void rename_mixer_scene (size_t n); - void do_vca_assign (boost::shared_ptr); - void do_vca_unassign (boost::shared_ptr); - void show_spill (boost::shared_ptr); - bool showing_spill_for (boost::shared_ptr) const; - void fan_out (boost::weak_ptr, bool to_busses, bool group); + void do_vca_assign (std::shared_ptr); + void do_vca_unassign (std::shared_ptr); + void show_spill (std::shared_ptr); + bool showing_spill_for (std::shared_ptr) const; + void fan_out (std::weak_ptr, bool to_busses, bool group); - sigc::signal1 > show_spill_change; + sigc::signal1 > show_spill_change; RouteProcessorSelection& selection() { return _selection; } @@ -238,8 +238,8 @@ private: void vca_scroll_right (); void toggle_midi_input_active (bool flip_others); - void move_vca_into_view (boost::shared_ptr); - void move_stripable_into_view (boost::shared_ptr); + void move_vca_into_view (std::shared_ptr); + void move_stripable_into_view (std::shared_ptr); void add_stripables (ARDOUR::StripableList&); @@ -252,11 +252,11 @@ private: void remove_master (VCAMasterStrip*); void new_masters_created (); - MixerStrip* strip_by_route (boost::shared_ptr) const; - MixerStrip* strip_by_stripable (boost::shared_ptr) const; + MixerStrip* strip_by_route (std::shared_ptr) const; + MixerStrip* strip_by_stripable (std::shared_ptr) const; - AxisView* axis_view_by_stripable (boost::shared_ptr) const; - AxisView* axis_view_by_control (boost::shared_ptr) const; + AxisView* axis_view_by_stripable (std::shared_ptr) const; + AxisView* axis_view_by_control (std::shared_ptr) const; gint start_updating (); gint stop_updating (); @@ -269,7 +269,7 @@ private: void track_name_changed (MixerStrip *); void redisplay_track_list (); - void spill_redisplay (boost::shared_ptr); + void spill_redisplay (std::shared_ptr); bool no_track_list_redisplay; bool track_display_button_press (GdkEventButton*); void strip_width_changed (); @@ -336,7 +336,7 @@ private: FoldbackStrip * foldback_strip; bool _show_foldback_strip; - void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr ws); + void stripable_property_changed (const PBD::PropertyChange& what_changed, std::weak_ptr ws); void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &); /* various treeviews */ @@ -350,7 +350,7 @@ private: } Gtk::TreeModelColumn visible; Gtk::TreeModelColumn text; - Gtk::TreeModelColumn > stripable; + Gtk::TreeModelColumn > stripable; Gtk::TreeModelColumn strip; }; @@ -456,7 +456,7 @@ private: bool _strip_selection_change_without_scroll; - mutable boost::weak_ptr spilled_strip; + mutable std::weak_ptr spilled_strip; void escape (); @@ -466,10 +466,10 @@ private: void spill_nothing (); PBD::ScopedConnection _spill_gone_connection; - void vca_assign (boost::shared_ptr); - void vca_unassign (boost::shared_ptr); + void vca_assign (std::shared_ptr); + void vca_unassign (std::shared_ptr); - template void control_action (boost::shared_ptr (ARDOUR::Stripable::*get_control)() const); + template void control_action (std::shared_ptr (ARDOUR::Stripable::*get_control)() const); void solo_action (); void mute_action (); void rec_enable_action (); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index ddabfac8ec..2f6cbbbc51 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1194,7 +1194,7 @@ bool MonitorSection::cancel_isolate (GdkEventButton*) { if (_session) { - boost::shared_ptr rl (_session->get_routes ()); + std::shared_ptr rl (_session->get_routes ()); _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), 0.0, Controllable::NoGroup); } @@ -1227,7 +1227,7 @@ MonitorSection::parameter_changed (std::string name) void MonitorSection::unassign_controllables () { - boost::shared_ptr none; + std::shared_ptr none; solo_cut_control->set_controllable (none); solo_cut_display->set_controllable (none); @@ -1273,7 +1273,7 @@ MonitorSection::state_id() const } void -MonitorSection::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/) +MonitorSection::maybe_add_bundle_to_output_menu (std::shared_ptr b, ARDOUR::BundleList const& /*current*/) { using namespace Menu_Helpers; @@ -1281,7 +1281,7 @@ MonitorSection::maybe_add_bundle_to_output_menu (boost::shared_ptr b, AR return; } - list >::iterator i = output_menu_bundles.begin (); + list >::iterator i = output_menu_bundles.begin (); while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) { ++i; } @@ -1301,7 +1301,7 @@ MonitorSection::maybe_add_bundle_to_output_menu (boost::shared_ptr b, AR } void -MonitorSection::bundle_output_chosen (boost::shared_ptr c) +MonitorSection::bundle_output_chosen (std::shared_ptr c) { ARDOUR::BundleList current = _route->output()->bundles_connected (); @@ -1326,7 +1326,7 @@ MonitorSection::output_release (GdkEventButton *ev) } struct RouteCompareByName { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { return a->name().compare (b->name()) < 0; } }; @@ -1360,23 +1360,23 @@ MonitorSection::output_press (GdkEventButton *ev) ARDOUR::BundleList current = _route->output()->bundles_connected (); - boost::shared_ptr b = _session->bundles (); + std::shared_ptr b = _session->bundles (); /* 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 (*i)) { + if (std::dynamic_pointer_cast (*i)) { maybe_add_bundle_to_output_menu (*i, current); } } for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast (*i) == 0) { + if (std::dynamic_pointer_cast (*i) == 0) { maybe_add_bundle_to_output_menu (*i, current); } } - boost::shared_ptr routes = _session->get_routes (); + std::shared_ptr routes = _session->get_routes (); RouteList copy = *routes; copy.sort (RouteCompareByName ()); for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { @@ -1410,7 +1410,7 @@ MonitorSection::update_output_display () uint32_t io_count; uint32_t io_index; - boost::shared_ptr port; + std::shared_ptr port; vector port_connections; uint32_t total_connection_count = 0; @@ -1581,13 +1581,13 @@ MonitorSection::edit_output_configuration () } void -MonitorSection::port_connected_or_disconnected (boost::weak_ptr wa, boost::weak_ptr wb) +MonitorSection::port_connected_or_disconnected (std::weak_ptr wa, std::weak_ptr wb) { if (!_route) { return; } - boost::shared_ptr a = wa.lock (); - boost::shared_ptr b = wb.lock (); + std::shared_ptr a = wa.lock (); + std::shared_ptr b = wb.lock (); if ((a && _route->output()->has_port (a)) || (b && _route->output()->has_port (b))) { update_output_display (); } @@ -1612,13 +1612,13 @@ MonitorSection::load_bindings () } void -MonitorSection::help_count_processors (boost::weak_ptr p, uint32_t* cnt) const +MonitorSection::help_count_processors (std::weak_ptr p, uint32_t* cnt) const { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor || !processor->display_to_user()) { return; } - if (boost::dynamic_pointer_cast(processor)) { + if (std::dynamic_pointer_cast(processor)) { return; } ++(*cnt); diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h index 969c2f9649..f9953118d4 100644 --- a/gtk2_ardour/monitor_section.h +++ b/gtk2_ardour/monitor_section.h @@ -99,13 +99,13 @@ private: ArdourWidgets::ArdourDisplay* solo_boost_display; ArdourWidgets::ArdourDisplay* solo_cut_display; - std::list > output_menu_bundles; + std::list > output_menu_bundles; Gtk::Menu output_menu; MonitorSelectorWindow *_output_selector; ArdourWidgets::ArdourButton* output_button; - void maybe_add_bundle_to_output_menu (boost::shared_ptr, ARDOUR::BundleList const &); - void bundle_output_chosen (boost::shared_ptr); + void maybe_add_bundle_to_output_menu (std::shared_ptr, ARDOUR::BundleList const &); + void bundle_output_chosen (std::shared_ptr); void update_output_display (); void disconnect_output (); void edit_output_configuration (); @@ -113,7 +113,7 @@ private: void populate_buttons (); void map_state (); - boost::shared_ptr _monitor; + std::shared_ptr _monitor; Glib::RefPtr monitor_actions; Glib::RefPtr solo_actions; @@ -173,7 +173,7 @@ private: void assign_controllables (); void unassign_controllables (); - void port_connected_or_disconnected (boost::weak_ptr, boost::weak_ptr); + void port_connected_or_disconnected (std::weak_ptr, std::weak_ptr); void port_pretty_name_changed (std::string); void update_processor_box (); @@ -182,7 +182,7 @@ private: ProcessorBox* insert_box; ProcessorSelection _rr_selection; - void help_count_processors (boost::weak_ptr p, uint32_t* cnt) const; + void help_count_processors (std::weak_ptr p, uint32_t* cnt) const; uint32_t count_processors (); void processors_changed (ARDOUR::RouteProcessorChange); diff --git a/gtk2_ardour/monitor_selector.cc b/gtk2_ardour/monitor_selector.cc index e70cfdd43b..7c40b6b584 100644 --- a/gtk2_ardour/monitor_selector.cc +++ b/gtk2_ardour/monitor_selector.cc @@ -40,7 +40,7 @@ using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; using namespace Gtk; -MonitorSelector::MonitorSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr io) +MonitorSelector::MonitorSelector (Gtk::Window* p, ARDOUR::Session* session, std::shared_ptr io) : PortMatrix (p, session, DataType::AUDIO) , _io (io) { @@ -115,7 +115,7 @@ MonitorSelector::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 f = _session->engine().get_port_by_name (*i); + std::shared_ptr f = _session->engine().get_port_by_name (*i); if (!f) { return; } @@ -152,7 +152,7 @@ MonitorSelector::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 f = _session->engine().get_port_by_name (*i); + std::shared_ptr 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 */ @@ -196,7 +196,7 @@ MonitorSelector::channel_noun () const return _("port"); } -MonitorSelectorWindow::MonitorSelectorWindow (ARDOUR::Session* session, boost::shared_ptr io, bool /*can_cancel*/) +MonitorSelectorWindow::MonitorSelectorWindow (ARDOUR::Session* session, std::shared_ptr io, bool /*can_cancel*/) : ArdourWindow (_("Monitor output selector")) , _selector (this, session, io) { diff --git a/gtk2_ardour/monitor_selector.h b/gtk2_ardour/monitor_selector.h index 14c2a8abe4..d9330cbdb6 100644 --- a/gtk2_ardour/monitor_selector.h +++ b/gtk2_ardour/monitor_selector.h @@ -27,7 +27,7 @@ class MonitorSelector : public PortMatrix { public: - MonitorSelector (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr); + MonitorSelector (Gtk::Window*, ARDOUR::Session *, std::shared_ptr); void set_state (ARDOUR::BundleChannel c[2], bool); PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const; @@ -36,7 +36,7 @@ public: std::string channel_noun () const; uint32_t n_io_ports () const; - boost::shared_ptr const io () { return _io; } + std::shared_ptr const io () { return _io; } void setup_ports (int); bool list_is_global (int) const; @@ -52,9 +52,9 @@ public: return _other; } - bool can_add_channels (boost::shared_ptr) const { return false; } - bool can_remove_channels (boost::shared_ptr) const { return false; } - bool can_rename_channels (boost::shared_ptr) const { return false; } + bool can_add_channels (std::shared_ptr) const { return false; } + bool can_remove_channels (std::shared_ptr) const { return false; } + bool can_rename_channels (std::shared_ptr) const { return false; } private: void io_changed (); @@ -62,8 +62,8 @@ private: int _other; int _ours; - boost::shared_ptr _io; - boost::shared_ptr _port_group; + std::shared_ptr _io; + std::shared_ptr _port_group; bool _find_inputs_for_io_outputs; PBD::ScopedConnection _io_connection; }; @@ -71,7 +71,7 @@ private: class MonitorSelectorWindow : public ArdourWindow { public: - MonitorSelectorWindow (ARDOUR::Session *, boost::shared_ptr, bool can_cancel = false); + MonitorSelectorWindow (ARDOUR::Session *, std::shared_ptr, bool can_cancel = false); MonitorSelector& selector() { return _selector; } diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 072323b52d..49934521e7 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -61,7 +61,7 @@ bool MonoPanner::have_colors = false; Pango::AttrList MonoPanner::panner_font_attributes; bool MonoPanner::have_font = false; -MonoPanner::MonoPanner (boost::shared_ptr p) +MonoPanner::MonoPanner (std::shared_ptr p) : PannerInterface (p->panner()) , _panner_shell (p) , position_control (_panner->pannable()->pan_azimuth_control) diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h index 981762a3a3..4484a0901c 100644 --- a/gtk2_ardour/mono_panner.h +++ b/gtk2_ardour/mono_panner.h @@ -40,10 +40,10 @@ namespace PBD { class MonoPanner : public PannerInterface { public: - MonoPanner (boost::shared_ptr); + MonoPanner (std::shared_ptr); ~MonoPanner (); - boost::shared_ptr get_controllable() const { return position_control; } + std::shared_ptr get_controllable() const { return position_control; } sigc::signal StartGesture; sigc::signal StopGesture; @@ -56,16 +56,16 @@ protected: bool on_scroll_event (GdkEventScroll*); bool on_key_press_event (GdkEventKey*); - boost::weak_ptr proxy_controllable () const + std::weak_ptr proxy_controllable () const { - return boost::weak_ptr (position_binder.get_controllable()); + return std::weak_ptr (position_binder.get_controllable()); } private: PannerEditor* editor (); - boost::shared_ptr _panner_shell; + std::shared_ptr _panner_shell; - boost::shared_ptr position_control; + std::shared_ptr position_control; PBD::ScopedConnectionList panvalue_connections; PBD::ScopedConnectionList panshell_connections; int drag_start_x; diff --git a/gtk2_ardour/new_plugin_preset_dialog.cc b/gtk2_ardour/new_plugin_preset_dialog.cc index 1fd2742ed2..2ca60f3a70 100644 --- a/gtk2_ardour/new_plugin_preset_dialog.cc +++ b/gtk2_ardour/new_plugin_preset_dialog.cc @@ -24,7 +24,7 @@ using namespace std; using namespace Gtk; -NewPluginPresetDialog::NewPluginPresetDialog (boost::shared_ptr p, std::string title, bool favorite_btn) +NewPluginPresetDialog::NewPluginPresetDialog (std::shared_ptr p, std::string title, bool favorite_btn) : ArdourDialog (title) , _replace (_("Replace existing preset with this name")) { diff --git a/gtk2_ardour/new_plugin_preset_dialog.h b/gtk2_ardour/new_plugin_preset_dialog.h index 2083a7b9a2..adde71db10 100644 --- a/gtk2_ardour/new_plugin_preset_dialog.h +++ b/gtk2_ardour/new_plugin_preset_dialog.h @@ -26,7 +26,7 @@ class NewPluginPresetDialog : public ArdourDialog { public: - NewPluginPresetDialog (boost::shared_ptr, std::string, bool fav = false); + NewPluginPresetDialog (std::shared_ptr, std::string, bool fav = false); std::string name () const; bool replace () const; diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc index 7cc1bd6a86..e93cd9304a 100644 --- a/gtk2_ardour/note.cc +++ b/gtk2_ardour/note.cc @@ -30,7 +30,7 @@ using ArdourCanvas::Coord; using ArdourCanvas::Duple; Note::Note ( - MidiRegionView& region, ArdourCanvas::Item* parent, const boost::shared_ptr note, bool with_events) + MidiRegionView& region, ArdourCanvas::Item* parent, const std::shared_ptr note, bool with_events) : NoteBase (region, with_events, note) , _note (new ArdourCanvas::Note (parent)) { diff --git a/gtk2_ardour/note.h b/gtk2_ardour/note.h index 0461afd76f..dd699e2825 100644 --- a/gtk2_ardour/note.h +++ b/gtk2_ardour/note.h @@ -35,7 +35,7 @@ public: Note (MidiRegionView& region, ArdourCanvas::Item* parent, - const boost::shared_ptr note = boost::shared_ptr(), + const std::shared_ptr note = std::shared_ptr(), bool with_events = true); ~Note (); diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc index 5cd88b7cce..6c4e9cc0db 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -61,7 +61,7 @@ NoteBase::set_colors () color_modifier = UIConfiguration::instance().modifier ("midi note"); } -NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared_ptr note) +NoteBase::NoteBase(MidiRegionView& region, bool with_events, const std::shared_ptr note) : _region(region) , _item (0) , _text(0) diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h index 5b26a0f69b..e86cdd141f 100644 --- a/gtk2_ardour/note_base.h +++ b/gtk2_ardour/note_base.h @@ -64,7 +64,7 @@ class NoteBase : public sigc::trackable public: typedef Evoral::Note NoteType; - NoteBase (MidiRegionView& region, bool, const boost::shared_ptr note = boost::shared_ptr()); + NoteBase (MidiRegionView& region, bool, const std::shared_ptr note = std::shared_ptr()); virtual ~NoteBase (); void set_item (ArdourCanvas::Item *); @@ -107,7 +107,7 @@ class NoteBase : public sigc::trackable float mouse_x_fraction() const { return _mouse_x_fraction; } float mouse_y_fraction() const { return _mouse_y_fraction; } - const boost::shared_ptr note() const { return _note; } + const std::shared_ptr note() const { return _note; } MidiRegionView& region_view() const { return _region; } static void set_colors (); @@ -136,7 +136,7 @@ protected: ArdourCanvas::Item* _item; ArdourCanvas::Text* _text; State _state; - const boost::shared_ptr _note; + const std::shared_ptr _note; bool _with_events; bool _own_note; Flags _flags; diff --git a/gtk2_ardour/note_player.cc b/gtk2_ardour/note_player.cc index 1b991aa052..cb148f5f0b 100644 --- a/gtk2_ardour/note_player.cc +++ b/gtk2_ardour/note_player.cc @@ -27,7 +27,7 @@ using namespace ARDOUR; using namespace std; -NotePlayer::NotePlayer (boost::shared_ptr mt) +NotePlayer::NotePlayer (std::shared_ptr mt) : track (mt) { } @@ -38,7 +38,7 @@ NotePlayer::~NotePlayer () } void -NotePlayer::add (boost::shared_ptr note) +NotePlayer::add (std::shared_ptr note) { notes.push_back (note); } diff --git a/gtk2_ardour/note_player.h b/gtk2_ardour/note_player.h index 7cc197933e..94c60b3ab4 100644 --- a/gtk2_ardour/note_player.h +++ b/gtk2_ardour/note_player.h @@ -35,10 +35,10 @@ class NotePlayer : public sigc::trackable { public: typedef Evoral::Note NoteType; - NotePlayer (boost::shared_ptr); + NotePlayer (std::shared_ptr); ~NotePlayer (); - void add (boost::shared_ptr); + void add (std::shared_ptr); void play (); void on (); void off (); @@ -47,9 +47,9 @@ public: static bool _off (NotePlayer*); private: - typedef std::vector< boost::shared_ptr > Notes; + typedef std::vector< std::shared_ptr > Notes; - boost::shared_ptr track; + std::shared_ptr track; Notes notes; }; diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 27416ab0f5..8ac17d37a1 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -609,7 +609,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot , _get (g) , _set (s) { - _db_slider = manage (new ArdourWidgets::HSliderController (&_db_adjustment, boost::shared_ptr(), 220, 18)); + _db_slider = manage (new ArdourWidgets::HSliderController (&_db_adjustment, std::shared_ptr(), 220, 18)); _label.set_text (n + ":"); _label.set_alignment (0, 0.5); diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index dd1b4ff0a0..a727c0acc4 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -80,7 +80,7 @@ Panner2d::Target::set_text (const char* txt) text = txt; } -Panner2d::Panner2d (boost::shared_ptr p, int32_t h) +Panner2d::Panner2d (std::shared_ptr p, int32_t h) : panner_shell (p) , position (AngularVector (0.0, 0.0), "") , width (0) @@ -903,7 +903,7 @@ Panner2d::toggle_bypass () panner_shell->set_bypassed (!panner_shell->bypassed()); } -Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uint32_t inputs) +Panner2dWindow::Panner2dWindow (std::shared_ptr p, int32_t h, uint32_t inputs) : ArdourWindow (_("Panner (2D)")) , widget (p, h) , bypass_button (_("Bypass")) diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index a0ccb078a1..46498ade6b 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -57,7 +57,7 @@ class Panner2dWindow; class Panner2d : public Gtk::DrawingArea { public: - Panner2d (boost::shared_ptr, int32_t height); + Panner2d (std::shared_ptr, int32_t height); ~Panner2d (); void allow_target_motion (bool); @@ -68,7 +68,7 @@ class Panner2d : public Gtk::DrawingArea void reset (uint32_t n_inputs); void set_send_drawing_mode (bool); - boost::shared_ptr get_panner_shell() const { return panner_shell; } + std::shared_ptr get_panner_shell() const { return panner_shell; } void cart_to_gtk (PBD::CartesianVector&) const; void gtk_to_cart (PBD::CartesianVector&) const; @@ -125,7 +125,7 @@ class Panner2d : public Gtk::DrawingArea static bool have_colors; void color_handler (); - boost::shared_ptr panner_shell; + std::shared_ptr panner_shell; Glib::RefPtr layout; typedef std::vector Targets; @@ -167,7 +167,7 @@ class Panner2d : public Gtk::DrawingArea class Panner2dWindow : public ArdourWindow { public: - Panner2dWindow (boost::shared_ptr, int32_t height, uint32_t inputs); + Panner2dWindow (std::shared_ptr, int32_t height, uint32_t inputs); void reset (uint32_t n_inputs); diff --git a/gtk2_ardour/panner_interface.cc b/gtk2_ardour/panner_interface.cc index 3c82e93142..159d2c6e87 100644 --- a/gtk2_ardour/panner_interface.cc +++ b/gtk2_ardour/panner_interface.cc @@ -33,7 +33,7 @@ using namespace Gtk; using namespace ARDOUR; using namespace Gtkmm2ext; -PannerInterface::PannerInterface (boost::shared_ptr p) +PannerInterface::PannerInterface (std::shared_ptr p) : _panner (p) , _tooltip (this) , _send_mode (false) @@ -71,7 +71,7 @@ PannerInterface::on_leave_notify_event (GdkEventCrossing *) { Keyboard::magic_widget_drop_focus (); if (!proxy_controllable ().expired ()) { - PBD::Controllable::GUIFocusChanged (boost::weak_ptr ()); + PBD::Controllable::GUIFocusChanged (std::weak_ptr ()); } return false; } diff --git a/gtk2_ardour/panner_interface.h b/gtk2_ardour/panner_interface.h index 3056075d4e..53d3e472af 100644 --- a/gtk2_ardour/panner_interface.h +++ b/gtk2_ardour/panner_interface.h @@ -57,10 +57,10 @@ private: class PannerInterface : public Gtk::DrawingArea, public PBD::Destructible { public: - PannerInterface (boost::shared_ptr); + PannerInterface (std::shared_ptr); virtual ~PannerInterface (); - boost::shared_ptr panner () { + std::shared_ptr panner () { return _panner; } @@ -69,7 +69,7 @@ public: protected: virtual void set_tooltip () = 0; - virtual boost::weak_ptr proxy_controllable () const = 0; + virtual std::weak_ptr proxy_controllable () const = 0; void value_change (); @@ -79,7 +79,7 @@ protected: bool on_button_press_event (GdkEventButton*); bool on_button_release_event (GdkEventButton*); - boost::shared_ptr _panner; + std::shared_ptr _panner; PannerPersistentTooltip _tooltip; bool _send_mode; diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 746459a789..aa33a231f1 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -93,7 +93,7 @@ PannerUI::PannerUI (Session* s) } void -PannerUI::set_panner (boost::shared_ptr ps, boost::shared_ptr p) +PannerUI::set_panner (std::shared_ptr ps, std::shared_ptr p) { /* note that the panshell might not change here (i.e. ps == _panshell) */ @@ -150,7 +150,7 @@ PannerUI::build_astate_menu () pan_astate_menu->items().clear (); } - boost::shared_ptr pannable = _panshell->pannable(); + std::shared_ptr pannable = _panshell->pannable(); pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Off), sigc::bind ( sigc::mem_fun (pannable.get(), &Pannable::set_automation_state), (AutoState) ARDOUR::Off))); @@ -253,26 +253,26 @@ PannerUI::setup_pan () delete big_window; big_window = 0; - boost::shared_ptr pannable = _panner->pannable(); + std::shared_ptr pannable = _panner->pannable(); _stereo_panner = new StereoPanner (_panshell); _stereo_panner->set_size_request (-1, 5 * ceilf(7.f * scale)); _stereo_panner->set_send_drawing_mode (_send_mode); pan_vbox.pack_start (*_stereo_panner, false, false); - boost::shared_ptr ac; + std::shared_ptr ac; ac = pannable->pan_azimuth_control; _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); + std::weak_ptr (ac))); _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); + std::weak_ptr(ac))); ac = pannable->pan_width_control; _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); + std::weak_ptr (ac))); _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); + std::weak_ptr(ac))); _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); } else if (_current_uri == "http://ardour.org/plugin/panner_1in2out#ui" @@ -280,15 +280,15 @@ PannerUI::setup_pan () { delete big_window; big_window = 0; - boost::shared_ptr pannable = _panner->pannable(); - boost::shared_ptr ac = pannable->pan_azimuth_control; + std::shared_ptr pannable = _panner->pannable(); + std::shared_ptr ac = pannable->pan_azimuth_control; _mono_panner = new MonoPanner (_panshell); _mono_panner->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); + std::weak_ptr (ac))); _mono_panner->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); + std::weak_ptr(ac))); _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); @@ -346,9 +346,9 @@ PannerUI::set_send_drawing_mode (bool onoff) } void -PannerUI::start_touch (boost::weak_ptr wac) +PannerUI::start_touch (std::weak_ptr wac) { - boost::shared_ptr ac = wac.lock(); + std::shared_ptr ac = wac.lock(); if (!ac) { return; } @@ -356,9 +356,9 @@ PannerUI::start_touch (boost::weak_ptr wac) } void -PannerUI::stop_touch (boost::weak_ptr wac) +PannerUI::stop_touch (std::weak_ptr wac) { - boost::shared_ptr ac = wac.lock(); + std::shared_ptr ac = wac.lock(); if (!ac) { return; } @@ -540,7 +540,7 @@ PannerUI::pan_automation_state_button_event (GdkEventButton *ev) void PannerUI::pan_automation_state_changed () { - boost::shared_ptr pannable (_panner->pannable()); + std::shared_ptr pannable (_panner->pannable()); pan_automation_state_button.set_label (GainMeterBase::short_astate_string(pannable->automation_state())); bool x = (pannable->automation_state() != ARDOUR::Off); diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index e7afa2a6cd..c128de5911 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -60,7 +60,7 @@ public: PannerUI (ARDOUR::Session*); ~PannerUI (); - virtual void set_panner (boost::shared_ptr, boost::shared_ptr); + virtual void set_panner (std::shared_ptr, std::shared_ptr); void panshell_changed (); @@ -85,8 +85,8 @@ private: friend class TriggerStrip; friend class SendUI; - boost::shared_ptr _panshell; - boost::shared_ptr _panner; + std::shared_ptr _panshell; + std::shared_ptr _panner; PBD::ScopedConnectionList connections; PBD::ScopedConnectionList _pan_control_connections; @@ -146,8 +146,8 @@ private: void pan_automation_state_changed(); gint pan_automation_state_button_event (GdkEventButton *); - void start_touch (boost::weak_ptr); - void stop_touch (boost::weak_ptr); + void start_touch (std::weak_ptr); + void stop_touch (std::weak_ptr); std::map _panner_list; bool _suspend_menu_callbacks; diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc index dc67562fb0..1db98f1e07 100644 --- a/gtk2_ardour/patch_change.cc +++ b/gtk2_ardour/patch_change.cc @@ -89,7 +89,7 @@ PatchChange::initialize_popup_menus () { using namespace MIDI::Name; - boost::shared_ptr channel_name_set = _info.get_patches (_patch->channel ()); + std::shared_ptr channel_name_set = _info.get_patches (_patch->channel ()); if (!channel_name_set || channel_name_set->patch_banks ().size () == 0) { return; diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index 4886be0212..4ce2aea8f4 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -48,7 +48,7 @@ PatchChangeDialog::PatchChangeDialog ( const Gtk::BuiltinStockID& ok, bool allow_delete, bool modal, - boost::shared_ptr region) + std::shared_ptr region) : ArdourDialog (_("Patch Change"), modal) , _region (region) , _info (info) @@ -193,7 +193,7 @@ PatchChangeDialog::fill_bank_combo () { _bank_combo.clear (); - boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + std::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); if (!cns) { return; @@ -212,7 +212,7 @@ PatchChangeDialog::set_active_bank_combo () { _current_patch_bank.reset (); - boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + std::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); if (!cns) { return; @@ -249,7 +249,7 @@ PatchChangeDialog::bank_combo_changed () _current_patch_bank.reset (); - boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + std::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); if (!cns) { return; diff --git a/gtk2_ardour/patch_change_dialog.h b/gtk2_ardour/patch_change_dialog.h index 65cd243e99..261672a945 100644 --- a/gtk2_ardour/patch_change_dialog.h +++ b/gtk2_ardour/patch_change_dialog.h @@ -48,7 +48,7 @@ public: const Gtk::BuiltinStockID&, bool allow_delete = false, bool modal = true, - boost::shared_ptr region = boost::shared_ptr() + std::shared_ptr region = std::shared_ptr() ); Evoral::PatchChange patch () const; @@ -69,7 +69,7 @@ private: int get_14bit_bank () const; - const boost::shared_ptr _region; + const std::shared_ptr _region; ARDOUR::InstrumentInfo& _info; AudioClock _time; Gtk::SpinButton _channel; @@ -79,7 +79,7 @@ private: Gtk::ComboBoxText _bank_combo; Gtk::ComboBoxText _patch_combo; - boost::shared_ptr _current_patch_bank; + std::shared_ptr _current_patch_bank; bool _ignore_signals; bool _keep_open; diff --git a/gtk2_ardour/patch_change_widget.cc b/gtk2_ardour/patch_change_widget.cc index 3d0980bf8c..07c6ebd90b 100644 --- a/gtk2_ardour/patch_change_widget.cc +++ b/gtk2_ardour/patch_change_widget.cc @@ -87,7 +87,7 @@ flip_map (std::map const& src) } void -PatchBankList::refill (boost::shared_ptr cns, int const b) +PatchBankList::refill (std::shared_ptr cns, int const b) { using namespace Menu_Helpers; using namespace Gtkmm2ext; @@ -267,11 +267,11 @@ PatchChangeTab::PatchChangeTab (int channel) _enable_btn.signal_clicked.connect (sigc::mem_fun (*this, &PatchChangeTab::enable_toggle)); - reset (boost::shared_ptr (), boost::shared_ptr()); + reset (std::shared_ptr (), std::shared_ptr()); } void -PatchChangeTab::reset (boost::shared_ptr r, boost::shared_ptr t) +PatchChangeTab::reset (std::shared_ptr r, std::shared_ptr t) { _route = r; _trigger = t; @@ -358,7 +358,7 @@ PatchChangeTab::refresh () void PatchChangeTab::refill_banks () { - boost::shared_ptr cns; + std::shared_ptr cns; if (_route) { cns = _route->instrument_info ().get_patches (_channel); } @@ -393,7 +393,7 @@ PatchChangeTab::instrument_info_changed () /* ****************************************************************************/ -PatchChangeWidget::PatchChangeWidget (boost::shared_ptr r) +PatchChangeWidget::PatchChangeWidget (std::shared_ptr r) : _route (r) , _info (r->instrument_info ()) , _channel (-1) @@ -422,7 +422,7 @@ PatchChangeWidget::PatchChangeWidget (boost::shared_ptr r) _program_table.set_spacings (1); pack_start (_program_table, true, true); - if (!boost::dynamic_pointer_cast (_route)) { + if (!std::dynamic_pointer_cast (_route)) { pack_start (*manage (new Label (_("Note: Patch Selection is volatile (only Midi-Tracks retain bank/patch selection)."))), false, false); } @@ -466,7 +466,7 @@ PatchChangeWidget::PatchChangeWidget (boost::shared_ptr r) set_spacing (4); show_all (); - if (!boost::dynamic_pointer_cast (_route)) { + if (!std::dynamic_pointer_cast (_route)) { processors_changed (); _route->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PatchChangeWidget::processors_changed, this), gui_context ()); @@ -524,10 +524,10 @@ PatchChangeWidget::select_channel (uint8_t chn) _ac_connections.drop_connections (); - if (boost::dynamic_pointer_cast (_route)) { - boost::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); - boost::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); - boost::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, chn), true); + if (std::dynamic_pointer_cast (_route)) { + std::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); + std::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); + std::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, chn), true); bank_msb->Changed.connect (_ac_connections, invalidator (*this), boost::bind (&PatchChangeWidget::bank_changed, this), gui_context ()); @@ -535,7 +535,7 @@ PatchChangeWidget::select_channel (uint8_t chn) boost::bind (&PatchChangeWidget::bank_changed, this), gui_context ()); program->Changed.connect (_ac_connections, invalidator (*this), boost::bind (&PatchChangeWidget::program_changed, this), gui_context ()); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { if (pi->plugin ()->knows_bank_patch ()) { pi->plugin ()->BankPatchChange.connect (_ac_connections, invalidator (*this), boost::bind (&PatchChangeWidget::bankpatch_changed, this, _1), gui_context ()); @@ -553,7 +553,7 @@ PatchChangeWidget::refill_banks () { cancel_audition (); - boost::shared_ptr cns = _info.get_patches (_channel); + std::shared_ptr cns = _info.get_patches (_channel); refill (cns, bank (_channel)); program_changed (); } @@ -565,13 +565,13 @@ PatchChangeWidget::select_bank (uint32_t bank) { cancel_audition (); - if (boost::dynamic_pointer_cast (_route)) { - boost::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, _channel, MIDI_CTL_MSB_BANK), true); - boost::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, _channel, MIDI_CTL_LSB_BANK), true); + if (std::dynamic_pointer_cast (_route)) { + std::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, _channel, MIDI_CTL_MSB_BANK), true); + std::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, _channel, MIDI_CTL_LSB_BANK), true); bank_msb->set_value (bank >> 7, PBD::Controllable::NoGroup); bank_lsb->set_value (bank & 127, PBD::Controllable::NoGroup); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { uint8_t event[3]; event[0] = (MIDI_CMD_CONTROL | _channel); event[1] = 0x00; @@ -598,10 +598,10 @@ PatchChangeWidget::select_program (uint8_t pgm) return; } - if (boost::dynamic_pointer_cast (_route)) { - boost::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, _channel), true); + if (std::dynamic_pointer_cast (_route)) { + std::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, _channel), true); program->set_value (pgm, PBD::Controllable::NoGroup); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { uint8_t event[2]; event[0] = (MIDI_CMD_PGM_CHANGE | _channel); event[1] = pgm; @@ -643,7 +643,7 @@ PatchChangeWidget::instrument_info_changed () void PatchChangeWidget::processors_changed () { - assert (!boost::dynamic_pointer_cast (_route)); + assert (!std::dynamic_pointer_cast (_route)); if (_route->the_instrument ()) { set_sensitive (true); } else { @@ -696,7 +696,7 @@ PatchChangeWidget::cancel_audition () void PatchChangeWidget::audition () { - if (!boost::dynamic_pointer_cast (_route) && !boost::dynamic_pointer_cast (_route)) { + if (!std::dynamic_pointer_cast (_route) && !std::dynamic_pointer_cast (_route)) { return; } if (_channel > 16) { @@ -752,9 +752,9 @@ PatchChangeWidget::note_on_event_handler (int note, bool for_audition) _audition_note_on = true; _audition_note_num = note; - if (boost::shared_ptr mt = boost::dynamic_pointer_cast (_route)) { + if (std::shared_ptr mt = std::dynamic_pointer_cast (_route)) { mt->write_immediate_event (Evoral::MIDI_EVENT, 3, event); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { pi->write_immediate_event (Evoral::MIDI_EVENT, 3, event); } } @@ -769,9 +769,9 @@ PatchChangeWidget::note_off_event_handler (int note) _audition_note_on = false; - if (boost::shared_ptr mt = boost::dynamic_pointer_cast (_route)) { + if (std::shared_ptr mt = std::dynamic_pointer_cast (_route)) { mt->write_immediate_event (Evoral::MIDI_EVENT, 3, event); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { pi->write_immediate_event (Evoral::MIDI_EVENT, 3, event); } } @@ -781,12 +781,12 @@ PatchChangeWidget::note_off_event_handler (int note) int PatchChangeWidget::bank (uint8_t chn) const { - if (boost::shared_ptr mt = boost::dynamic_pointer_cast (_route)) { - boost::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); - boost::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); + if (std::shared_ptr mt = std::dynamic_pointer_cast (_route)) { + std::shared_ptr bank_msb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); + std::shared_ptr bank_lsb = _route->automation_control (Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); return ((int)bank_msb->get_value () << 7) + (int)bank_lsb->get_value (); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { uint32_t bankpatch = pi->plugin ()->bank_patch (chn); if (bankpatch != UINT32_MAX) { return bankpatch >> 7; @@ -798,10 +798,10 @@ PatchChangeWidget::bank (uint8_t chn) const uint8_t PatchChangeWidget::program (uint8_t chn) const { - if (boost::shared_ptr mt = boost::dynamic_pointer_cast (_route)) { - boost::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, chn), true); + if (std::shared_ptr mt = std::dynamic_pointer_cast (_route)) { + std::shared_ptr program = _route->automation_control (Evoral::Parameter (MidiPgmChangeAutomation, chn), true); return program->get_value (); - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ())) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ())) { uint32_t bankpatch = pi->plugin ()->bank_patch (chn); if (bankpatch != UINT32_MAX) { return bankpatch & 127; @@ -835,12 +835,12 @@ PatchChangeTriggerWindow::clear () set_title (_("Trigger Patch Select")); for (uint32_t chn = 0; chn < 16; ++chn) { - _w[chn]->reset (boost::shared_ptr (), boost::shared_ptr()); + _w[chn]->reset (std::shared_ptr (), std::shared_ptr()); } } void -PatchChangeTriggerWindow::reset (boost::shared_ptr r, boost::shared_ptr t) +PatchChangeTriggerWindow::reset (std::shared_ptr r, std::shared_ptr t) { if (!r || !t) { clear (); @@ -880,19 +880,19 @@ PatchChangeTriggerWindow::on_switch_page (GtkNotebookPage*, guint page_num) /* ***************************************************************************/ -PatchChangeGridDialog::PatchChangeGridDialog (boost::shared_ptr r) +PatchChangeGridDialog::PatchChangeGridDialog (std::shared_ptr r) : ArdourDialog (string_compose (_("Select Patch for \"%1\""), r->name ()), false, false) , w (r) { - r->PropertyChanged.connect (_route_connection, invalidator (*this), boost::bind (&PatchChangeGridDialog::route_property_changed, this, _1, boost::weak_ptr (r)), gui_context ()); + r->PropertyChanged.connect (_route_connection, invalidator (*this), boost::bind (&PatchChangeGridDialog::route_property_changed, this, _1, std::weak_ptr (r)), gui_context ()); get_vbox ()->add (w); w.show (); } void -PatchChangeGridDialog::route_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr wr) +PatchChangeGridDialog::route_property_changed (const PBD::PropertyChange& what_changed, std::weak_ptr wr) { - boost::shared_ptr r = wr.lock (); + std::shared_ptr r = wr.lock (); if (r && what_changed.contains (ARDOUR::Properties::name)) { set_title (string_compose (_("Select Patch for \"%1\""), r->name ())); } diff --git a/gtk2_ardour/patch_change_widget.h b/gtk2_ardour/patch_change_widget.h index da25e81a00..48c1a0a3e3 100644 --- a/gtk2_ardour/patch_change_widget.h +++ b/gtk2_ardour/patch_change_widget.h @@ -47,7 +47,7 @@ public: virtual ~PatchBankList (); protected: - void refill (boost::shared_ptr, int const bank); + void refill (std::shared_ptr, int const bank); void set_active_pgm (uint8_t); virtual void select_bank (uint32_t) = 0; @@ -63,7 +63,7 @@ private: void select_bank_spin (); ArdourWidgets::ArdourButton _program_btn[128]; - boost::shared_ptr _current_patch_bank; + std::shared_ptr _current_patch_bank; bool _ignore_spin_btn_signals; }; @@ -74,7 +74,7 @@ public: PatchChangeTab (int channel); void refresh (); - void reset (boost::shared_ptr, boost::shared_ptr); + void reset (std::shared_ptr, std::shared_ptr); protected: int bank () const; @@ -97,15 +97,15 @@ private: int _bank; bool _ignore_callback; - boost::shared_ptr _route; - boost::shared_ptr _trigger; + std::shared_ptr _route; + std::shared_ptr _trigger; PBD::ScopedConnectionList _connections; }; class PatchChangeWidget : public Gtk::VBox, public PatchBankList { public: - PatchChangeWidget (boost::shared_ptr); + PatchChangeWidget (std::shared_ptr); ~PatchChangeWidget (); void refresh (); @@ -142,7 +142,7 @@ private: void cancel_audition (); bool audition_next (); - boost::shared_ptr _route; + std::shared_ptr _route; ARDOUR::InstrumentInfo& _info; uint8_t _channel; @@ -172,7 +172,7 @@ class PatchChangeTriggerWindow : public ArdourWindow public: PatchChangeTriggerWindow (); - void reset (boost::shared_ptr, boost::shared_ptr); + void reset (std::shared_ptr, std::shared_ptr); void clear (); private: @@ -187,7 +187,7 @@ private: class PatchChangeGridDialog : public ArdourDialog { public: - PatchChangeGridDialog (boost::shared_ptr); + PatchChangeGridDialog (std::shared_ptr); void on_hide () { @@ -207,7 +207,7 @@ public: } private: - void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr); + void route_property_changed (const PBD::PropertyChange&, std::weak_ptr); PBD::ScopedConnection _route_connection; PatchChangeWidget w; }; diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc index e38bfce3be..6ff6e54f6b 100644 --- a/gtk2_ardour/piano_roll_header.cc +++ b/gtk2_ardour/piano_roll_header.cc @@ -682,7 +682,7 @@ PianoRollHeader::on_size_allocate (Gtk::Allocation& a) void PianoRollHeader::send_note_on (uint8_t note) { - boost::shared_ptr track = _view.trackview ().midi_track (); + std::shared_ptr track = _view.trackview ().midi_track (); MidiTimeAxisView* mtv = dynamic_cast (&_view.trackview ()); //cerr << "note on: " << (int) note << endl; @@ -699,7 +699,7 @@ PianoRollHeader::send_note_on (uint8_t note) void PianoRollHeader::send_note_off (uint8_t note) { - boost::shared_ptr track = _view.trackview ().midi_track (); + std::shared_ptr track = _view.trackview ().midi_track (); MidiTimeAxisView* mtv = dynamic_cast (&_view.trackview ()); if (track) { diff --git a/gtk2_ardour/playlist_selection.h b/gtk2_ardour/playlist_selection.h index d04103b524..fa351d8a3d 100644 --- a/gtk2_ardour/playlist_selection.h +++ b/gtk2_ardour/playlist_selection.h @@ -27,7 +27,7 @@ namespace ARDOUR { class Playlist; } -struct PlaylistSelection : std::list > { +struct PlaylistSelection : std::list > { public: const_iterator get_nth(ARDOUR::DataType type, size_t nth) const { diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index aff125c0fe..72e06b2b4e 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -155,7 +155,7 @@ PlaylistSelector::prepare (RouteUI* ruix, plMode mode) _rui = ruix; _track_connections.drop_connections (); - boost::shared_ptr this_track = _rui->track (); + std::shared_ptr this_track = _rui->track (); if (this_track) { this_track->PlaylistChanged.connect ( @@ -234,13 +234,13 @@ PlaylistSelector::redisplay () _session->playlists ()->foreach (this, &PlaylistSelector::add_playlist_to_map); - boost::shared_ptr this_track = _rui->track (); + std::shared_ptr this_track = _rui->track (); TreeModel::Row selected_row; bool have_selected = false; for (TrackPlaylistMap::iterator x = _trpl_map.begin (); x != _trpl_map.end (); ++x) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (_session->route_by_id (x->first)); + std::shared_ptr tr = std::dynamic_pointer_cast (_session->route_by_id (x->first)); /* add a node for the track */ @@ -261,13 +261,13 @@ PlaylistSelector::redisplay () } /* Now insert all the playlists for this diskstream/track in a subtree */ - vector > pls = *(x->second); + vector > pls = *(x->second); /* sort the playlists to match the order they appear in the track menu */ PlaylistSorterByID cmp; sort (pls.begin (), pls.end (), cmp); - for (vector >::iterator p = pls.begin (); p != pls.end (); ++p) { + for (vector >::iterator p = pls.begin (); p != pls.end (); ++p) { (*p)->PropertyChanged.connect (_playlist_connections, invalidator (*this), boost::bind (&PlaylistSelector::pl_property_changed, this, _1), gui_context ()); TreeModel::Row child_row; @@ -294,14 +294,14 @@ PlaylistSelector::redisplay () if (_mode != plSelect) { // Add unassigned (imported) playlists to the list - list > unassigned; + list > unassigned; _session->playlists ()->unassigned (unassigned); if (unassigned.begin () != unassigned.end ()) { TreeModel::Row row = *(model->append ()); row[columns.text] = _("Imported"); - for (list >::iterator p = unassigned.begin (); p != unassigned.end (); ++p) { + for (list >::iterator p = unassigned.begin (); p != unassigned.end (); ++p) { TreeModel::Row child_row; child_row = *(model->append (row.children ())); @@ -337,7 +337,7 @@ PlaylistSelector::pl_property_changed (PBD::PropertyChange const& what_changed) } void -PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) +PlaylistSelector::add_playlist_to_map (std::shared_ptr pl) { if (pl->frozen ()) { return; @@ -348,12 +348,12 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) } if (_rui->is_midi_track ()) { - if (boost::dynamic_pointer_cast (pl) == 0) { + if (std::dynamic_pointer_cast (pl) == 0) { return; } } else { assert (_rui->is_audio_track ()); - if (boost::dynamic_pointer_cast (pl) == 0) { + if (std::dynamic_pointer_cast (pl) == 0) { return; } } @@ -361,7 +361,7 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) TrackPlaylistMap::iterator x; if ((x = _trpl_map.find (pl->get_orig_track_id ())) == _trpl_map.end ()) { - x = _trpl_map.insert (_trpl_map.end (), make_pair (pl->get_orig_track_id (), new vector >)); + x = _trpl_map.insert (_trpl_map.end (), make_pair (pl->get_orig_track_id (), new vector >)); } x->second->push_back (pl); @@ -388,12 +388,12 @@ PlaylistSelector::selection_changed () return; } - boost::shared_ptr pl; + std::shared_ptr pl; if ((pl = ((*iter)[columns.playlist])) != 0) { - if (_rui->is_audio_track () && boost::dynamic_pointer_cast (pl) == 0) { + if (_rui->is_audio_track () && std::dynamic_pointer_cast (pl) == 0) { return; } - if (_rui->is_midi_track () && boost::dynamic_pointer_cast (pl) == 0) { + if (_rui->is_midi_track () && std::dynamic_pointer_cast (pl) == 0) { return; } @@ -403,7 +403,7 @@ PlaylistSelector::selection_changed () */ case plCopy: { - boost::shared_ptr playlist = PlaylistFactory::create (pl, string_compose ("%1.1", pl->name ())); + std::shared_ptr playlist = PlaylistFactory::create (pl, string_compose ("%1.1", pl->name ())); /* playlist->reset_shares (); @Robin is this needed? */ _rui->track ()->use_playlist (_rui->is_audio_track () ? DataType::AUDIO : DataType::MIDI, playlist); } diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h index 8bfae58d9e..21ffa9ecc6 100644 --- a/gtk2_ardour/playlist_selector.h +++ b/gtk2_ardour/playlist_selector.h @@ -43,7 +43,7 @@ class RouteUI; class RouteTimeAxisView; struct PlaylistSorterByID { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) const { + bool operator() (std::shared_ptr a, std::shared_ptr b) const { if (a->pgroup_id().length() && b->pgroup_id().length()) { return (a->id() < b->id()); /*both plists have pgroup-id: use IDs which are sequentially generated */ } else if (!a->pgroup_id().length() && !b->pgroup_id().length()) { @@ -74,14 +74,14 @@ protected: bool on_key_press_event (GdkEventKey*); private: - typedef std::map >*> TrackPlaylistMap; + typedef std::map >*> TrackPlaylistMap; void new_plist_button_clicked (); void copy_plist_button_clicked (); void pl_property_changed (PBD::PropertyChange const& what_changed); - void add_playlist_to_map (boost::shared_ptr); + void add_playlist_to_map (std::shared_ptr); void playlist_added (); void clear_map (); void ok_button_click (); @@ -110,7 +110,7 @@ private: } Gtk::TreeModelColumn text; Gtk::TreeModelColumn pgrp; - Gtk::TreeModelColumn > playlist; + Gtk::TreeModelColumn > playlist; }; ModelColumns columns; diff --git a/gtk2_ardour/plugin_display.cc b/gtk2_ardour/plugin_display.cc index 1bf883cb69..50ebd35a7a 100644 --- a/gtk2_ardour/plugin_display.cc +++ b/gtk2_ardour/plugin_display.cc @@ -29,7 +29,7 @@ -PluginDisplay::PluginDisplay (boost::shared_ptr p, uint32_t max_height) +PluginDisplay::PluginDisplay (std::shared_ptr p, uint32_t max_height) : _plug (p) , _surf (0) , _max_height (max_height) diff --git a/gtk2_ardour/plugin_display.h b/gtk2_ardour/plugin_display.h index c8b371a9b9..95d3486965 100644 --- a/gtk2_ardour/plugin_display.h +++ b/gtk2_ardour/plugin_display.h @@ -26,7 +26,7 @@ class PluginDisplay : public Gtk::DrawingArea { public: - PluginDisplay(boost::shared_ptr, uint32_t max_height = 80); + PluginDisplay(std::shared_ptr, uint32_t max_height = 80); virtual ~PluginDisplay(); protected: @@ -44,7 +44,7 @@ protected: virtual void display_frame (cairo_t* cr, double w, double h); - boost::shared_ptr _plug; + std::shared_ptr _plug; PBD::ScopedConnection _qdraw_connection; PBD::ScopedConnection _death_connection; cairo_surface_t* _surf; diff --git a/gtk2_ardour/plugin_dspload_ui.cc b/gtk2_ardour/plugin_dspload_ui.cc index c9b8bf2c4e..cd82f694db 100644 --- a/gtk2_ardour/plugin_dspload_ui.cc +++ b/gtk2_ardour/plugin_dspload_ui.cc @@ -28,7 +28,7 @@ using namespace Gtkmm2ext; using namespace Gtk; -PluginLoadStatsGui::PluginLoadStatsGui (boost::shared_ptr pib) +PluginLoadStatsGui::PluginLoadStatsGui (std::shared_ptr pib) : _pib (pib) , _lbl_min ("", ALIGN_END, ALIGN_CENTER) , _lbl_max ("", ALIGN_END, ALIGN_CENTER) diff --git a/gtk2_ardour/plugin_dspload_ui.h b/gtk2_ardour/plugin_dspload_ui.h index 4d8183a6f7..eb81eaadd3 100644 --- a/gtk2_ardour/plugin_dspload_ui.h +++ b/gtk2_ardour/plugin_dspload_ui.h @@ -32,7 +32,7 @@ class PluginLoadStatsGui : public Gtk::Table { public: - PluginLoadStatsGui (boost::shared_ptr); + PluginLoadStatsGui (std::shared_ptr); void start_updating (); void stop_updating (); @@ -47,7 +47,7 @@ private: _pib->clear_stats (); } - boost::shared_ptr _pib; + std::shared_ptr _pib; sigc::connection update_cpu_label_connection; Gtk::Label _lbl_min; diff --git a/gtk2_ardour/plugin_dspload_window.cc b/gtk2_ardour/plugin_dspload_window.cc index bcc568743d..084064fc1e 100644 --- a/gtk2_ardour/plugin_dspload_window.cc +++ b/gtk2_ardour/plugin_dspload_window.cc @@ -206,17 +206,17 @@ PluginDSPLoadWindow::refill_processors () } void -PluginDSPLoadWindow::add_processor_to_display (boost::weak_ptr w, std::string const& route_name) +PluginDSPLoadWindow::add_processor_to_display (std::weak_ptr w, std::string const& route_name) { - boost::shared_ptr p = w.lock (); - boost::shared_ptr pib = boost::dynamic_pointer_cast (p); + std::shared_ptr p = w.lock (); + std::shared_ptr pib = std::dynamic_pointer_cast (p); if (pib) { add_pluginsert_to_display (pib, route_name); } } void -PluginDSPLoadWindow::add_pluginsert_to_display (boost::shared_ptr p, std::string const& route_name) +PluginDSPLoadWindow::add_pluginsert_to_display (std::shared_ptr p, std::string const& route_name) { if (!p->provides_stats ()) { return; @@ -234,17 +234,17 @@ PluginDSPLoadWindow::add_pluginsert_to_display (boost::shared_ptr w) +PluginDSPLoadWindow::clear_processor_stats (std::weak_ptr w) { - boost::shared_ptr p = w.lock (); - boost::shared_ptr pib = boost::dynamic_pointer_cast (p); + std::shared_ptr p = w.lock (); + std::shared_ptr pib = std::dynamic_pointer_cast (p); if (pib) { clear_pluginsert_stats (pib); } } void -PluginDSPLoadWindow::clear_pluginsert_stats (boost::shared_ptr pib) +PluginDSPLoadWindow::clear_pluginsert_stats (std::shared_ptr pib) { pib->clear_stats (); } diff --git a/gtk2_ardour/plugin_dspload_window.h b/gtk2_ardour/plugin_dspload_window.h index 9334bab0bb..9c9d9388a6 100644 --- a/gtk2_ardour/plugin_dspload_window.h +++ b/gtk2_ardour/plugin_dspload_window.h @@ -55,10 +55,10 @@ private: void drop_references (); void clear_all_stats (); void sort_by_stats (bool); - void add_processor_to_display (boost::weak_ptr, std::string const&); - void add_pluginsert_to_display (boost::shared_ptr, std::string const&); - void clear_processor_stats (boost::weak_ptr); - void clear_pluginsert_stats (boost::shared_ptr); + void add_processor_to_display (std::weak_ptr, std::string const&); + void add_pluginsert_to_display (std::shared_ptr, std::string const&); + void clear_processor_stats (std::weak_ptr); + void clear_pluginsert_stats (std::shared_ptr); Gtk::ScrolledWindow _scroller; Gtk::VBox _box; diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index aa594a6633..b6f072792e 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -59,7 +59,7 @@ using namespace ARDOUR; -PluginEqGui::PluginEqGui (boost::shared_ptr pluginInsert) +PluginEqGui::PluginEqGui (std::shared_ptr pluginInsert) : _min_dB (-12.0) , _max_dB (+12.0) , _step_dB (3.0) diff --git a/gtk2_ardour/plugin_eq_gui.h b/gtk2_ardour/plugin_eq_gui.h index 329734fb19..03fb1eff48 100644 --- a/gtk2_ardour/plugin_eq_gui.h +++ b/gtk2_ardour/plugin_eq_gui.h @@ -45,7 +45,7 @@ namespace GTKArdour { class PluginEqGui : public Gtk::Table { public: - PluginEqGui (boost::shared_ptr); + PluginEqGui (std::shared_ptr); ~PluginEqGui (); private: @@ -118,8 +118,8 @@ private: GTKArdour::FFT *_impulse_fft; GTKArdour::FFT *_signal_input_fft; GTKArdour::FFT *_signal_output_fft; - boost::shared_ptr _plugin; - boost::shared_ptr _plugin_insert; + std::shared_ptr _plugin; + std::shared_ptr _plugin_insert; // gui objects Gtk::DrawingArea *_analysis_area; diff --git a/gtk2_ardour/plugin_manager_ui.cc b/gtk2_ardour/plugin_manager_ui.cc index e6a46ea8f2..7a05f7ef79 100644 --- a/gtk2_ardour/plugin_manager_ui.cc +++ b/gtk2_ardour/plugin_manager_ui.cc @@ -405,7 +405,7 @@ plugin_type (const PluginType t) } bool -PluginManagerUI::show_this_plugin (boost::shared_ptr psle, PluginInfoPtr pip, const std::string& searchstr) +PluginManagerUI::show_this_plugin (std::shared_ptr psle, PluginInfoPtr pip, const std::string& searchstr) { using PBD::match_search_strings; @@ -476,7 +476,7 @@ PluginManagerUI::refill () { /* save selection and sort-column, clear model to speed-up refill */ TreeIter iter = plugin_display.get_selection ()->get_selected (); - boost::shared_ptr sel; + std::shared_ptr sel; if (iter) { sel = (*iter)[plugin_columns.psle]; } @@ -494,14 +494,14 @@ PluginManagerUI::refill () std::map plugin_count; - std::vector > psl; + std::vector > psl; PluginManager& manager (PluginManager::instance ()); manager.scan_log (psl); std::string searchstr = _entry_search.get_text (); setup_search_string (searchstr); - for (std::vector >::const_iterator i = psl.begin (); i != psl.end (); ++i) { + for (std::vector >::const_iterator i = psl.begin (); i != psl.end (); ++i) { PluginInfoList const& plugs = (*i)->nfo (); if (!(*i)->recent ()) { @@ -577,7 +577,7 @@ PluginManagerUI::refill () if (sel) { TreeModel::Children rows = plugin_model->children (); for (TreeModel::Children::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr const& srow ((*i)[plugin_columns.psle]); + std::shared_ptr const& srow ((*i)[plugin_columns.psle]); if (*sel == *srow) { plugin_display.get_selection ()->select (*i); TreeIter iter = plugin_display.get_selection ()->get_selected (); @@ -659,7 +659,7 @@ PluginManagerUI::selection_changed () } TreeIter iter = plugin_display.get_selection ()->get_selected (); - boost::shared_ptr const& psle ((*iter)[plugin_columns.psle]); + std::shared_ptr const& psle ((*iter)[plugin_columns.psle]); _log.get_buffer ()->set_text (psle->log ()); @@ -679,7 +679,7 @@ PluginManagerUI::row_activated (TreeModel::Path const& p, TreeViewColumn*) if (!iter) { return; } - boost::shared_ptr const& psle ((*iter)[plugin_columns.psle]); + std::shared_ptr const& psle ((*iter)[plugin_columns.psle]); switch (psle->type ()) { case Windows_VST: @@ -705,7 +705,7 @@ PluginManagerUI::blacklist_changed (std::string const& path) { TreeIter iter; if ((iter = plugin_model->get_iter (path))) { - boost::shared_ptr const& psle ((*iter)[plugin_columns.psle]); + std::shared_ptr const& psle ((*iter)[plugin_columns.psle]); if ((*iter)[plugin_columns.blacklisted]) { PluginScanDialog psd (false, true, this); PluginManager::instance ().rescan_plugin (psle->type (), psle->path ()); @@ -836,7 +836,7 @@ PluginManagerUI::rescan_selected () } TreeIter iter = plugin_display.get_selection ()->get_selected (); - boost::shared_ptr const& psle ((*iter)[plugin_columns.psle]); + std::shared_ptr const& psle ((*iter)[plugin_columns.psle]); PluginScanDialog psd (false, true, this); PluginManager::instance ().rescan_plugin (psle->type (), psle->path ()); diff --git a/gtk2_ardour/plugin_manager_ui.h b/gtk2_ardour/plugin_manager_ui.h index 0e5dee3738..79492dbc1f 100644 --- a/gtk2_ardour/plugin_manager_ui.h +++ b/gtk2_ardour/plugin_manager_ui.h @@ -64,7 +64,7 @@ private: void search_entry_changed (); void search_clear_button_clicked (); - bool show_this_plugin (boost::shared_ptr, ARDOUR::PluginInfoPtr, const std::string&); + bool show_this_plugin (std::shared_ptr, ARDOUR::PluginInfoPtr, const std::string&); void plugin_status_changed (ARDOUR::PluginType, std::string, ARDOUR::PluginManager::PluginStatusType); @@ -110,7 +110,7 @@ private: Gtk::TreeModelColumn creator; Gtk::TreeModelColumn tags; Gtk::TreeModelColumn path; - Gtk::TreeModelColumn > psle; + Gtk::TreeModelColumn > psle; Gtk::TreeModelColumn plugin; Gtk::TreeModelColumn can_blacklist; Gtk::TreeModelColumn can_fav_hide; diff --git a/gtk2_ardour/plugin_pin_dialog.cc b/gtk2_ardour/plugin_pin_dialog.cc index 736a6d943f..1c16c88fe2 100644 --- a/gtk2_ardour/plugin_pin_dialog.cc +++ b/gtk2_ardour/plugin_pin_dialog.cc @@ -59,7 +59,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ArdourWidgets; -PluginPinWidget::PluginPinWidget (boost::shared_ptr pi) +PluginPinWidget::PluginPinWidget (std::shared_ptr pi) : _set_config (_("Manual Config"), ArdourButton::led_default_elements) , _tgl_sidechain (_("Sidechain"), ArdourButton::led_default_elements) , _add_plugin (_("+")) @@ -413,7 +413,7 @@ PluginPinWidget::plugin_reconfigured () _out_map.clear (); for (uint32_t n = 0; n < _n_plugins; ++n) { - boost::shared_ptr plugin = _pi->plugin (n); + std::shared_ptr plugin = _pi->plugin (n); for (uint32_t i = 0; i < _sinks.n_total (); ++i) { DataType dt (i < _sinks.n_midi () ? DataType::MIDI : DataType::AUDIO); int idx = (dt == DataType::MIDI) ? i : i - _sinks.n_midi (); @@ -473,7 +473,7 @@ PluginPinWidget::refill_sidechain_table () if (!_pi->has_sidechain () && _sidechain_selector) { return; } - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr io = _pi->sidechain_input (); if (!io) { return; } @@ -575,7 +575,7 @@ PluginPinWidget::port_label (const std::string& portname, bool strip) } uint32_t -PluginPinWidget::add_port_to_table (boost::shared_ptr p, uint32_t r, bool can_remove) +PluginPinWidget::add_port_to_table (std::shared_ptr p, uint32_t r, bool can_remove) { std::string lbl; std::string tip = Gtkmm2ext::markup_escape_text (p->name ()); @@ -617,13 +617,13 @@ PluginPinWidget::add_port_to_table (boost::shared_ptr p, uint32_t r, bool ArdourWidgets::set_tooltip (*pb, tip); _sidechain_tbl->attach (*pb, 0, 1, r, r +1 , EXPAND|FILL, SHRINK); - pb->signal_button_press_event ().connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::sc_input_press), boost::weak_ptr (p)), false); + pb->signal_button_press_event ().connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::sc_input_press), std::weak_ptr (p)), false); pb->signal_button_release_event ().connect (sigc::mem_fun (*this, &PluginPinWidget::sc_input_release), false); pb = manage (new ArdourButton ("-")); _sidechain_tbl->attach (*pb, 1, 2, r, r + 1, FILL, SHRINK); if (can_remove) { - pb->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::remove_port), boost::weak_ptr (p))); + pb->signal_clicked.connect (sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::remove_port), std::weak_ptr (p))); } else { pb->set_sensitive (false); } @@ -632,13 +632,13 @@ PluginPinWidget::add_port_to_table (boost::shared_ptr p, uint32_t r, bool if (single_source && _session) { /* check if it's an Ardour Send feeding.. */ - boost::shared_ptr routes = _session->get_routes (); + std::shared_ptr routes = _session->get_routes (); for (ARDOUR::RouteList::const_iterator i = routes->begin (); i != routes->end (); ++i) { uint32_t nth = 0; - boost::shared_ptr proc; + std::shared_ptr proc; /* nth_send () takes a processor read-lock */ while ((proc = (*i)->nth_send (nth))) { - boost::shared_ptr send = boost::dynamic_pointer_cast (proc); + std::shared_ptr send = std::dynamic_pointer_cast (proc); if (!send || !send->output ()) { ++nth; continue; @@ -1733,7 +1733,7 @@ PluginPinWidget::add_sidechain_port (DataType dt) return; } - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr io = _pi->sidechain_input (); if (!io) { return; } @@ -1744,15 +1744,15 @@ PluginPinWidget::add_sidechain_port (DataType dt) } void -PluginPinWidget::remove_port (boost::weak_ptr wp) +PluginPinWidget::remove_port (std::weak_ptr wp) { assert (_session); if (_session->actively_recording ()) { error_message_dialog (/* unused */ ""); return; } - boost::shared_ptr p = wp.lock (); - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr p = wp.lock (); + std::shared_ptr io = _pi->sidechain_input (); if (!io || !p) { return; } @@ -1760,7 +1760,7 @@ PluginPinWidget::remove_port (boost::weak_ptr wp) } void -PluginPinWidget::disconnect_port (boost::weak_ptr wp) +PluginPinWidget::disconnect_port (std::weak_ptr wp) { assert (_session); if (_session->actively_recording ()) { @@ -1768,8 +1768,8 @@ PluginPinWidget::disconnect_port (boost::weak_ptr wp) return; } - boost::shared_ptr p = wp.lock (); - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr p = wp.lock (); + std::shared_ptr io = _pi->sidechain_input (); if (!io || !p) { return; } @@ -1777,7 +1777,7 @@ PluginPinWidget::disconnect_port (boost::weak_ptr wp) } void -PluginPinWidget::connect_port (boost::weak_ptr wp0, boost::weak_ptr wp1) +PluginPinWidget::connect_port (std::weak_ptr wp0, std::weak_ptr wp1) { assert (_session); if (_session->actively_recording ()) { @@ -1785,9 +1785,9 @@ PluginPinWidget::connect_port (boost::weak_ptr wp0, boost::weak_pt return; } - boost::shared_ptr p0 = wp0.lock (); - boost::shared_ptr p1 = wp1.lock (); - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr p0 = wp0.lock (); + std::shared_ptr p1 = wp1.lock (); + std::shared_ptr io = _pi->sidechain_input (); if (!io || !p0 || !p1) { return; } @@ -1798,7 +1798,7 @@ PluginPinWidget::connect_port (boost::weak_ptr wp0, boost::weak_pt } void -PluginPinWidget::add_send_from (boost::weak_ptr wp, boost::weak_ptr wr) +PluginPinWidget::add_send_from (std::weak_ptr wp, std::weak_ptr wr) { assert (_session); if (_session->actively_recording ()) { @@ -1806,14 +1806,14 @@ PluginPinWidget::add_send_from (boost::weak_ptr wp, boost::weak_pt return; } - boost::shared_ptr p = wp.lock (); - boost::shared_ptr r = wr.lock (); - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr p = wp.lock (); + std::shared_ptr r = wr.lock (); + std::shared_ptr io = _pi->sidechain_input (); if (!p || !r || !io) { return; } - boost::shared_ptr send (new Send (*_session, r->pannable (), r->mute_master ())); + std::shared_ptr send (new Send (*_session, r->pannable (), r->mute_master ())); const ChanCount& outs (r->amp ()->input_streams ()); try { Glib::Threads::Mutex::Lock lm (AudioEngine::instance ()->process_lock ()); @@ -1862,7 +1862,7 @@ PluginPinWidget::sc_input_release (GdkEventButton *ev) } bool -PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr wp) +PluginPinWidget::sc_input_press (GdkEventButton *ev, std::weak_ptr wp) { using namespace Menu_Helpers; assert (_session); @@ -1879,7 +1879,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr p = wp.lock (); + std::shared_ptr p = wp.lock (); if (p && p->connected ()) { citems.push_back (MenuElem (_("Disconnect"), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::disconnect_port), wp))); citems.push_back (SeparatorElem ()); @@ -1887,7 +1887,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr b = _session->bundles (); + std::shared_ptr b = _session->bundles (); for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { for (uint32_t j = 0; j < i->nchannels ().n_total (); ++j) { } @@ -1920,7 +1920,7 @@ PluginPinWidget::sc_input_press (GdkEventButton *ev, boost::weak_ptr r, DataType dt, boost::weak_ptr wp) +PluginPinWidget::maybe_add_route_to_input_menu (std::shared_ptr r, DataType dt, std::weak_ptr wp) { uint32_t added = 0; using namespace Menu_Helpers; @@ -1938,10 +1938,10 @@ PluginPinWidget::maybe_add_route_to_input_menu (boost::shared_ptr r, Data /*check if there's already a send.. */ bool already_present = false; uint32_t nth = 0; - boost::shared_ptr proc; + std::shared_ptr proc; /* Note: nth_send () takes a processor read-lock */ while ((proc = r->nth_send (nth))) { - boost::shared_ptr send = boost::dynamic_pointer_cast (proc); + std::shared_ptr send = std::dynamic_pointer_cast (proc); if (!send || !send->output ()) { ++nth; continue; @@ -1956,19 +1956,19 @@ PluginPinWidget::maybe_add_route_to_input_menu (boost::shared_ptr r, Data /* we're going to create the new send pre-fader, so check the route amp's data type. */ const ChanCount& rc (r->amp ()->input_streams ()); if (!already_present && rc.get (dt) > 0) { - citems.push_back (MenuElemNoMnemonic (r->name (), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_send_from), wp, boost::weak_ptr (r)))); + citems.push_back (MenuElemNoMnemonic (r->name (), sigc::bind (sigc::mem_fun (*this, &PluginPinWidget::add_send_from), wp, std::weak_ptr (r)))); ++added; } return added; } void -PluginPinWidget::port_connected_or_disconnected (boost::weak_ptr w0, boost::weak_ptr w1) +PluginPinWidget::port_connected_or_disconnected (std::weak_ptr w0, std::weak_ptr w1) { - boost::shared_ptr p0 = w0.lock (); - boost::shared_ptr p1 = w1.lock (); + std::shared_ptr p0 = w0.lock (); + std::shared_ptr p1 = w1.lock (); - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr io = _pi->sidechain_input (); if (!io) { return; } if (p0 && io->has_port (p0)) { @@ -1982,17 +1982,17 @@ PluginPinWidget::port_connected_or_disconnected (boost::weak_ptr w void PluginPinWidget::port_pretty_name_changed (std::string pn) { - boost::shared_ptr io = _pi->sidechain_input (); + std::shared_ptr io = _pi->sidechain_input (); if (io && io->connected_to (pn)) { queue_idle_update (); } } /* lifted from ProcessorEntry::Control */ -PluginPinWidget::Control::Control (boost::shared_ptr c, string const & n) +PluginPinWidget::Control::Control (std::shared_ptr c, string const & n) : _control (c) , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain ()), 0, 1, 0.01, 0.1) - , _slider (&_adjustment, boost::shared_ptr (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ()))) + , _slider (&_adjustment, std::shared_ptr (), 0, max (13.f, rintf (13.f * UIConfiguration::instance ().get_ui_scale ()))) , _slider_persistant_tooltip (&_slider) , _ignore_ui_adjustment (false) , _name (n) @@ -2042,7 +2042,7 @@ PluginPinWidget::Control::~Control () void PluginPinWidget::Control::set_tooltip () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -2057,7 +2057,7 @@ PluginPinWidget::Control::slider_adjusted () if (_ignore_ui_adjustment) { return; } - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -2069,7 +2069,7 @@ PluginPinWidget::Control::slider_adjusted () void PluginPinWidget::Control::control_changed () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -2089,7 +2089,7 @@ PluginPinWidget::Control::control_changed () -PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) +PluginPinDialog::PluginPinDialog (std::shared_ptr pi) : ArdourWindow (string_compose (_("Pin Configuration: %1"), pi->name ())) { ppw.push_back (PluginPinWidgetPtr(new PluginPinWidget (pi))); @@ -2098,7 +2098,7 @@ PluginPinDialog::PluginPinDialog (boost::shared_ptr pi) } -PluginPinDialog::PluginPinDialog (boost::shared_ptr r) +PluginPinDialog::PluginPinDialog (std::shared_ptr r) : ArdourWindow (string_compose (_("Pin Configuration: %1"), r->name ())) , _route (r) , _height_mapped (false) @@ -2164,13 +2164,13 @@ PluginPinDialog::route_going_away () } void -PluginPinDialog::add_processor (boost::weak_ptr p) +PluginPinDialog::add_processor (std::weak_ptr p) { - boost::shared_ptr proc = p.lock (); + std::shared_ptr proc = p.lock (); if (!proc || !proc->display_to_user ()) { return; } - boost::shared_ptr pi = boost::dynamic_pointer_cast (proc); + std::shared_ptr pi = std::dynamic_pointer_cast (proc); #ifdef MIXBUS if (pi && pi->is_channelstrip ()) { pi.reset (); diff --git a/gtk2_ardour/plugin_pin_dialog.h b/gtk2_ardour/plugin_pin_dialog.h index b2310067ca..0799818d39 100644 --- a/gtk2_ardour/plugin_pin_dialog.h +++ b/gtk2_ardour/plugin_pin_dialog.h @@ -46,7 +46,7 @@ class PluginPinWidget : public ARDOUR::SessionHandlePtr, public Gtk::VBox { public: - PluginPinWidget (boost::shared_ptr); + PluginPinWidget (std::shared_ptr); ~PluginPinWidget (); void set_session (ARDOUR::Session *); private: @@ -75,7 +75,7 @@ private: bool sc; // sidechain }; - typedef boost::shared_ptr<_CtrlElem> CtrlElem; + typedef std::shared_ptr<_CtrlElem> CtrlElem; struct CtrlWidget { CtrlWidget (const std::string& n, CtrlType ct, ARDOUR::DataType dt, uint32_t id, uint32_t ip = 0, uint32_t bn = 0, bool sc = false) @@ -175,21 +175,21 @@ private: bool handle_disconnect (const CtrlElem &, bool no_signal = false); void disconnect_other_outputs (uint32_t skip_pc, ARDOUR::DataType dt, uint32_t id); void disconnect_other_thru (ARDOUR::DataType dt, uint32_t id); - void remove_port (boost::weak_ptr); - void disconnect_port (boost::weak_ptr); - void connect_port (boost::weak_ptr, boost::weak_ptr); - void add_send_from (boost::weak_ptr, boost::weak_ptr); - uint32_t add_port_to_table (boost::shared_ptr, uint32_t, bool); - uint32_t maybe_add_route_to_input_menu (boost::shared_ptr, ARDOUR::DataType, boost::weak_ptr); - void port_connected_or_disconnected (boost::weak_ptr, boost::weak_ptr); + void remove_port (std::weak_ptr); + void disconnect_port (std::weak_ptr); + void connect_port (std::weak_ptr, std::weak_ptr); + void add_send_from (std::weak_ptr, std::weak_ptr); + uint32_t add_port_to_table (std::shared_ptr, uint32_t, bool); + uint32_t maybe_add_route_to_input_menu (std::shared_ptr, ARDOUR::DataType, std::weak_ptr); + void port_connected_or_disconnected (std::weak_ptr, std::weak_ptr); void port_pretty_name_changed (std::string); - bool sc_input_press (GdkEventButton *, boost::weak_ptr); + bool sc_input_press (GdkEventButton *, std::weak_ptr); bool sc_input_release (GdkEventButton *); PBD::ScopedConnectionList _plugin_connections; PBD::ScopedConnectionList _io_connection; - boost::shared_ptr _pi; + std::shared_ptr _pi; void queue_idle_update (); bool idle_update (); @@ -218,7 +218,7 @@ private: class Control: public sigc::trackable { public: - Control (boost::shared_ptr, std::string const &); + Control (std::shared_ptr, std::string const &); ~Control (); Gtk::Alignment box; private: @@ -226,7 +226,7 @@ private: void control_changed (); void set_tooltip (); - boost::weak_ptr _control; + std::weak_ptr _control; Gtk::Adjustment _adjustment; ArdourWidgets::HSliderController _slider; Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip; @@ -242,22 +242,22 @@ private: class PluginPinDialog : public ArdourWindow { public: - PluginPinDialog (boost::shared_ptr); - PluginPinDialog (boost::shared_ptr); + PluginPinDialog (std::shared_ptr); + PluginPinDialog (std::shared_ptr); void set_session (ARDOUR::Session *); private: Gtk::ScrolledWindow* scroller; Gtk::VBox *vbox; - typedef boost::shared_ptr PluginPinWidgetPtr; + typedef std::shared_ptr PluginPinWidgetPtr; typedef std::vector PluginPinWidgetList; void route_going_away (); void route_processors_changed (ARDOUR::RouteProcessorChange); - void add_processor (boost::weak_ptr); + void add_processor (std::weak_ptr); void map_height (Gtk::Allocation&); - boost::shared_ptr _route; + std::shared_ptr _route; PluginPinWidgetList ppw; PBD::ScopedConnectionList _route_connections; bool _height_mapped; diff --git a/gtk2_ardour/plugin_presets_ui.cc b/gtk2_ardour/plugin_presets_ui.cc index 015071c16d..5996b4c28e 100644 --- a/gtk2_ardour/plugin_presets_ui.cc +++ b/gtk2_ardour/plugin_presets_ui.cc @@ -31,7 +31,7 @@ using namespace ARDOUR; using namespace Gtk; -PluginPresetsUI::PluginPresetsUI (boost::shared_ptr insert) +PluginPresetsUI::PluginPresetsUI (std::shared_ptr insert) : _insert (insert) , _load_button (_("Load")) { @@ -97,7 +97,7 @@ PluginPresetsUI::PluginPresetsUI (boost::shared_ptr insert) attach (*frame, 2, 3, 0, 1, EXPAND|FILL, EXPAND|FILL, 2, 4); attach (_load_button, 2, 3, 1, 2, FILL, SHRINK, 2, 0); - boost::shared_ptr plugin (_insert->plugin ()); + std::shared_ptr plugin (_insert->plugin ()); plugin->PresetAdded.connect (_preset_connections, invalidator (*this), boost::bind (&PluginPresetsUI::update_preset_list, this), gui_context ()); plugin->PresetRemoved.connect (_preset_connections, invalidator (*this), boost::bind (&PluginPresetsUI::update_preset_list, this), gui_context ()); @@ -111,7 +111,7 @@ PluginPresetsUI::PluginPresetsUI (boost::shared_ptr insert) void PluginPresetsUI::update_preset_list () { - boost::shared_ptr plugin (_insert->plugin ()); + std::shared_ptr plugin (_insert->plugin ()); std::vector presets = plugin->get_presets (); _pps.clear (); @@ -236,7 +236,7 @@ PluginPresetsUI::filter_presets () } } - boost::shared_ptr plugin (_insert->plugin ()); + std::shared_ptr plugin (_insert->plugin ()); Plugin::PresetRecord const& p = plugin->last_preset (); std::string selected_uri = p.valid ? p.uri : ""; diff --git a/gtk2_ardour/plugin_presets_ui.h b/gtk2_ardour/plugin_presets_ui.h index b40f825901..d9f4ca0f7b 100644 --- a/gtk2_ardour/plugin_presets_ui.h +++ b/gtk2_ardour/plugin_presets_ui.h @@ -35,7 +35,7 @@ class PluginPresetsUI : public Gtk::Table { public: - PluginPresetsUI (boost::shared_ptr); + PluginPresetsUI (std::shared_ptr); private: void update_preset_list (); @@ -44,7 +44,7 @@ private: void preset_row_activated (Gtk::TreeModel::Path, Gtk::TreeViewColumn*); void load_preset (); - boost::shared_ptr _insert; + std::shared_ptr _insert; PBD::ScopedConnectionList _preset_connections; struct PluginPreset { diff --git a/gtk2_ardour/plugin_setup_dialog.cc b/gtk2_ardour/plugin_setup_dialog.cc index 3163b0bc00..d5e184eb46 100644 --- a/gtk2_ardour/plugin_setup_dialog.cc +++ b/gtk2_ardour/plugin_setup_dialog.cc @@ -28,7 +28,7 @@ using namespace ARDOUR; using namespace ArdourWidgets; using namespace Gtk; -PluginSetupDialog::PluginSetupDialog (boost::shared_ptr r, boost::shared_ptr pi, ARDOUR::Route::PluginSetupOptions flags) +PluginSetupDialog::PluginSetupDialog (std::shared_ptr r, std::shared_ptr pi, ARDOUR::Route::PluginSetupOptions flags) : ArdourDialog (_("Plugin Setup"), true, false) , _route (r) , _pi (pi) @@ -43,8 +43,8 @@ PluginSetupDialog::PluginSetupDialog (boost::shared_ptr r, boost: int row = 0; if (flags & Route::CanReplace) { - boost::shared_ptr old = _route->the_instrument (); - boost::shared_ptr opi = boost::dynamic_pointer_cast (old); + std::shared_ptr old = _route->the_instrument (); + std::shared_ptr opi = std::dynamic_pointer_cast (old); assert (opi); opi->configured_io (_cur_inputs, _cur_outputs); @@ -205,8 +205,8 @@ PluginSetupDialog::apply_mapping () // toggle button _keep_mapping.set_active (!_keep_mapping.get_active ()); - boost::shared_ptr old = _route->the_instrument (); - boost::shared_ptr opi = boost::dynamic_pointer_cast (old); + std::shared_ptr old = _route->the_instrument (); + std::shared_ptr opi = std::dynamic_pointer_cast (old); if (_keep_mapping.get_active () && opi && io_match ()) { _pi->pre_seed (_cur_inputs, _cur_outputs, opi->input_map (0), opi->output_map (0), opi->thru_map ()); diff --git a/gtk2_ardour/plugin_setup_dialog.h b/gtk2_ardour/plugin_setup_dialog.h index 6fd85b78f4..5fb305c4ae 100644 --- a/gtk2_ardour/plugin_setup_dialog.h +++ b/gtk2_ardour/plugin_setup_dialog.h @@ -30,7 +30,7 @@ class PluginSetupDialog : public ArdourDialog { public: - PluginSetupDialog (boost::shared_ptr, boost::shared_ptr, ARDOUR::Route::PluginSetupOptions); + PluginSetupDialog (std::shared_ptr, std::shared_ptr, ARDOUR::Route::PluginSetupOptions); bool fan_out () const { return _fan_out.get_active () && _fan_out.get_sensitive (); } @@ -45,8 +45,8 @@ private: void apply_mapping (); void toggle_fan_out (); - boost::shared_ptr _route; - boost::shared_ptr _pi; + std::shared_ptr _route; + std::shared_ptr _pi; ArdourWidgets::ArdourDropdown _out_presets; ArdourWidgets::ArdourButton _keep_mapping; diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 61ea26ee39..5519d94614 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -71,7 +71,7 @@ # include "vst3_hwnd_plugin_ui.h" # elif defined (__APPLE__) # include "vst3_plugin_ui.h" -extern VST3PluginUI* create_mac_vst3_gui (boost::shared_ptr, Gtk::VBox**); +extern VST3PluginUI* create_mac_vst3_gui (std::shared_ptr, Gtk::VBox**); # else # include "vst3_x11_plugin_ui.h" # endif @@ -106,7 +106,7 @@ using namespace Gtk; PluginUIWindow* PluginUIWindow::the_plugin_window = 0; PluginUIWindow::PluginUIWindow ( - boost::shared_ptr pib, + std::shared_ptr pib, bool scrollable, bool editor) : ArdourWindow (string()) @@ -260,18 +260,18 @@ PluginUIWindow::set_title(const std::string& title) bool #ifdef WINDOWS_VST_SUPPORT -PluginUIWindow::create_windows_vst_editor(boost::shared_ptr pib) +PluginUIWindow::create_windows_vst_editor(std::shared_ptr pib) #else -PluginUIWindow::create_windows_vst_editor(boost::shared_ptr) +PluginUIWindow::create_windows_vst_editor(std::shared_ptr) #endif { #ifndef WINDOWS_VST_SUPPORT return false; #else - boost::shared_ptr vp; + std::shared_ptr vp; - if ((vp = boost::dynamic_pointer_cast (pib->plugin())) == 0) { + if ((vp = std::dynamic_pointer_cast (pib->plugin())) == 0) { error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME) << endmsg; throw failed_constructor (); @@ -290,18 +290,18 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr) bool #ifdef LXVST_SUPPORT -PluginUIWindow::create_lxvst_editor(boost::shared_ptr pib) +PluginUIWindow::create_lxvst_editor(std::shared_ptr pib) #else -PluginUIWindow::create_lxvst_editor(boost::shared_ptr) +PluginUIWindow::create_lxvst_editor(std::shared_ptr) #endif { #ifndef LXVST_SUPPORT return false; #else - boost::shared_ptr lxvp; + std::shared_ptr lxvp; - if ((lxvp = boost::dynamic_pointer_cast (pib->plugin())) == 0) { + if ((lxvp = std::dynamic_pointer_cast (pib->plugin())) == 0) { error << string_compose (_("unknown type of editor-supplying plugin (note: no linuxVST support in this version of %1)"), PROGRAM_NAME) << endmsg; throw failed_constructor (); @@ -320,16 +320,16 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr) bool #ifdef MACVST_SUPPORT -PluginUIWindow::create_mac_vst_editor (boost::shared_ptr pib) +PluginUIWindow::create_mac_vst_editor (std::shared_ptr pib) #else -PluginUIWindow::create_mac_vst_editor (boost::shared_ptr) +PluginUIWindow::create_mac_vst_editor (std::shared_ptr) #endif { #ifndef MACVST_SUPPORT return false; #else - boost::shared_ptr mvst; - if ((mvst = boost::dynamic_pointer_cast (pib->plugin())) == 0) { + std::shared_ptr mvst; + if ((mvst = std::dynamic_pointer_cast (pib->plugin())) == 0) { error << string_compose (_("unknown type of editor-supplying plugin (note: no MacVST support in this version of %1)"), PROGRAM_NAME) << endmsg; throw failed_constructor (); @@ -348,16 +348,16 @@ PluginUIWindow::create_mac_vst_editor (boost::shared_ptr) bool #ifdef VST3_SUPPORT -PluginUIWindow::create_vst3_editor (boost::shared_ptr pib) +PluginUIWindow::create_vst3_editor (std::shared_ptr pib) #else -PluginUIWindow::create_vst3_editor (boost::shared_ptr) +PluginUIWindow::create_vst3_editor (std::shared_ptr) #endif { #ifndef VST3_SUPPORT return false; #else - boost::shared_ptr vst3; - if ((vst3 = boost::dynamic_pointer_cast (pib->plugin())) == 0) { + std::shared_ptr vst3; + if ((vst3 = std::dynamic_pointer_cast (pib->plugin())) == 0) { error << _("create_vst3_editor called on non-VST3 plugin") << endmsg; throw failed_constructor (); } else { @@ -384,9 +384,9 @@ PluginUIWindow::create_vst3_editor (boost::shared_ptr) bool #ifdef AUDIOUNIT_SUPPORT -PluginUIWindow::create_audiounit_editor (boost::shared_ptr pib) +PluginUIWindow::create_audiounit_editor (std::shared_ptr pib) #else -PluginUIWindow::create_audiounit_editor (boost::shared_ptr) +PluginUIWindow::create_audiounit_editor (std::shared_ptr) #endif { #ifndef AUDIOUNIT_SUPPORT @@ -432,12 +432,12 @@ PluginUIWindow::app_activated (bool) } bool -PluginUIWindow::create_lv2_editor(boost::shared_ptr pib) +PluginUIWindow::create_lv2_editor(std::shared_ptr pib) { #ifdef HAVE_SUIL - boost::shared_ptr vp; + std::shared_ptr vp; - if ((vp = boost::dynamic_pointer_cast (pib->plugin())) == 0) { + if ((vp = std::dynamic_pointer_cast (pib->plugin())) == 0) { error << _("create_lv2_editor called on non-LV2 plugin") << endmsg; throw failed_constructor (); } else { @@ -523,7 +523,7 @@ PluginUIWindow::plugin_going_away () death_connection.disconnect (); } -PlugUIBase::PlugUIBase (boost::shared_ptr pib) +PlugUIBase::PlugUIBase (std::shared_ptr pib) : _pib (pib) , plugin (pib->plugin()) , _add_button (_("Add")) @@ -543,7 +543,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pib) , preset_gui (0) , preset_dialog (0) { - _pi = boost::dynamic_pointer_cast (_pib); /* may be NULL */ + _pi = std::dynamic_pointer_cast (_pib); /* may be NULL */ _preset_modified.set_size_request (16, -1); _preset_combo.set_text("(default)"); @@ -596,7 +596,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr pib) _bypass_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PlugUIBase::bypass_button_release), false); if (_pi) { - _pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&PlugUIBase::processor_active_changed, this, boost::weak_ptr(_pi)), gui_context()); + _pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&PlugUIBase::processor_active_changed, this, std::weak_ptr(_pi)), gui_context()); _bypass_button.set_active (!_pi->enabled ()); } else { _bypass_button.set_sensitive (false); @@ -734,10 +734,10 @@ PlugUIBase::latency_button_clicked () } void -PlugUIBase::processor_active_changed (boost::weak_ptr weak_p) +PlugUIBase::processor_active_changed (std::weak_ptr weak_p) { ENSURE_GUI_THREAD (*this, &PlugUIBase::processor_active_changed, weak_p); - boost::shared_ptr p (weak_p.lock()); + std::shared_ptr p (weak_p.lock()); if (p) { _bypass_button.set_active (!p->enabled ()); diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index 490b2e8217..c6e4ed915a 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -91,7 +91,7 @@ class VSTPluginUI; class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList { public: - PlugUIBase (boost::shared_ptr); + PlugUIBase (std::shared_ptr); virtual ~PlugUIBase(); virtual gint get_preferred_height () = 0; @@ -118,9 +118,9 @@ public: sigc::signal KeyboardFocused; protected: - boost::shared_ptr _pib; - boost::shared_ptr _pi; - boost::shared_ptr plugin; + std::shared_ptr _pib; + std::shared_ptr _pi; + std::shared_ptr plugin; void add_common_widgets (Gtk::HBox*, bool with_focus = true); @@ -188,7 +188,7 @@ protected: void toggle_description (); void toggle_plugin_analysis (); void toggle_cpuload_display (); - void processor_active_changed (boost::weak_ptr p); + void processor_active_changed (std::weak_ptr p); void plugin_going_away (); void automation_state_changed (); void preset_added_or_removed (); @@ -210,7 +210,7 @@ private: class GenericPluginUI : public PlugUIBase, public Gtk::VBox { public: - GenericPluginUI (boost::shared_ptr plug, bool scrollable=false); + GenericPluginUI (std::shared_ptr plug, bool scrollable=false); ~GenericPluginUI (); gint get_preferred_height () { return prefheight; } @@ -244,12 +244,12 @@ private: const Evoral::Parameter parameter() const { return param; } Evoral::Parameter param; - boost::shared_ptr control; + std::shared_ptr control; /* input */ - boost::shared_ptr scale_points; - boost::shared_ptr controller; + std::shared_ptr scale_points; + std::shared_ptr controller; ArdourWidgets::ArdourButton automate_button; Gtk::Label label; @@ -296,7 +296,7 @@ private: ControlUI* build_control_ui (const Evoral::Parameter& param, const ARDOUR::ParameterDescriptor& desc, - boost::shared_ptr mcontrol, + std::shared_ptr mcontrol, float value, bool is_input, bool use_knob = false); @@ -344,7 +344,7 @@ private: class PluginUIWindow : public ArdourWindow { public: - PluginUIWindow (boost::shared_ptr, + PluginUIWindow (std::shared_ptr, bool scrollable = false, bool editor = true); ~PluginUIWindow (); @@ -379,12 +379,12 @@ private: void app_activated (bool); void plugin_going_away (); - bool create_windows_vst_editor (boost::shared_ptr); - bool create_lxvst_editor(boost::shared_ptr); - bool create_mac_vst_editor(boost::shared_ptr); - bool create_audiounit_editor (boost::shared_ptr); - bool create_lv2_editor (boost::shared_ptr); - bool create_vst3_editor (boost::shared_ptr); + bool create_windows_vst_editor (std::shared_ptr); + bool create_lxvst_editor(std::shared_ptr); + bool create_mac_vst_editor(std::shared_ptr); + bool create_audiounit_editor (std::shared_ptr); + bool create_lv2_editor (std::shared_ptr); + bool create_vst3_editor (std::shared_ptr); static PluginUIWindow* the_plugin_window; }; @@ -393,12 +393,12 @@ private: /* this function has to be in a .mm file * because MacVSTPluginUI has Cocoa members */ -extern VSTPluginUI* create_mac_vst_gui (boost::shared_ptr); +extern VSTPluginUI* create_mac_vst_gui (std::shared_ptr); #endif #ifdef AUDIOUNIT_SUPPORT /* this function has to be in a .mm file */ -extern PlugUIBase* create_au_gui (boost::shared_ptr, Gtk::VBox**); +extern PlugUIBase* create_au_gui (std::shared_ptr, Gtk::VBox**); #endif #endif /* __ardour_plugin_ui_h__ */ diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 4100c555d8..bebf9325d3 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -84,9 +84,9 @@ PortGroup::~PortGroup() * @param allow_dups true to allow the group to contain more than one bundle with the same port, otherwise false. */ void -PortGroup::add_bundle (boost::shared_ptr b, bool allow_dups) +PortGroup::add_bundle (std::shared_ptr b, bool allow_dups) { - add_bundle_internal (b, boost::shared_ptr (), false, Gdk::Color (), allow_dups); + add_bundle_internal (b, std::shared_ptr (), false, Gdk::Color (), allow_dups); } /** Add a bundle to a group. @@ -94,7 +94,7 @@ PortGroup::add_bundle (boost::shared_ptr b, bool allow_dups) * @param io IO whose ports are in the bundle. */ void -PortGroup::add_bundle (boost::shared_ptr b, boost::shared_ptr io) +PortGroup::add_bundle (std::shared_ptr b, std::shared_ptr io) { add_bundle_internal (b, io, false, Gdk::Color (), false); } @@ -104,12 +104,12 @@ PortGroup::add_bundle (boost::shared_ptr b, boost::shared_ptr io) * @param c Colour to represent the bundle with. */ void -PortGroup::add_bundle (boost::shared_ptr b, boost::shared_ptr io, Gdk::Color c) +PortGroup::add_bundle (std::shared_ptr b, std::shared_ptr io, Gdk::Color c) { add_bundle_internal (b, io, true, c, false); } -PortGroup::BundleRecord::BundleRecord (boost::shared_ptr b, boost::shared_ptr iop, Gdk::Color c, bool has_c) +PortGroup::BundleRecord::BundleRecord (std::shared_ptr b, std::shared_ptr iop, Gdk::Color c, bool has_c) : bundle (b) , io (iop) , colour (c) @@ -118,7 +118,7 @@ PortGroup::BundleRecord::BundleRecord (boost::shared_ptr b, boos } void -PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptr io, bool has_colour, Gdk::Color colour, bool allow_dups) +PortGroup::add_bundle_internal (std::shared_ptr b, std::shared_ptr io, bool has_colour, Gdk::Color colour, bool allow_dups) { assert (b.get()); @@ -144,7 +144,7 @@ PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptr b) +PortGroup::remove_bundle (std::shared_ptr b) { assert (b.get()); @@ -193,7 +193,7 @@ PortGroup::has_port (std::string const& p) const return false; } -boost::shared_ptr +std::shared_ptr PortGroup::only_bundle () { assert (_bundles.size() == 1); @@ -212,8 +212,8 @@ PortGroup::total_channels () const return n; } -boost::shared_ptr -PortGroup::io_from_bundle (boost::shared_ptr b) const +std::shared_ptr +PortGroup::io_from_bundle (std::shared_ptr b) const { BundleList::const_iterator i = _bundles.begin (); while (i != _bundles.end() && (*i)->bundle != b) { @@ -221,10 +221,10 @@ PortGroup::io_from_bundle (boost::shared_ptr b) const } if (i == _bundles.end()) { - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr io ((*i)->io.lock ()); + std::shared_ptr io ((*i)->io.lock ()); return io; } @@ -293,20 +293,20 @@ PortGroupList::~PortGroupList() void PortGroupList::maybe_add_processor_to_list ( - boost::weak_ptr wp, list >* route_ios, bool inputs, set >& used_io + std::weak_ptr wp, list >* route_ios, bool inputs, set >& used_io ) { - boost::shared_ptr p (wp.lock()); + std::shared_ptr p (wp.lock()); if (!p) { return; } - boost::shared_ptr iop = boost::dynamic_pointer_cast (p); + std::shared_ptr iop = std::dynamic_pointer_cast (p); if (iop) { - boost::shared_ptr io = inputs ? iop->input() : iop->output(); + std::shared_ptr io = inputs ? iop->input() : iop->output(); if (io && used_io.find (io) == used_io.end()) { route_ios->push_back (io); @@ -316,14 +316,14 @@ PortGroupList::maybe_add_processor_to_list ( } struct RouteIOs { - RouteIOs (boost::shared_ptr r, boost::shared_ptr i) { + RouteIOs (std::shared_ptr r, std::shared_ptr i) { route = r; ios.push_back (i); } - boost::shared_ptr route; + std::shared_ptr route; /* it's ok to use a shared_ptr here as RouteIOs structs are only used during ::gather () */ - std::list > ios; + std::list > ios; }; class RouteIOsComparator { @@ -348,21 +348,21 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp return; } - boost::shared_ptr bus (new PortGroup (_("Busses"))); - boost::shared_ptr track (new PortGroup (("Tracks"))); - boost::shared_ptr sidechain (new PortGroup (_("Sidechains"))); - boost::shared_ptr iop_pre (new PortGroup (_("I/O Pre") )); - boost::shared_ptr iop_post (new PortGroup (_("I/O Post") )); - boost::shared_ptr system (new PortGroup (_("Hardware"))); - boost::shared_ptr program (new PortGroup (string_compose (_("%1 Misc"), PROGRAM_NAME))); - boost::shared_ptr other (new PortGroup (_("External"))); + std::shared_ptr bus (new PortGroup (_("Busses"))); + std::shared_ptr track (new PortGroup (("Tracks"))); + std::shared_ptr sidechain (new PortGroup (_("Sidechains"))); + std::shared_ptr iop_pre (new PortGroup (_("I/O Pre") )); + std::shared_ptr iop_post (new PortGroup (_("I/O Post") )); + std::shared_ptr system (new PortGroup (_("Hardware"))); + std::shared_ptr program (new PortGroup (string_compose (_("%1 Misc"), PROGRAM_NAME))); + std::shared_ptr other (new PortGroup (_("External"))); /* Find the IOs which have bundles for routes and their processors. We store these IOs in a RouteIOs class so that we can then sort the results by route order key. */ - boost::shared_ptr routes = session->get_routes (); + std::shared_ptr routes = session->get_routes (); list route_ios; for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { @@ -378,8 +378,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp Route::output() and the main_outs Delivery */ - set > used_io; - boost::shared_ptr io = inputs ? (*i)->input() : (*i)->output(); + set > used_io; + std::shared_ptr io = inputs ? (*i)->input() : (*i)->output(); used_io.insert (io); RouteIOs rb (*i, io); @@ -397,14 +397,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp TimeAxisView* tv = PublicEditor::instance().time_axis_view_from_stripable (i->route); /* Work out which group to put these IOs' bundles in */ - boost::shared_ptr g; - if (boost::dynamic_pointer_cast (i->route)) { + std::shared_ptr g; + if (std::dynamic_pointer_cast (i->route)) { g = track; } else { g = bus; } - for (list >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) { + for (list >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) { /* Only add the bundle if there is at least one port * with a type that's been asked for */ if (type == DataType::NIL || (*j)->bundle()->nchannels().n(type) > 0) { @@ -419,14 +419,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* When on input side, let's look for sidechains in the route's plugins to display them right next to their route */ for (uint32_t n = 0; inputs; ++n) { - boost::shared_ptr p = (i->route)->nth_plugin (n); + std::shared_ptr p = (i->route)->nth_plugin (n); if (!p) { break; } - boost::shared_ptr sc = boost::static_pointer_cast (p)->sidechain (); + std::shared_ptr sc = std::static_pointer_cast (p)->sidechain (); if (sc) { - boost::shared_ptr io = sc->input(); + std::shared_ptr io = sc->input(); if (tv) { sidechain->add_bundle (io->bundle(), io, tv->color ()); } else { @@ -440,10 +440,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp that UserBundles that offer the same ports as a normal bundle get priority */ - boost::shared_ptr b = session->bundles (); + std::shared_ptr b = session->bundles (); for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast (*i) && (*i)->ports_are_inputs() == inputs) { + if (std::dynamic_pointer_cast (*i) && (*i)->ports_are_inputs() == inputs) { system->add_bundle (*i, allow_dups); } } @@ -451,7 +451,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* Only look for non-user bundles if instructed to do so */ if (use_session_bundles) { for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast (*i) == 0 && (*i)->ports_are_inputs() == inputs) { + if (std::dynamic_pointer_cast (*i) == 0 && (*i)->ports_are_inputs() == inputs) { system->add_bundle (*i, allow_dups); } } @@ -467,25 +467,25 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp program->add_bundle (session->click_io()->bundle()); } - boost::shared_ptr ltc (new Bundle (_("LTC Out"), inputs)); + std::shared_ptr ltc (new Bundle (_("LTC Out"), inputs)); ltc->add_channel (_("LTC Out"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_output_port()->name())); program->add_bundle (ltc); } else { - boost::shared_ptr sync (new Bundle (_("Sync"), inputs)); + std::shared_ptr sync (new Bundle (_("Sync"), inputs)); AudioEngine* ae = AudioEngine::instance(); TransportMasterManager::TransportMasters const & tm (TransportMasterManager::instance().transport_masters()); for (TransportMasterManager::TransportMasters::const_iterator i = tm.begin(); i != tm.end(); ++i) { - boost::shared_ptr port = (*i)->port (); + std::shared_ptr port = (*i)->port (); if (!port) { continue; } - if (!boost::dynamic_pointer_cast (port)) { + if (!std::dynamic_pointer_cast (port)) { continue; } @@ -507,8 +507,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp ControlProtocolManager& m = ControlProtocolManager::instance (); for (list::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) { if ((*i)->protocol) { - list > b = (*i)->protocol->bundles (); - for (list >::iterator j = b.begin(); j != b.end(); ++j) { + list > b = (*i)->protocol->bundles (); + for (list >::iterator j = b.begin(); j != b.end(); ++j) { if ((*j)->ports_are_inputs() == inputs) { program->add_bundle (*j); } @@ -519,9 +519,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* virtual keyboard */ if (!inputs && (type == DataType::MIDI || type == DataType::NIL)) { - boost::shared_ptr ap = boost::dynamic_pointer_cast (session->vkbd_output_port()); + std::shared_ptr ap = std::dynamic_pointer_cast (session->vkbd_output_port()); AudioEngine* ae = AudioEngine::instance(); - boost::shared_ptr vm (new Bundle (ap->pretty_name (), inputs)); + std::shared_ptr vm (new Bundle (ap->pretty_name (), inputs)); vm->add_channel (ap->pretty_name (), DataType::MIDI, ae->make_port_name_non_relative (ap->name())); program->add_bundle (vm); } @@ -529,19 +529,19 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* our sync ports */ if ((type == DataType::MIDI || type == DataType::NIL)) { - boost::shared_ptr sync (new Bundle (_("Sync"), inputs)); + std::shared_ptr sync (new Bundle (_("Sync"), inputs)); AudioEngine* ae = AudioEngine::instance(); TransportMasterManager::TransportMasters const & tm (TransportMasterManager::instance().transport_masters()); if (inputs) { for (TransportMasterManager::TransportMasters::const_iterator i = tm.begin(); i != tm.end(); ++i) { - boost::shared_ptr port = (*i)->port (); + std::shared_ptr port = (*i)->port (); if (!port) { continue; } - if (!boost::dynamic_pointer_cast (port)) { + if (!std::dynamic_pointer_cast (port)) { continue; } @@ -567,7 +567,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } for (auto const& iop : *session->io_plugs ()) { - boost::shared_ptr io = inputs ? iop->input() : iop->output(); + std::shared_ptr io = inputs ? iop->input() : iop->output(); if (io->n_ports().n_total () == 0) { continue; } @@ -705,7 +705,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_program[*i].empty()) { /* used program name as bundle name */ - boost::shared_ptr b = make_bundle_from_ports (extra_program[*i], *i, inputs, lpn); + std::shared_ptr b = make_bundle_from_ports (extra_program[*i], *i, inputs, lpn); program->add_bundle (b); } } @@ -732,7 +732,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } void -PortGroupList::add_bundles_for_ports (std::vector const & p, ARDOUR::DataType type, bool inputs, bool allow_dups, boost::shared_ptr group) const +PortGroupList::add_bundles_for_ports (std::vector const & p, ARDOUR::DataType type, bool inputs, bool allow_dups, std::shared_ptr group) const { bool has_colon = true, has_slash = true; for (const auto& s : p) { @@ -741,7 +741,7 @@ PortGroupList::add_bundles_for_ports (std::vector const & p, ARDOUR } std::string sep = has_slash ? "/" : has_colon ? ":" : ""; if (sep.empty()) { - boost::shared_ptr b = make_bundle_from_ports (p, type, inputs); + std::shared_ptr b = make_bundle_from_ports (p, type, inputs); group->add_bundle (b, allow_dups); return; } @@ -751,7 +751,7 @@ PortGroupList::add_bundles_for_ports (std::vector const & p, ARDOUR for (const auto& s : p) { std::string pf = s.substr (0, s.find_first_of (sep) + 1); if (pf != cp && !nb.empty()) { - boost::shared_ptr b = make_bundle_from_ports (nb, type, inputs); + std::shared_ptr b = make_bundle_from_ports (nb, type, inputs); group->add_bundle (b, allow_dups); nb.clear(); } @@ -759,15 +759,15 @@ PortGroupList::add_bundles_for_ports (std::vector const & p, ARDOUR nb.push_back(s); } if (!nb.empty()) { - boost::shared_ptr b = make_bundle_from_ports (nb, type, inputs); + std::shared_ptr b = make_bundle_from_ports (nb, type, inputs); group->add_bundle (b, allow_dups); } } -boost::shared_ptr +std::shared_ptr PortGroupList::make_bundle_from_ports (std::vector const & p, ARDOUR::DataType type, bool inputs, std::string const& bundle_name) const { - boost::shared_ptr b (new Bundle ("", inputs)); + std::shared_ptr b (new Bundle ("", inputs)); std::string const pre = common_prefix (p); if (!bundle_name.empty()) { @@ -876,7 +876,7 @@ PortGroupList::total_channels () const } void -PortGroupList::add_group_if_not_empty (boost::shared_ptr g) +PortGroupList::add_group_if_not_empty (std::shared_ptr g) { if (!g->bundles().empty ()) { add_group (g); @@ -884,7 +884,7 @@ PortGroupList::add_group_if_not_empty (boost::shared_ptr g) } void -PortGroupList::add_group (boost::shared_ptr g) +PortGroupList::add_group (std::shared_ptr g) { _groups.push_back (g); @@ -895,7 +895,7 @@ PortGroupList::add_group (boost::shared_ptr g) } void -PortGroupList::remove_bundle (boost::shared_ptr b) +PortGroupList::remove_bundle (std::shared_ptr b) { for (List::iterator i = _groups.begin(); i != _groups.end(); ++i) { (*i)->remove_bundle (b); @@ -945,19 +945,19 @@ PortGroupList::resume_signals () _signals_suspended = false; } -boost::shared_ptr -PortGroupList::io_from_bundle (boost::shared_ptr b) const +std::shared_ptr +PortGroupList::io_from_bundle (std::shared_ptr b) const { List::const_iterator i = _groups.begin (); while (i != _groups.end()) { - boost::shared_ptr io = (*i)->io_from_bundle (b); + std::shared_ptr io = (*i)->io_from_bundle (b); if (io) { return io; } ++i; } - return boost::shared_ptr (); + return std::shared_ptr (); } bool diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h index 5e813ccb8b..79856b071e 100644 --- a/gtk2_ardour/port_group.h +++ b/gtk2_ardour/port_group.h @@ -53,14 +53,14 @@ public: PortGroup (std::string const & n); ~PortGroup (); - void add_bundle (boost::shared_ptr, bool allow_dups = false); - void add_bundle (boost::shared_ptr, boost::shared_ptr io); - void add_bundle (boost::shared_ptr, boost::shared_ptr, Gdk::Color); - void remove_bundle (boost::shared_ptr); - boost::shared_ptr only_bundle (); + void add_bundle (std::shared_ptr, bool allow_dups = false); + void add_bundle (std::shared_ptr, std::shared_ptr io); + void add_bundle (std::shared_ptr, std::shared_ptr, Gdk::Color); + void remove_bundle (std::shared_ptr); + std::shared_ptr only_bundle (); void clear (); ARDOUR::ChanCount total_channels () const; - boost::shared_ptr io_from_bundle (boost::shared_ptr) const; + std::shared_ptr io_from_bundle (std::shared_ptr) const; void remove_duplicates (); std::string name; ///< name for the group @@ -74,15 +74,15 @@ public: PBD::Signal1 BundleChanged; struct BundleRecord { - boost::shared_ptr bundle; + std::shared_ptr bundle; /** IO whose ports are in the bundle, or 0. This is so that we can do things like adding ports to the IO from matrix editor menus. */ - boost::weak_ptr io; + std::weak_ptr io; Gdk::Color colour; bool has_colour; PBD::ScopedConnection changed_connection; - BundleRecord (boost::shared_ptr, boost::shared_ptr, Gdk::Color, bool has_colour); + BundleRecord (std::shared_ptr, std::shared_ptr, Gdk::Color, bool has_colour); }; typedef std::list BundleList; @@ -93,7 +93,7 @@ public: private: void bundle_changed (ARDOUR::Bundle::Change); - void add_bundle_internal (boost::shared_ptr, boost::shared_ptr, bool, Gdk::Color, bool); + void add_bundle_internal (std::shared_ptr, std::shared_ptr, bool, Gdk::Color, bool); BundleList _bundles; }; @@ -105,19 +105,19 @@ public: PortGroupList (); ~PortGroupList(); - typedef std::vector > List; + typedef std::vector > List; - void add_group (boost::shared_ptr); - void add_group_if_not_empty (boost::shared_ptr); + void add_group (std::shared_ptr); + void add_group_if_not_empty (std::shared_ptr); void gather (ARDOUR::Session *, ARDOUR::DataType, bool, bool, bool); PortGroup::BundleList const & bundles () const; void clear (); - void remove_bundle (boost::shared_ptr); + void remove_bundle (std::shared_ptr); ARDOUR::ChanCount total_channels () const; uint32_t size () const { return _groups.size(); } - boost::shared_ptr io_from_bundle (boost::shared_ptr) const; + std::shared_ptr io_from_bundle (std::shared_ptr) const; void suspend_signals (); void resume_signals (); @@ -144,9 +144,9 @@ private: std::string common_prefix_before (std::vector const &, std::string const &) const; void emit_changed (); void emit_bundle_changed (ARDOUR::Bundle::Change); - boost::shared_ptr make_bundle_from_ports (std::vector const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const; - void add_bundles_for_ports (std::vector const &, ARDOUR::DataType, bool, bool, boost::shared_ptr) const; - void maybe_add_processor_to_list (boost::weak_ptr, std::list > *, bool, std::set > &); + std::shared_ptr make_bundle_from_ports (std::vector const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const; + void add_bundles_for_ports (std::vector const &, ARDOUR::DataType, bool, bool, std::shared_ptr) const; + void maybe_add_processor_to_list (std::weak_ptr, std::list > *, bool, std::set > &); mutable PortGroup::BundleList _bundles; List _groups; diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc index bea487d89b..c524b4af39 100644 --- a/gtk2_ardour/port_insert_ui.cc +++ b/gtk2_ardour/port_insert_ui.cc @@ -44,7 +44,7 @@ using namespace ARDOUR; -PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::shared_ptr pi) +PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, std::shared_ptr pi) : _pi (pi) , _measure_latency_button (_("Measure Latency")) , _invert_button (X_("Ø")) @@ -104,11 +104,11 @@ PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s _input_gpm.setup_meters (); _input_gpm.set_fader_name (X_("SendUIFader")); - _input_gpm.set_controls (boost::shared_ptr (), _pi->return_meter (), _pi->return_amp (), _pi->return_gain_control ()); + _input_gpm.set_controls (std::shared_ptr (), _pi->return_meter (), _pi->return_amp (), _pi->return_gain_control ()); _output_gpm.setup_meters (); _output_gpm.set_fader_name (X_("SendUIFader")); - _output_gpm.set_controls (boost::shared_ptr (), _pi->send_meter (), _pi->send_amp (), _pi->send_gain_control ()); + _output_gpm.set_controls (std::shared_ptr (), _pi->send_meter (), _pi->send_amp (), _pi->send_gain_control ()); Gtkmm2ext::UI::instance ()->set_tip (_invert_button, _("Click to invert polarity of all send channels")); Gtkmm2ext::UI::instance ()->set_tip (_edit_latency_button, _("Edit Latency, manually override measured or I/O reported latency")); @@ -176,7 +176,7 @@ PortInsertUI::invert_press (GdkEventButton* ev) return true; } - boost::shared_ptr ac = _pi->send_polarity_control (); + std::shared_ptr ac = _pi->send_polarity_control (); ac->start_touch (timepos_t (ac->session ().audible_sample ())); return true; } @@ -188,7 +188,7 @@ PortInsertUI::invert_release (GdkEventButton* ev) return true; } - boost::shared_ptr ac = _pi->send_polarity_control (); + std::shared_ptr ac = _pi->send_polarity_control (); ac->set_value (_invert_button.get_active () ? 0 : 1, PBD::Controllable::NoGroup); ac->stop_touch (timepos_t (ac->session ().audible_sample ())); return true; @@ -331,7 +331,7 @@ PortInsertUI::finished (IOSelector::Result r) _output_selector.Finished (r); } -PortInsertWindow::PortInsertWindow (Gtk::Window& parent, ARDOUR::Session* s, boost::shared_ptr pi) +PortInsertWindow::PortInsertWindow (Gtk::Window& parent, ARDOUR::Session* s, std::shared_ptr pi) : ArdourWindow (parent, string_compose (_("Port Insert: %1"), pi->name ())) , _portinsertui (this, s, pi) { diff --git a/gtk2_ardour/port_insert_ui.h b/gtk2_ardour/port_insert_ui.h index dac6cb8547..94aa08e41b 100644 --- a/gtk2_ardour/port_insert_ui.h +++ b/gtk2_ardour/port_insert_ui.h @@ -37,7 +37,7 @@ class MTDM; class PortInsertUI : public Gtk::VBox { public: - PortInsertUI (Gtk::Window*, ARDOUR::Session*, boost::shared_ptr); + PortInsertUI (Gtk::Window*, ARDOUR::Session*, std::shared_ptr); ~PortInsertUI (); void redisplay (); @@ -59,7 +59,7 @@ private: void edit_latency_button_clicked (); void latency_button_toggled (); - boost::shared_ptr _pi; + std::shared_ptr _pi; Gtk::Notebook _notebook; ArdourWidgets::StatefulToggleButton _measure_latency_button; @@ -90,7 +90,7 @@ private: class PortInsertWindow : public ArdourWindow { public: - PortInsertWindow (Gtk::Window&, ARDOUR::Session*, boost::shared_ptr); + PortInsertWindow (Gtk::Window&, ARDOUR::Session*, std::shared_ptr); private: PortInsertUI _portinsertui; diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 4d861275e4..551b16a2dd 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -193,7 +193,7 @@ PortMatrix::reconnect_to_routes () { _route_connections.drop_connections (); - boost::shared_ptr routes = _session->get_routes (); + std::shared_ptr routes = _session->get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { (*i)->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::route_processors_changed, this, _1), gui_context()); (*i)->DropReferences.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context()); @@ -407,7 +407,7 @@ PortMatrix::columns () const return &_ports[_column_index]; } -boost::shared_ptr +std::shared_ptr PortMatrix::visible_columns () const { return visible_ports (_column_index); @@ -420,7 +420,7 @@ PortMatrix::rows () const return &_ports[_row_index]; } -boost::shared_ptr +std::shared_ptr PortMatrix::visible_rows () const { return visible_ports (_row_index); @@ -455,7 +455,7 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) Menu* m = manage (new Menu); MenuList& sub = m->items (); - boost::weak_ptr w (bc[dim].bundle); + std::weak_ptr w (bc[dim].bundle); if (can_add_channels (bc[dim].bundle)) { /* Start off with options for the `natural' port type */ @@ -563,9 +563,9 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) } void -PortMatrix::remove_channel_proxy (boost::weak_ptr b, uint32_t c) +PortMatrix::remove_channel_proxy (std::weak_ptr b, uint32_t c) { - boost::shared_ptr sb = b.lock (); + std::shared_ptr sb = b.lock (); if (!sb) { return; } @@ -575,9 +575,9 @@ PortMatrix::remove_channel_proxy (boost::weak_ptr b, uint32_t c) } void -PortMatrix::rename_channel_proxy (boost::weak_ptr b, uint32_t c) +PortMatrix::rename_channel_proxy (std::weak_ptr b, uint32_t c) { - boost::shared_ptr sb = b.lock (); + std::shared_ptr sb = b.lock (); if (!sb) { return; } @@ -586,9 +586,9 @@ PortMatrix::rename_channel_proxy (boost::weak_ptr b, uint32_t c) } void -PortMatrix::disassociate_all_on_bundle (boost::weak_ptr bundle, int dim) +PortMatrix::disassociate_all_on_bundle (std::weak_ptr bundle, int dim) { - boost::shared_ptr sb = bundle.lock (); + std::shared_ptr sb = bundle.lock (); if (!sb) { return; } @@ -601,9 +601,9 @@ PortMatrix::disassociate_all_on_bundle (boost::weak_ptr bundle, int dim) } void -PortMatrix::disassociate_all_on_channel (boost::weak_ptr bundle, uint32_t channel, int dim) +PortMatrix::disassociate_all_on_channel (std::weak_ptr bundle, uint32_t channel, int dim) { - boost::shared_ptr sb = bundle.lock (); + std::shared_ptr sb = bundle.lock (); if (!sb) { return; } @@ -718,10 +718,10 @@ PortMatrix::on_scroll_event (GdkEventScroll* ev) return true; } -boost::shared_ptr -PortMatrix::io_from_bundle (boost::shared_ptr b) const +std::shared_ptr +PortMatrix::io_from_bundle (std::shared_ptr b) const { - boost::shared_ptr io = _ports[0].io_from_bundle (b); + std::shared_ptr io = _ports[0].io_from_bundle (b); if (!io) { io = _ports[1].io_from_bundle (b); } @@ -730,22 +730,22 @@ PortMatrix::io_from_bundle (boost::shared_ptr b) const } bool -PortMatrix::can_add_channels (boost::shared_ptr b) const +PortMatrix::can_add_channels (std::shared_ptr b) const { return io_from_bundle (b) != 0; } bool -PortMatrix::can_add_port (boost::shared_ptr b, DataType t) const +PortMatrix::can_add_port (std::shared_ptr b, DataType t) const { - boost::shared_ptr io = io_from_bundle (b); + std::shared_ptr io = io_from_bundle (b); return io && io->can_add_port (t); } void -PortMatrix::add_channel (boost::shared_ptr b, DataType t) +PortMatrix::add_channel (std::shared_ptr b, DataType t) { - boost::shared_ptr io = io_from_bundle (b); + std::shared_ptr io = io_from_bundle (b); if (io) { int const r = io->add_port ("", this, t); @@ -758,7 +758,7 @@ PortMatrix::add_channel (boost::shared_ptr b, DataType t) } bool -PortMatrix::can_remove_channels (boost::shared_ptr b) const +PortMatrix::can_remove_channels (std::shared_ptr b) const { return io_from_bundle (b) != 0; } @@ -767,8 +767,8 @@ void PortMatrix::remove_channel (ARDOUR::BundleChannel b) { std::string errmsg; - boost::shared_ptr io = io_from_bundle (b.bundle); - boost::shared_ptr p = io->nth (b.channel); + std::shared_ptr io = io_from_bundle (b.bundle); + std::shared_ptr p = io->nth (b.channel); if (!io || !p) { return; @@ -789,9 +789,9 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b) } void -PortMatrix::remove_all_channels (boost::weak_ptr w) +PortMatrix::remove_all_channels (std::weak_ptr w) { - boost::shared_ptr b = w.lock (); + std::shared_ptr b = w.lock (); if (!b) { return; } @@ -807,9 +807,9 @@ PortMatrix::remove_all_channels (boost::weak_ptr w) } bool -PortMatrix::can_add_port_proxy (boost::weak_ptr w, DataType t) const +PortMatrix::can_add_port_proxy (std::weak_ptr w, DataType t) const { - boost::shared_ptr b = w.lock (); + std::shared_ptr b = w.lock (); if (!b) { return false; } @@ -817,9 +817,9 @@ PortMatrix::can_add_port_proxy (boost::weak_ptr w, DataType t) const } void -PortMatrix::add_channel_proxy (boost::weak_ptr w, DataType t) +PortMatrix::add_channel_proxy (std::weak_ptr w, DataType t) { - boost::shared_ptr b = w.lock (); + std::shared_ptr b = w.lock (); if (!b) { return; } @@ -958,7 +958,7 @@ PortMatrix::body_dimensions_changed () /** @return The PortGroup that is currently visible (ie selected by * the notebook) along a given axis. */ -boost::shared_ptr +std::shared_ptr PortMatrix::visible_ports (int d) const { PortGroupList const & p = _ports[d]; @@ -987,18 +987,18 @@ PortMatrix::visible_ports (int d) const } if (j == p.end()) { - return boost::shared_ptr (); + return std::shared_ptr (); } return *j; } void -PortMatrix::add_remove_option (Menu_Helpers::MenuList& m, boost::weak_ptr w, int c) +PortMatrix::add_remove_option (Menu_Helpers::MenuList& m, std::weak_ptr w, int c) { using namespace Menu_Helpers; - boost::shared_ptr b = w.lock (); + std::shared_ptr b = w.lock (); if (!b) { return; } @@ -1009,11 +1009,11 @@ PortMatrix::add_remove_option (Menu_Helpers::MenuList& m, boost::weak_ptr w, int d, int c) +PortMatrix::add_disassociate_option (Menu_Helpers::MenuList& m, std::weak_ptr w, int d, int c) { using namespace Menu_Helpers; - boost::shared_ptr b = w.lock (); + std::shared_ptr b = w.lock (); if (!b) { return; } @@ -1186,7 +1186,7 @@ PortMatrix::get_association (PortMatrixNode node) const /** @return true if b is a non-zero pointer and the bundle it points to has some channels */ bool -PortMatrix::bundle_with_channels (boost::shared_ptr b) +PortMatrix::bundle_with_channels (std::shared_ptr b) { return b && b->nchannels() != ARDOUR::ChanCount::ZERO; } @@ -1201,7 +1201,7 @@ PortMatrix::check_flip () const /* Look for the row's port group name in the columns */ int new_column = 0; - boost::shared_ptr r = visible_ports (_row_index); + std::shared_ptr r = visible_ports (_row_index); PortGroupList::List::const_iterator i = _ports[_column_index].begin(); while (i != _ports[_column_index].end() && (*i)->name != r->name) { ++i; @@ -1215,7 +1215,7 @@ PortMatrix::check_flip () const /* Look for the column's port group name in the rows */ int new_row = 0; - boost::shared_ptr c = visible_ports (_column_index); + std::shared_ptr c = visible_ports (_column_index); i = _ports[_row_index].begin(); while (i != _ports[_row_index].end() && (*i)->name != c->name) { ++i; diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h index 97b1797b74..1a74cd38e6 100644 --- a/gtk2_ardour/port_matrix.h +++ b/gtk2_ardour/port_matrix.h @@ -98,7 +98,7 @@ public: } PortGroupList const * columns () const; - boost::shared_ptr visible_columns () const; + std::shared_ptr visible_columns () const; /** @return index into the _ports array for the list which is displayed as columns */ int column_index () const { @@ -106,7 +106,7 @@ public: } PortGroupList const * rows () const; - boost::shared_ptr visible_rows () const; + std::shared_ptr visible_rows () const; /** @return index into the _ports array for the list which is displayed as rows */ int row_index () const { @@ -117,7 +117,7 @@ public: return &_ports[d]; } - boost::shared_ptr visible_ports (int d) const; + std::shared_ptr visible_ports (int d) const; void init (); void setup (); @@ -146,15 +146,15 @@ public: virtual PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const = 0; virtual bool list_is_global (int) const = 0; - virtual bool can_add_channels (boost::shared_ptr) const; - virtual void add_channel (boost::shared_ptr, ARDOUR::DataType); - virtual bool can_remove_channels (boost::shared_ptr) const; + virtual bool can_add_channels (std::shared_ptr) const; + virtual void add_channel (std::shared_ptr, ARDOUR::DataType); + virtual bool can_remove_channels (std::shared_ptr) const; virtual void remove_channel (ARDOUR::BundleChannel); - virtual void remove_all_channels (boost::weak_ptr); - virtual bool can_rename_channels (boost::shared_ptr) const { + virtual void remove_all_channels (std::weak_ptr); + virtual bool can_rename_channels (std::shared_ptr) const { return false; } - virtual bool can_add_port (boost::shared_ptr, ARDOUR::DataType t) const; + virtual bool can_add_port (std::shared_ptr, ARDOUR::DataType t) const; virtual void rename_channel (ARDOUR::BundleChannel) {} virtual std::string disassociation_verb () const = 0; virtual std::string channel_noun () const; @@ -166,7 +166,7 @@ public: sigc::signal Finished; - static bool bundle_with_channels (boost::shared_ptr); + static bool bundle_with_channels (std::shared_ptr); protected: @@ -185,25 +185,25 @@ private: void routes_changed (); void reconnect_to_routes (); void select_arrangement (); - bool can_add_port_proxy (boost::weak_ptr, ARDOUR::DataType) const; - void add_channel_proxy (boost::weak_ptr, ARDOUR::DataType); - void remove_channel_proxy (boost::weak_ptr, uint32_t); - void rename_channel_proxy (boost::weak_ptr, uint32_t); - void disassociate_all_on_channel (boost::weak_ptr, uint32_t, int); - void disassociate_all_on_bundle (boost::weak_ptr, int); + bool can_add_port_proxy (std::weak_ptr, ARDOUR::DataType) const; + void add_channel_proxy (std::weak_ptr, ARDOUR::DataType); + void remove_channel_proxy (std::weak_ptr, uint32_t); + void rename_channel_proxy (std::weak_ptr, uint32_t); + void disassociate_all_on_channel (std::weak_ptr, uint32_t, int); + void disassociate_all_on_bundle (std::weak_ptr, int); void setup_global_ports (); void setup_global_ports_proxy (); void toggle_show_only_bundles (); bool on_scroll_event (GdkEventScroll *); - boost::shared_ptr io_from_bundle (boost::shared_ptr) const; + std::shared_ptr io_from_bundle (std::shared_ptr) const; void setup_notebooks (); void remove_notebook_pages (Gtk::Notebook &); void notebook_page_selected (GtkNotebookPage *, guint); void route_processors_changed (ARDOUR::RouteProcessorChange); void body_dimensions_changed (); void session_going_away (); - void add_remove_option (Gtk::Menu_Helpers::MenuList &, boost::weak_ptr, int); - void add_disassociate_option (Gtk::Menu_Helpers::MenuList &, boost::weak_ptr, int, int); + void add_remove_option (Gtk::Menu_Helpers::MenuList &, std::weak_ptr, int); + void add_disassociate_option (Gtk::Menu_Helpers::MenuList &, std::weak_ptr, int, int); void port_connected_or_disconnected (); void update_tab_highlighting (); std::pair check_flip () const; diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index dcf5303b6e..63ba144400 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -265,7 +265,7 @@ PortMatrixColumnLabels::port_name_shape (double xoff, double yoff) const void PortMatrixColumnLabels::render_bundle_name ( - cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, boost::shared_ptr b + cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, std::shared_ptr b ) { set_source_rgb (cr, bg_colour); @@ -460,7 +460,7 @@ PortMatrixColumnLabels::queue_draw_for (ARDOUR::BundleChannel const & bc) } ARDOUR::BundleChannel -PortMatrixColumnLabels::position_to_channel (double p, double o, boost::shared_ptr group) const +PortMatrixColumnLabels::position_to_channel (double p, double o, std::shared_ptr group) const { uint32_t const cx = p - (_height - o) * tan (angle ()); return PortMatrixComponent::position_to_channel (cx, o, group); diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h index 19b1b24ae5..21665e67eb 100644 --- a/gtk2_ardour/port_matrix_column_labels.h +++ b/gtk2_ardour/port_matrix_column_labels.h @@ -50,12 +50,12 @@ public: } private: - void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, boost::shared_ptr); + void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, std::shared_ptr); void render_channel_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, ARDOUR::BundleChannel const &); double channel_x (ARDOUR::BundleChannel const &) const; double channel_y (ARDOUR::BundleChannel const &) const; void queue_draw_for (ARDOUR::BundleChannel const &); - ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr) const; + ARDOUR::BundleChannel position_to_channel (double, double, std::shared_ptr) const; void render (cairo_t *); void compute_dimensions (); diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc index 2cf82d355f..5a345499f1 100644 --- a/gtk2_ardour/port_matrix_component.cc +++ b/gtk2_ardour/port_matrix_component.cc @@ -126,7 +126,7 @@ PortMatrixComponent::background_colour () * @return Visible size of the group in grid units, taking visibility and show_only_bundles into account. */ uint32_t -PortMatrixComponent::group_size (boost::shared_ptr g) const +PortMatrixComponent::group_size (std::shared_ptr g) const { uint32_t s = 0; @@ -147,7 +147,7 @@ PortMatrixComponent::group_size (boost::shared_ptr g) const * @return Position of bc in groups in grid units, taking show_only_bundles into account. */ uint32_t -PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::shared_ptr group) const +PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, std::shared_ptr group) const { uint32_t p = 0; @@ -181,7 +181,7 @@ PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share ARDOUR::BundleChannel -PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr group) const +PortMatrixComponent::position_to_channel (double p, double, std::shared_ptr group) const { p /= grid_spacing (); @@ -205,7 +205,7 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptrcount_of_our_type (N)) { return ARDOUR::BundleChannel ((*j)->bundle, (*j)->bundle->type_channel_to_overall (_matrix->type (), p)); } else { - return ARDOUR::BundleChannel (boost::shared_ptr (), -1); + return ARDOUR::BundleChannel (std::shared_ptr (), -1); } } else { p -= s; @@ -215,7 +215,7 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr (), -1); + return ARDOUR::BundleChannel (std::shared_ptr (), -1); } uint32_t diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h index 9ad1b999a0..cf745d0874 100644 --- a/gtk2_ardour/port_matrix_component.h +++ b/gtk2_ardour/port_matrix_component.h @@ -170,9 +170,9 @@ protected: void set_source_rgb (cairo_t *, Gdk::Color const &); void set_source_rgba (cairo_t *, Gdk::Color const &, double); - uint32_t group_size (boost::shared_ptr) const; - uint32_t channel_to_position (ARDOUR::BundleChannel, boost::shared_ptr) const; - virtual ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr) const; + uint32_t group_size (std::shared_ptr) const; + uint32_t channel_to_position (ARDOUR::BundleChannel, std::shared_ptr) const; + virtual ARDOUR::BundleChannel position_to_channel (double, double, std::shared_ptr) const; /** Render the complete component to a cairo context. */ virtual void render (cairo_t *) = 0; diff --git a/gtk2_ardour/port_matrix_grid.h b/gtk2_ardour/port_matrix_grid.h index 4d73f6a56a..afdaf5607b 100644 --- a/gtk2_ardour/port_matrix_grid.h +++ b/gtk2_ardour/port_matrix_grid.h @@ -56,7 +56,7 @@ private: void compute_dimensions (); void render (cairo_t *); - void render_group_pair (cairo_t *, boost::shared_ptr, boost::shared_ptr, uint32_t, uint32_t); + void render_group_pair (cairo_t *, std::shared_ptr, std::shared_ptr, uint32_t, uint32_t); PortMatrixNode position_to_node (double, double) const; void queue_draw_for (std::list const &); diff --git a/gtk2_ardour/port_matrix_labels.h b/gtk2_ardour/port_matrix_labels.h index 5055c70e05..abee76737d 100644 --- a/gtk2_ardour/port_matrix_labels.h +++ b/gtk2_ardour/port_matrix_labels.h @@ -38,7 +38,7 @@ public: private: virtual void render_channel_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, ARDOUR::BundleChannel const &) = 0; - virtual void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, boost::shared_ptr) = 0; + virtual void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, std::shared_ptr) = 0; virtual double channel_x (ARDOUR::BundleChannel const &) const = 0; virtual double channel_y (ARDOUR::BundleChannel const &) const = 0; virtual void queue_draw_for (ARDOUR::BundleChannel const &) = 0; diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index a8528886d8..3b6b9f2e79 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -237,7 +237,7 @@ PortMatrixRowLabels::port_name_x () const void PortMatrixRowLabels::render_bundle_name ( - cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, boost::shared_ptr b + cairo_t* cr, Gdk::Color fg_colour, Gdk::Color bg_colour, double xoff, double yoff, std::shared_ptr b ) { double const x = bundle_name_x (); diff --git a/gtk2_ardour/port_matrix_row_labels.h b/gtk2_ardour/port_matrix_row_labels.h index 4cd2876066..c8d204b055 100644 --- a/gtk2_ardour/port_matrix_row_labels.h +++ b/gtk2_ardour/port_matrix_row_labels.h @@ -55,14 +55,14 @@ public: private: void render_channel_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, ARDOUR::BundleChannel const &); - void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, boost::shared_ptr); + void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, std::shared_ptr); double channel_x (ARDOUR::BundleChannel const &) const; double channel_y (ARDOUR::BundleChannel const &) const; void render (cairo_t *); void compute_dimensions (); - void remove_channel_proxy (boost::weak_ptr, uint32_t); - void rename_channel_proxy (boost::weak_ptr, uint32_t); + void remove_channel_proxy (std::weak_ptr, uint32_t); + void rename_channel_proxy (std::weak_ptr, uint32_t); void queue_draw_for (ARDOUR::BundleChannel const &); double port_name_x () const; double bundle_name_x () const; diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index e636f8703c..681c0fe3f3 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -155,7 +155,7 @@ static void set_routing_color (cairo_t* cr, bool midi) } } -ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr p, Width w) +ProcessorEntry::ProcessorEntry (ProcessorBox* parent, std::shared_ptr p, Width w) : _button (ArdourButton::led_default_elements) , _position (PreFader) , _position_num(0) @@ -179,20 +179,20 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr (_processor)) { + if (std::dynamic_pointer_cast (_processor)) { _button.set_elements(ArdourButton::Element(_button.elements() & ~ArdourButton::Indicator)); } - if (boost::dynamic_pointer_cast (_processor) && - boost::dynamic_pointer_cast (_processor)->gain_control()->parameter().type() != GainAutomation) { + if (std::dynamic_pointer_cast (_processor) && + std::dynamic_pointer_cast (_processor)->gain_control()->parameter().type() != GainAutomation) { /* Trim, Volume */ _button.set_elements(ArdourButton::Element(_button.elements() & ~ArdourButton::Indicator)); } - if (boost::dynamic_pointer_cast (_processor)) { + if (std::dynamic_pointer_cast (_processor)) { _button.set_elements(ArdourButton::Element(_button.elements() & ~ArdourButton::Indicator)); _unknown_processor = true; } { - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); if (pi && pi->plugin()) { _plugin_preset_pointer = PluginPresetPtr (new PluginPreset (pi->plugin()->get_info())); } @@ -203,14 +203,14 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); if (pi && pi->plugin() && pi->plugin()->has_inline_display()) { if (pi->plugin()->get_info()->type != ARDOUR::Lua) { _plugin_display = new PluginInlineDisplay (*this, pi->plugin(), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } else { - assert (boost::dynamic_pointer_cast(pi->plugin())); - _plugin_display = new LuaPluginDisplay (*this, boost::dynamic_pointer_cast(pi->plugin()), + assert (std::dynamic_pointer_cast(pi->plugin())); + _plugin_display = new LuaPluginDisplay (*this, std::dynamic_pointer_cast(pi->plugin()), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } _vbox.pack_start (*_plugin_display); @@ -250,7 +250,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr (_processor)) { + if (std::dynamic_pointer_cast (_processor)) { label = _("Return"); } @@ -258,7 +258,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr (_processor) == 0) { + if (std::dynamic_pointer_cast (_processor) == 0) { /* Add non-Amp (Fader & Trim) controls to the processor box */ _vbox.pack_start (c->box); } @@ -308,13 +308,13 @@ ProcessorEntry::can_copy_state (Gtkmm2ext::DnDVBoxChild* o) const if (!other) { return false; } - boost::shared_ptr otherproc = other->processor(); - boost::shared_ptr my_pi = boost::dynamic_pointer_cast (_processor); - boost::shared_ptr ot_pi = boost::dynamic_pointer_cast (otherproc); - if (boost::dynamic_pointer_cast (_processor)) { + std::shared_ptr otherproc = other->processor(); + std::shared_ptr my_pi = std::dynamic_pointer_cast (_processor); + std::shared_ptr ot_pi = std::dynamic_pointer_cast (otherproc); + if (std::dynamic_pointer_cast (_processor)) { return false; } - if (boost::dynamic_pointer_cast (otherproc)) { + if (std::dynamic_pointer_cast (otherproc)) { return false; } if (!my_pi || !ot_pi) { @@ -323,8 +323,8 @@ ProcessorEntry::can_copy_state (Gtkmm2ext::DnDVBoxChild* o) const if (my_pi->type() != ot_pi->type()) { return false; } - boost::shared_ptr my_p = my_pi->plugin(); - boost::shared_ptr ot_p = ot_pi->plugin(); + std::shared_ptr my_p = my_pi->plugin(); + std::shared_ptr ot_p = ot_pi->plugin(); if (!my_p || !ot_p) { return false; } @@ -338,14 +338,14 @@ bool ProcessorEntry::drag_data_get (Glib::RefPtr const, Gtk::SelectionData &data) { if (data.get_target() == "x-ardour/plugin.preset") { - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); if (!_plugin_preset_pointer || !pi) { data.set (data.get_target(), 8, NULL, 0); return true; } - boost::shared_ptr plugin = pi->plugin(); + std::shared_ptr plugin = pi->plugin(); assert (plugin); PluginManager& manager (PluginManager::instance()); @@ -415,15 +415,15 @@ ProcessorEntry::setup_visuals () _button.set_name ("processor stub"); return; } - boost::shared_ptr send; - if ((send = boost::dynamic_pointer_cast (_processor))) { + std::shared_ptr send; + if ((send = std::dynamic_pointer_cast (_processor))) { if (send->remove_on_disconnect ()) { _button.set_name ("processor sidechain"); return; } - boost::shared_ptr aux; - if ((aux = boost::dynamic_pointer_cast (_processor))) { + std::shared_ptr aux; + if ((aux = std::dynamic_pointer_cast (_processor))) { if (aux->allow_feedback ()) { _button.set_name ("processor auxfeedback"); return; @@ -448,11 +448,11 @@ ProcessorEntry::setup_visuals () } } -boost::shared_ptr +std::shared_ptr ProcessorEntry::processor () const { if (!_processor) { - return boost::shared_ptr(); + return std::shared_ptr(); } return _processor; } @@ -516,7 +516,7 @@ ProcessorEntry::processor_property_changed (const PropertyChange& what_changed) if (what_changed.contains (ARDOUR::Properties::name)) { _button.set_text (name (_width)); setup_tooltip (); - } else if (boost::dynamic_pointer_cast (_processor) != 0) { + } else if (std::dynamic_pointer_cast (_processor) != 0) { /* Any property change for a send needs to trigger an update. * e.g. target-bus is updated, panner-link changes, etc */ _button.set_text (name (_width)); @@ -538,7 +538,7 @@ void ProcessorEntry::setup_tooltip () { if (_processor) { - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); if (pi) { std::string postfix = ""; uint32_t replicated; @@ -560,21 +560,21 @@ ProcessorEntry::setup_tooltip () } return; } - if(boost::dynamic_pointer_cast (_processor)) { + if(std::dynamic_pointer_cast (_processor)) { ARDOUR_UI::instance()->set_tip (_button, string_compose (_("%1\nThe Plugin is not available on this system\nand has been replaced by a stub."), name (Wide))); return; } - boost::shared_ptr send; - if ((send = boost::dynamic_pointer_cast (_processor)) != 0) { + std::shared_ptr send; + if ((send = std::dynamic_pointer_cast (_processor)) != 0) { std::string pan_suffix; if (send->has_panner ()) { bool panlinked = send->panner_linked_to_route(); pan_suffix = panlinked ? "\n(Send panner is linked)" : "\n(Send has independent panner)"; } - boost::shared_ptr aux; - if ((aux = boost::dynamic_pointer_cast (_processor)) != 0) { + std::shared_ptr aux; + if ((aux = std::dynamic_pointer_cast (_processor)) != 0) { if (aux->target_route() && aux->target_route()->name() != aux->display_name()) { set_tooltip (_button, string_compose ("Aux: %1\nsend to '%2'%3", aux->display_name(), aux->target_route()->name(), pan_suffix)); } else { @@ -602,10 +602,10 @@ ProcessorEntry::name (Width w) const string name_display; - boost::shared_ptr send; - boost::shared_ptr aux; + std::shared_ptr send; + std::shared_ptr aux; - if ((aux = boost::dynamic_pointer_cast (_processor)) != 0) { + if ((aux = std::dynamic_pointer_cast (_processor)) != 0) { if (aux->has_panner () && !aux->panner_linked_to_route()) { switch (w) { @@ -626,7 +626,7 @@ ProcessorEntry::name (Width w) const break; } - } else if ((send = boost::dynamic_pointer_cast (_processor)) != 0) { + } else if ((send = std::dynamic_pointer_cast (_processor)) != 0) { name_display += '>'; std::string send_name; bool pretty_ok = true; @@ -680,8 +680,8 @@ ProcessorEntry::name (Width w) const } } else { - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast (_processor)) != 0 && pi->get_count() > 1) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast (_processor)) != 0 && pi->get_count() > 1) { switch (w) { case Wide: name_display += "* "; @@ -828,7 +828,7 @@ ProcessorEntry::plugin_preset_selected (ARDOUR::Plugin::PresetRecord preset) if (_ignore_preset_select) { return; } - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); assert (pi); if (!preset.label.empty()) { pi->load_preset (preset); @@ -841,7 +841,7 @@ void ProcessorEntry::reset_plugin () { /* compare to PlugUIBase::add_plugin_setting */ - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); pi->reset_parameters_to_default(); } @@ -850,8 +850,8 @@ void ProcessorEntry::plugin_preset_add () { /* compare to PlugUIBase::add_plugin_setting */ - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); + std::shared_ptr plugin = pi->plugin (); NewPluginPresetDialog d (plugin, _("New Preset")); @@ -878,8 +878,8 @@ ProcessorEntry::plugin_preset_add () void ProcessorEntry::plugin_preset_delete () { - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); + std::shared_ptr plugin = pi->plugin (); Plugin::PresetRecord pset = plugin->last_preset(); if (!pset.uri.empty ()) { plugin->remove_preset (pset.label); @@ -891,11 +891,11 @@ ProcessorEntry::build_presets_menu () { using namespace Menu_Helpers; - boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + std::shared_ptr pi = std::dynamic_pointer_cast (_processor); if (!pi) { return NULL; } - boost::shared_ptr plugin = pi->plugin(); + std::shared_ptr plugin = pi->plugin(); vector presets = plugin->get_presets(); Plugin::PresetRecord pset = plugin->last_preset(); @@ -956,7 +956,7 @@ ProcessorEntry::build_send_options_menu () Menu* menu = manage (new Menu); MenuList& items = menu->items (); - boost::shared_ptr send = boost::dynamic_pointer_cast (_processor); + std::shared_ptr send = std::dynamic_pointer_cast (_processor); if (send) { items.push_back (CheckMenuElem (_("Link panner controls"))); Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); @@ -964,7 +964,7 @@ ProcessorEntry::build_send_options_menu () c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link)); } - boost::shared_ptr aux = boost::dynamic_pointer_cast (_processor); + std::shared_ptr aux = std::dynamic_pointer_cast (_processor); if (aux) { items.push_back (CheckMenuElem (_("Allow Feedback Loop"))); Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); @@ -977,7 +977,7 @@ ProcessorEntry::build_send_options_menu () void ProcessorEntry::toggle_panner_link () { - boost::shared_ptr send = boost::dynamic_pointer_cast (_processor); + std::shared_ptr send = std::dynamic_pointer_cast (_processor); if (send) { send->set_panner_linked_to_route (!send->panner_linked_to_route ()); } @@ -986,17 +986,17 @@ ProcessorEntry::toggle_panner_link () void ProcessorEntry::toggle_allow_feedback () { - boost::shared_ptr aux = boost::dynamic_pointer_cast (_processor); + std::shared_ptr aux = std::dynamic_pointer_cast (_processor); if (aux) { aux->set_allow_feedback (!aux->allow_feedback ()); } } -ProcessorEntry::Control::Control (ProcessorEntry& e,boost::shared_ptr c, string const & n) +ProcessorEntry::Control::Control (ProcessorEntry& e,std::shared_ptr c, string const & n) : _entry (e) , _control (c) , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) - , _slider (&_adjustment, boost::shared_ptr(), 0, max(13.f, rintf(13.f * UIConfiguration::instance().get_ui_scale()))) + , _slider (&_adjustment, std::shared_ptr(), 0, max(13.f, rintf(13.f * UIConfiguration::instance().get_ui_scale()))) , _slider_persistant_tooltip (&_slider) , _button (ArdourButton::led_default_elements) , _ignore_ui_adjustment (false) @@ -1074,7 +1074,7 @@ ProcessorEntry::Control::~Control () void ProcessorEntry::Control::set_tooltip () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; @@ -1092,7 +1092,7 @@ ProcessorEntry::Control::slider_adjusted () return; } - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; @@ -1105,7 +1105,7 @@ ProcessorEntry::Control::slider_adjusted () void ProcessorEntry::Control::start_touch () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -1115,7 +1115,7 @@ ProcessorEntry::Control::start_touch () void ProcessorEntry::Control::end_touch () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -1135,7 +1135,7 @@ ProcessorEntry::Control::button_released (GdkEventButton* ev) void ProcessorEntry::Control::button_clicked () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; @@ -1159,7 +1159,7 @@ ProcessorEntry::Control::button_clicked_event (GdkEventButton *ev) void ProcessorEntry::Control::control_automation_state_changed () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -1174,7 +1174,7 @@ ProcessorEntry::Control::control_automation_state_changed () void ProcessorEntry::Control::control_changed () { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); if (!c) { return; } @@ -1214,7 +1214,7 @@ ProcessorEntry::Control::set_state (XMLNode const * node) set_visible (visible); } } else { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); set_visible (c && (c->flags () & Controllable::InlineControl)); } } @@ -1245,13 +1245,13 @@ ProcessorEntry::Control::hide_things () string ProcessorEntry::Control::state_id () const { - boost::shared_ptr c = _control.lock (); + std::shared_ptr c = _control.lock (); assert (c); return string_compose (X_("control %1"), c->id().to_s ()); } -PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr p, Width w) +PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, std::shared_ptr p, Width w) : ProcessorEntry (b, p, w) , _plugin_insert (p) { @@ -1772,7 +1772,7 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, } } -ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) +ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, std::shared_ptr p, uint32_t max_height) : PluginDisplay (p, max_height) , _entry (e) , _scroll (false) @@ -1795,7 +1795,7 @@ ProcessorEntry::PluginInlineDisplay::on_button_press_event (GdkEventButton *ev) { assert (_entry.processor ()); - boost::shared_ptr pi = boost::dynamic_pointer_cast (_entry.processor()); + std::shared_ptr pi = std::dynamic_pointer_cast (_entry.processor()); // duplicated code :( // consider some tweaks to pass this up to the DnDVBox somehow: // select processor, then call (private) @@ -1866,7 +1866,7 @@ ProcessorEntry::PluginInlineDisplay::display_frame (cairo_t* cr, double w, doubl Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, w - 1, h + 1, 7); } -ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) +ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, std::shared_ptr p, uint32_t max_height) : PluginInlineDisplay (e, p, max_height) , _luaproc (p) , _lua_render_inline (0) @@ -2000,7 +2000,7 @@ ProcessorBox::~ProcessorBox () } void -ProcessorBox::set_route (boost::shared_ptr r) +ProcessorBox::set_route (std::shared_ptr r) { if (_route == r) { return; @@ -2035,10 +2035,10 @@ ProcessorBox::route_going_away () _route.reset (); } -boost::shared_ptr +std::shared_ptr ProcessorBox::find_drop_position (ProcessorEntry* position) { - boost::shared_ptr p; + std::shared_ptr p; if (position) { p = position->processor (); if (!p) { @@ -2078,7 +2078,7 @@ ProcessorBox::_drop_plugin_preset (Gtk::SelectionData const &data, Route::Proces p->load_preset (ppp->_preset); } - boost::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), p)); + std::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), p)); if (Config->get_new_plugins_active ()) { processor->enable (true); } @@ -2101,7 +2101,7 @@ ProcessorBox::_drop_plugin (Gtk::SelectionData const &data, Route::ProcessorList if (!p) { continue; } - boost::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), p)); + std::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), p)); if (Config->get_new_plugins_active ()) { processor->enable (true); } @@ -2116,7 +2116,7 @@ ProcessorBox::plugin_drop (Gtk::SelectionData const &data, ProcessorEntry* posit return; } - boost::shared_ptr p = find_drop_position (position); + std::shared_ptr p = find_drop_position (position); Route::ProcessorList pl; if (data.get_target() == "x-ardour/plugin.info") { @@ -2148,10 +2148,10 @@ ProcessorBox::object_drop (DnDVBox* source, ProcessorEntry* posi assert (children.size() == 1); ProcessorEntry* other = *children.begin(); assert (other->can_copy_state (position)); - boost::shared_ptr otherproc = other->processor(); - boost::shared_ptr proc = position->processor(); - boost::shared_ptr opi = boost::dynamic_pointer_cast (otherproc); - boost::shared_ptr pi = boost::dynamic_pointer_cast (proc); + std::shared_ptr otherproc = other->processor(); + std::shared_ptr proc = position->processor(); + std::shared_ptr opi = std::dynamic_pointer_cast (otherproc); + std::shared_ptr pi = std::dynamic_pointer_cast (proc); assert (otherproc && proc && pi && opi); PBD::ID id = pi->id(); @@ -2182,27 +2182,27 @@ ProcessorBox::object_drop (DnDVBox* source, ProcessorEntry* posi PBD::Stateful::ForceIDRegeneration force_ids; proc->set_state (state, Stateful::current_state_version); /* but retain the processor's ID (LV2 state save) */ - boost::dynamic_pointer_cast(proc)->update_id (id); + std::dynamic_pointer_cast(proc)->update_id (id); return; } - boost::shared_ptr p = find_drop_position (position); + std::shared_ptr p = find_drop_position (position); list children = source->selection (true); - list > procs; + list > procs; for (list::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->processor ()) { - if (boost::dynamic_pointer_cast ((*i)->processor())) { + if (std::dynamic_pointer_cast ((*i)->processor())) { continue; } - if (boost::dynamic_pointer_cast ((*i)->processor())) { + if (std::dynamic_pointer_cast ((*i)->processor())) { continue; } procs.push_back ((*i)->processor ()); } } - for (list >::const_iterator i = procs.begin(); i != procs.end(); ++i) { + for (list >::const_iterator i = procs.begin(); i != procs.end(); ++i) { XMLNode& state = (*i)->get_state (); XMLNodeList nlist; nlist.push_back (&state); @@ -2242,7 +2242,7 @@ ProcessorBox::set_width (Width w) Gtk::Menu* ProcessorBox::build_possible_aux_menu () { - boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + std::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { /* No aux sends if there are no busses */ @@ -2269,7 +2269,7 @@ ProcessorBox::build_possible_aux_menu () /* aux-send to target already exists */ continue; } - items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), std::weak_ptr(*r)))); } return menu; @@ -2278,7 +2278,7 @@ ProcessorBox::build_possible_aux_menu () Gtk::Menu* ProcessorBox::build_possible_listener_menu () { - boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + std::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { /* No aux sends if there are no busses */ @@ -2305,7 +2305,7 @@ ProcessorBox::build_possible_listener_menu () /* aux-send to target already exists */ continue; } - items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), std::weak_ptr(*r)))); } return menu; @@ -2314,7 +2314,7 @@ ProcessorBox::build_possible_listener_menu () Gtk::Menu* ProcessorBox::build_possible_remove_listener_menu () { - boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + std::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { /* No aux sends if there are no busses */ @@ -2341,7 +2341,7 @@ ProcessorBox::build_possible_remove_listener_menu () /* aux-send to target already exists */ continue; } - items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_remove_aux), boost::weak_ptr(*r)))); + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_remove_aux), std::weak_ptr(*r)))); } return menu; @@ -2482,14 +2482,14 @@ ProcessorBox::show_processor_menu (int arg) delete_action->set_sensitive (sensitive || stub_processor_selected ()); backspace_action->set_sensitive (sensitive || stub_processor_selected ()); - boost::shared_ptr pi; + std::shared_ptr pi; if (single_selection) { - pi = boost::dynamic_pointer_cast (single_selection->processor ()); + pi = std::dynamic_pointer_cast (single_selection->processor ()); } manage_pins_action->set_sensitive (pi != 0 && !channelstrip_selected ()); - if (boost::dynamic_pointer_cast(_route)) { + if (std::dynamic_pointer_cast(_route)) { disk_io_action->set_sensitive (true); PBD::Unwinder uw (_ignore_rb_change, true); ActionManager::get_toggle_action (X_("ProcessorMenu"), "disk-io-prefader")->set_active (_route->disk_io_point () == DiskIOPreFader); @@ -2515,8 +2515,8 @@ ProcessorBox::show_processor_menu (int arg) /* disallow rename for multiple selections, for plugin inserts and for the fader */ rename_action->set_sensitive (single_selection && !pi - && !boost::dynamic_pointer_cast (single_selection->processor ()) - && !boost::dynamic_pointer_cast (single_selection->processor ())); + && !std::dynamic_pointer_cast (single_selection->processor ()) + && !std::dynamic_pointer_cast (single_selection->processor ())); processor_menu->popup (1, arg); @@ -2598,7 +2598,7 @@ ProcessorBox::processor_operation (ProcessorOperation op) // some processors are not selectable (e.g fader, meter), target is empty. if (targets.empty() && _placement >= 0) { assert (_route); - boost::shared_ptr proc = _route->before_processor_for_index (_placement); + std::shared_ptr proc = _route->before_processor_for_index (_placement); if (proc) { targets.push_back (proc); } @@ -2620,16 +2620,16 @@ ProcessorBox::processor_operation (ProcessorOperation op) assert (0); // these should not be selectable to begin with. continue; } - if (!boost::dynamic_pointer_cast (*i)) { + if (!std::dynamic_pointer_cast (*i)) { continue; } - if (boost::dynamic_pointer_cast (*i) && boost::dynamic_pointer_cast (*i)->gain_control()->parameter().type() != GainAutomation) { + if (std::dynamic_pointer_cast (*i) && std::dynamic_pointer_cast (*i)->gain_control()->parameter().type() != GainAutomation) { /* Trim, Volume */ continue; } #ifdef MIXBUS - if (boost::dynamic_pointer_cast (*i)->is_channelstrip()) { + if (std::dynamic_pointer_cast (*i)->is_channelstrip()) { continue; } #endif @@ -2649,7 +2649,7 @@ ProcessorBox::processor_operation (ProcessorOperation op) } ProcessorWindowProxy* -ProcessorBox::find_window_proxy (boost::shared_ptr processor) const +ProcessorBox::find_window_proxy (std::shared_ptr processor) const { return processor->window_proxy(); } @@ -2658,7 +2658,7 @@ ProcessorBox::find_window_proxy (boost::shared_ptr processor) const bool ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child) { - boost::shared_ptr processor; + std::shared_ptr processor; if (child) { processor = child->processor (); } @@ -2666,7 +2666,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* int ret = false; bool selected = processor_display.selected (child); - boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); + std::shared_ptr pi = std::dynamic_pointer_cast (processor); if (pi && pi->plugin() && pi->plugin()->has_inline_display() && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) && ev->button == 1 @@ -2715,12 +2715,12 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* bool ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry* child) { - boost::shared_ptr processor; + std::shared_ptr processor; if (child) { processor = child->processor (); } - if (boost::dynamic_pointer_cast (processor) && boost::dynamic_pointer_cast (processor)->gain_control()->parameter().type() != GainAutomation) { + if (std::dynamic_pointer_cast (processor) && std::dynamic_pointer_cast (processor)->gain_control()->parameter().type() != GainAutomation) { /* Volume */ return false; } @@ -2729,7 +2729,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry Glib::signal_idle().connect (sigc::bind ( sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor), - boost::weak_ptr(processor))); + std::weak_ptr(processor))); } else if (processor && Keyboard::is_button2_event (ev) #ifndef __APPLE__ @@ -2776,7 +2776,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) { for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) { - boost::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), *p)); + std::shared_ptr processor (new PluginInsert (*_session, _route->time_domain(), *p)); Route::ProcessorStreams err_streams; @@ -2788,7 +2788,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) if (processor->what_can_be_automated ().size () == 0) { ; /* plugin without controls, don't show ui */ } - else if (boost::dynamic_pointer_cast(processor)->plugin()->has_inline_display() && UIConfiguration::instance().get_prefer_inline_over_gui()) { + else if (std::dynamic_pointer_cast(processor)->plugin()->has_inline_display() && UIConfiguration::instance().get_prefer_inline_over_gui()) { ; /* only show inline display */ } else if (processor_can_be_edited (processor)) { @@ -2796,7 +2796,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) return true; } else if ((*p)->has_editor ()) { edit_processor (processor); - } else if (boost::dynamic_pointer_cast(processor)->plugin()->parameter_count() > 0) { + } else if (std::dynamic_pointer_cast(processor)->plugin()->parameter_count() > 0) { generic_edit_processor (processor); } } @@ -2869,7 +2869,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) void ProcessorBox::choose_insert () { - boost::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); + std::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); _route->add_processor_by_index (processor, _placement); } @@ -2877,7 +2877,7 @@ ProcessorBox::choose_insert () void ProcessorBox::choose_send () { - boost::shared_ptr send (new Send (*_session, _route->pannable (), _route->mute_master())); + std::shared_ptr send (new Send (*_session, _route->pannable (), _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ ChanCount outs = (_route->n_outputs().n_audio() && _session->master_out()) @@ -2910,14 +2910,14 @@ ProcessorBox::choose_send () ios->selector().Finished.connect (sigc::bind ( sigc::mem_fun(*this, &ProcessorBox::send_io_finished), - boost::weak_ptr(send), ios)); + std::weak_ptr(send), ios)); } void -ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr weak_processor, IOSelectorWindow* ios) +ProcessorBox::send_io_finished (IOSelector::Result r, std::weak_ptr weak_processor, IOSelectorWindow* ios) { - boost::shared_ptr processor (weak_processor.lock()); + std::shared_ptr processor (weak_processor.lock()); /* drop our temporary reference to the new send */ _processor_being_created.reset (); @@ -2940,9 +2940,9 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr } void -ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr weak_processor, IOSelectorWindow* ios) +ProcessorBox::return_io_finished (IOSelector::Result r, std::weak_ptr weak_processor, IOSelectorWindow* ios) { - boost::shared_ptr processor (weak_processor.lock()); + std::shared_ptr processor (weak_processor.lock()); /* drop our temporary reference to the new return */ _processor_being_created.reset (); @@ -2965,13 +2965,13 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr wr) +ProcessorBox::choose_aux (std::weak_ptr wr) { if (!_route) { return; } - boost::shared_ptr target = wr.lock(); + std::shared_ptr target = wr.lock(); if (!target) { return; @@ -2985,19 +2985,19 @@ ProcessorBox::choose_aux (boost::weak_ptr wr) } void -ProcessorBox::remove_aux (boost::weak_ptr wr) +ProcessorBox::remove_aux (std::weak_ptr wr) { if (!_route) { return; } - boost::shared_ptr target = wr.lock(); + std::shared_ptr target = wr.lock(); if (!target) { return; } - boost::shared_ptr send = _route->internal_send_for (target); - boost::shared_ptr proc = boost::dynamic_pointer_cast (send); + std::shared_ptr send = _route->internal_send_for (target); + std::shared_ptr proc = std::dynamic_pointer_cast (send); _route->remove_processor (proc); } @@ -3035,9 +3035,9 @@ ProcessorBox::redisplay_processors () * not already have one. */ void -ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) +ProcessorBox::maybe_add_processor_to_ui_list (std::weak_ptr w) { - boost::shared_ptr p = w.lock (); + std::shared_ptr p = w.lock (); if (!p) { return; } @@ -3048,23 +3048,23 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) /* see also ProcessorBox::get_editor_window */ bool have_ui = false; - if (boost::dynamic_pointer_cast (p)) { + if (std::dynamic_pointer_cast (p)) { have_ui = true; - } else if (boost::dynamic_pointer_cast (p)) { + } else if (std::dynamic_pointer_cast (p)) { have_ui = true; - } else if (boost::dynamic_pointer_cast (p)) { - if (!boost::dynamic_pointer_cast (p)) { + } else if (std::dynamic_pointer_cast (p)) { + if (!std::dynamic_pointer_cast (p)) { have_ui = true; } - } else if (boost::dynamic_pointer_cast (p)) { - if (!boost::dynamic_pointer_cast (p)) { + } else if (std::dynamic_pointer_cast (p)) { + if (!std::dynamic_pointer_cast (p)) { have_ui = true; } - } else if (boost::dynamic_pointer_cast (p)) { + } else if (std::dynamic_pointer_cast (p)) { have_ui = true; } #ifdef HAVE_BEATBOX - else if (boost::dynamic_pointer_cast (p)) { + else if (std::dynamic_pointer_cast (p)) { cerr << "Have UI for beatbox\n"; have_ui = true; } @@ -3089,13 +3089,13 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) } void -ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr w) +ProcessorBox::maybe_add_processor_pin_mgr (std::weak_ptr w) { - boost::shared_ptr p = w.lock (); + std::shared_ptr p = w.lock (); if (!p || p->pinmgr_proxy ()) { return; } - if (!boost::dynamic_pointer_cast (p)) { + if (!std::dynamic_pointer_cast (p)) { return; } @@ -3113,9 +3113,9 @@ ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr w) } void -ProcessorBox::add_processor_to_display (boost::weak_ptr p) +ProcessorBox::add_processor_to_display (std::weak_ptr p) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor || ( !processor->display_to_user() #ifndef NDEBUG @@ -3126,7 +3126,7 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) return; } - boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (processor); + std::shared_ptr plugin_insert = std::dynamic_pointer_cast (processor); ProcessorEntry* e = 0; if (plugin_insert) { @@ -3135,13 +3135,13 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) e = new ProcessorEntry (this, processor, _width); } - boost::shared_ptr send = boost::dynamic_pointer_cast (processor); - boost::shared_ptr ext = boost::dynamic_pointer_cast (processor); - boost::shared_ptr tb = boost::dynamic_pointer_cast (processor); + std::shared_ptr send = std::dynamic_pointer_cast (processor); + std::shared_ptr ext = std::dynamic_pointer_cast (processor); + std::shared_ptr tb = std::dynamic_pointer_cast (processor); #ifdef HAVE_BEATBOX - boost::shared_ptr bb = boost::dynamic_pointer_cast (processor); + std::shared_ptr bb = std::dynamic_pointer_cast (processor); #endif - boost::shared_ptr stub = boost::dynamic_pointer_cast (processor); + std::shared_ptr stub = std::dynamic_pointer_cast (processor); //faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable @@ -3187,8 +3187,8 @@ ProcessorBox::setup_routing_feeds () list::iterator prev = children.begin(); for (list::iterator i = children.begin(); i != children.end(); ++i) { - boost::shared_ptr p = (*i)->processor(); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr p = (*i)->processor(); + std::shared_ptr pi = std::dynamic_pointer_cast (p); list::iterator next = i; next++; @@ -3317,8 +3317,8 @@ ProcessorBox::setup_entry_positions () uint32_t num = 0; for (list::iterator i = children.begin(); i != children.end(); ++i) { - if (boost::dynamic_pointer_cast((*i)->processor()) && - boost::dynamic_pointer_cast((*i)->processor())->gain_control()->parameter().type() == GainAutomation) { + if (std::dynamic_pointer_cast((*i)->processor()) && + std::dynamic_pointer_cast((*i)->processor())->gain_control()->parameter().type() == GainAutomation) { pre_fader = false; (*i)->set_position (ProcessorEntry::Fader, num++); } else { @@ -3401,17 +3401,17 @@ ProcessorBox::rename_processors () bool ProcessorBox::can_cut () const { - vector > sel; + vector > sel; get_selected_processors (sel); /* cut_processors () does not cut inserts */ - for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { + for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { - if (boost::dynamic_pointer_cast((*i)) != 0 || - (boost::dynamic_pointer_cast((*i)) != 0) || - (boost::dynamic_pointer_cast((*i)) != 0)) { + if (std::dynamic_pointer_cast((*i)) != 0 || + (std::dynamic_pointer_cast((*i)) != 0) || + (std::dynamic_pointer_cast((*i)) != 0)) { return true; } } @@ -3422,12 +3422,12 @@ ProcessorBox::can_cut () const bool ProcessorBox::stub_processor_selected () const { - vector > sel; + vector > sel; get_selected_processors (sel); - for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { - if (boost::dynamic_pointer_cast((*i)) != 0) { + for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { + if (std::dynamic_pointer_cast((*i)) != 0) { return true; } } @@ -3454,9 +3454,9 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed) no_processor_redisplay = true; for (ProcSelection::const_iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) { // Cut only plugins, sends and returns - if (boost::dynamic_pointer_cast((*i)) != 0 || - (boost::dynamic_pointer_cast((*i)) != 0) || - (boost::dynamic_pointer_cast((*i)) != 0)) { + if (std::dynamic_pointer_cast((*i)) != 0 || + (std::dynamic_pointer_cast((*i)) != 0) || + (std::dynamic_pointer_cast((*i)) != 0)) { Window* w = get_processor_ui (*i); @@ -3493,9 +3493,9 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) for (ProcSelection::const_iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) { // Copy only plugins, sends, returns - if (boost::dynamic_pointer_cast((*i)) != 0 || - (boost::dynamic_pointer_cast((*i)) != 0) || - (boost::dynamic_pointer_cast((*i)) != 0)) { + if (std::dynamic_pointer_cast((*i)) != 0 || + (std::dynamic_pointer_cast((*i)) != 0) || + (std::dynamic_pointer_cast((*i)) != 0)) { node->add_child_nocopy ((*i)->get_state()); } } @@ -3528,9 +3528,9 @@ ProcessorBox::delete_processors (const ProcSelection& targets) } void -ProcessorBox::delete_dragged_processors (const list >& procs) +ProcessorBox::delete_dragged_processors (const list >& procs) { - list >::const_iterator x; + list >::const_iterator x; no_processor_redisplay = true; for (x = procs.begin(); x != procs.end(); ++x) { @@ -3549,9 +3549,9 @@ ProcessorBox::delete_dragged_processors (const list } gint -ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) +ProcessorBox::idle_delete_processor (std::weak_ptr weak_processor) { - boost::shared_ptr processor (weak_processor.lock()); + std::shared_ptr processor (weak_processor.lock()); if (!processor) { return false; @@ -3568,7 +3568,7 @@ ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) } void -ProcessorBox::rename_processor (boost::shared_ptr processor) +ProcessorBox::rename_processor (std::shared_ptr processor) { Prompter name_prompter (true); string result; @@ -3619,11 +3619,11 @@ ProcessorBox::paste_processors () return; } - paste_processor_state (_p_selection.processors.get_node().children(), boost::shared_ptr()); + paste_processor_state (_p_selection.processors.get_node().children(), std::shared_ptr()); } void -ProcessorBox::paste_processors (boost::shared_ptr before) +ProcessorBox::paste_processors (std::shared_ptr before) { if (_p_selection.processors.empty()) { @@ -3634,10 +3634,10 @@ ProcessorBox::paste_processors (boost::shared_ptr before) } void -ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p) +ProcessorBox::paste_processor_state (const XMLNodeList& nlist, std::shared_ptr p) { XMLNodeConstIterator niter; - list > copies; + list > copies; if (nlist.empty()) { return; @@ -3649,7 +3649,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr XMLProperty const * role = (*niter)->property ("role"); assert (type); - boost::shared_ptr p; + std::shared_ptr p; try { if (type->value() == "meter" || type->value() == "main-outs" || @@ -3677,7 +3677,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr XMLNode n (**niter); InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(), - _route, boost::shared_ptr(), Delivery::Aux); + _route, std::shared_ptr(), Delivery::Aux); PBD::Stateful::ForceIDRegeneration force_ids; if (s->set_state (n, Stateful::current_state_version)) { @@ -3685,7 +3685,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr return; } - boost::shared_ptr target = s->target_route(); + std::shared_ptr target = s->target_route(); if (_route->internal_send_for (target) || target == _route) { /* aux-send to target already exists */ @@ -3778,7 +3778,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr PBD::Stateful::ForceIDRegeneration force_ids; p->set_state (state, Stateful::current_state_version); /* but retain the processor's ID (LV2 state save) */ - boost::dynamic_pointer_cast(p)->update_id (id); + std::dynamic_pointer_cast(p)->update_id (id); } copies.push_back (p); @@ -3814,7 +3814,7 @@ ProcessorBox::get_selected_processors (ProcSelection& processors) const } void -ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::shared_ptr)) +ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(std::shared_ptr)) { list selection = processor_display.selection (); for (list::iterator i = selection.begin(); i != selection.end(); ++i) { @@ -3838,7 +3838,7 @@ ProcessorBox::ab_plugins () void ProcessorBox::set_disk_io_position (DiskIOPoint diop) { - boost::shared_ptr t = boost::dynamic_pointer_cast (_route); + std::shared_ptr t = std::dynamic_pointer_cast (_route); if (t) { t->set_disk_io_point (diop); } @@ -3895,20 +3895,20 @@ ProcessorBox::clear_processors (Placement p) } bool -ProcessorBox::processor_can_be_edited (boost::shared_ptr processor) +ProcessorBox::processor_can_be_edited (std::shared_ptr processor) { - boost::shared_ptr at = boost::dynamic_pointer_cast (_route); + std::shared_ptr at = std::dynamic_pointer_cast (_route); if (at && at->freeze_state() == AudioTrack::Frozen) { return false; } - if (boost::dynamic_pointer_cast (processor) || - boost::dynamic_pointer_cast (processor) || - boost::dynamic_pointer_cast (processor) || - boost::dynamic_pointer_cast (processor) || - boost::dynamic_pointer_cast (processor) + if (std::dynamic_pointer_cast (processor) || + std::dynamic_pointer_cast (processor) || + std::dynamic_pointer_cast (processor) || + std::dynamic_pointer_cast (processor) || + std::dynamic_pointer_cast (processor) #ifdef HAVE_BEATBOX - || boost::dynamic_pointer_cast (processor) + || std::dynamic_pointer_cast (processor) #endif ) { return true; @@ -3930,16 +3930,16 @@ ProcessorBox::one_processor_can_be_edited () } Gtk::Window* -ProcessorBox::get_editor_window (boost::shared_ptr processor, bool use_custom) +ProcessorBox::get_editor_window (std::shared_ptr processor, bool use_custom) { - boost::shared_ptr send; - boost::shared_ptr internal_send; - boost::shared_ptr retrn; - boost::shared_ptr plugin_insert; - boost::shared_ptr port_insert; + std::shared_ptr send; + std::shared_ptr internal_send; + std::shared_ptr retrn; + std::shared_ptr plugin_insert; + std::shared_ptr port_insert; #ifdef HAVE_BEATBOX - boost::shared_ptr beatbox; + std::shared_ptr beatbox; #endif Window* gidget = 0; @@ -3955,34 +3955,34 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us * Plugins and others will return a window for control. */ - if (boost::dynamic_pointer_cast(_route) != 0) { + if (std::dynamic_pointer_cast(_route) != 0) { - if (boost::dynamic_pointer_cast (_route)->freeze_state() == AudioTrack::Frozen) { + if (std::dynamic_pointer_cast (_route)->freeze_state() == AudioTrack::Frozen) { return 0; } } - if (boost::dynamic_pointer_cast (processor) && boost::dynamic_pointer_cast (processor)->gain_control()->parameter().type() == GainAutomation) { + if (std::dynamic_pointer_cast (processor) && std::dynamic_pointer_cast (processor)->gain_control()->parameter().type() == GainAutomation) { if (_parent_strip) { _parent_strip->revert_to_default_display (); } - } else if ((send = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((send = std::dynamic_pointer_cast (processor)) != 0) { if (!ARDOUR_UI_UTILS::engine_is_running ()) { return 0; } - if (boost::dynamic_pointer_cast (processor) == 0) { + if (std::dynamic_pointer_cast (processor) == 0) { Gtk::Window* tlw = dynamic_cast (get_toplevel ()); assert (tlw); gidget = new SendUIWindow (*tlw, _session, send); } - } else if ((retrn = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((retrn = std::dynamic_pointer_cast (processor)) != 0) { - if (boost::dynamic_pointer_cast (retrn)) { + if (std::dynamic_pointer_cast (retrn)) { /* no GUI for these */ return 0; } @@ -3991,7 +3991,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us return 0; } - boost::shared_ptr retrn = boost::dynamic_pointer_cast (processor); + std::shared_ptr retrn = std::dynamic_pointer_cast (processor); ReturnUIWindow *return_ui; Window* w = get_processor_ui (retrn); @@ -4008,7 +4008,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us gidget = return_ui; - } else if ((plugin_insert = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((plugin_insert = std::dynamic_pointer_cast (processor)) != 0) { PluginUIWindow *plugin_ui; @@ -4027,7 +4027,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us gidget = plugin_ui; - } else if ((port_insert = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((port_insert = std::dynamic_pointer_cast (processor)) != 0) { if (!ARDOUR_UI_UTILS::engine_is_running ()) { return 0; @@ -4050,7 +4050,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us gidget = io_selector; #ifdef HAVE_BEATBOX - } else if ((beatbox = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((beatbox = std::dynamic_pointer_cast (processor)) != 0) { Window* w = get_processor_ui (beatbox); BBGUI* bbg = 0; @@ -4070,10 +4070,10 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us } Gtk::Window* -ProcessorBox::get_generic_editor_window (boost::shared_ptr processor) +ProcessorBox::get_generic_editor_window (std::shared_ptr processor) { - boost::shared_ptr plugin_insert - = boost::dynamic_pointer_cast(processor); + std::shared_ptr plugin_insert + = std::dynamic_pointer_cast(processor); if (!plugin_insert) { return 0; @@ -4258,7 +4258,7 @@ ProcessorBox::rb_choose_send () } void -ProcessorBox::rb_choose_aux (boost::weak_ptr wr) +ProcessorBox::rb_choose_aux (std::weak_ptr wr) { if (_current_processor_box == 0) { return; @@ -4268,7 +4268,7 @@ ProcessorBox::rb_choose_aux (boost::weak_ptr wr) } void -ProcessorBox::rb_remove_aux (boost::weak_ptr wr) +ProcessorBox::rb_remove_aux (std::weak_ptr wr) { if (_current_processor_box == 0) { return; @@ -4407,14 +4407,14 @@ ProcessorBox::rb_edit () } bool -ProcessorBox::edit_aux_send (boost::shared_ptr processor) +ProcessorBox::edit_aux_send (std::shared_ptr processor) { - if (boost::dynamic_pointer_cast (processor) == 0) { + if (std::dynamic_pointer_cast (processor) == 0) { return false; } if (_parent_strip) { - boost::shared_ptr send = boost::dynamic_pointer_cast (processor); + std::shared_ptr send = std::dynamic_pointer_cast (processor); if (_parent_strip->current_delivery() == send) { _parent_strip->revert_to_default_display (); } else { @@ -4425,11 +4425,11 @@ ProcessorBox::edit_aux_send (boost::shared_ptr processor) } bool -ProcessorBox::edit_triggerbox (boost::shared_ptr processor) +ProcessorBox::edit_triggerbox (std::shared_ptr processor) { - boost::shared_ptr tb; + std::shared_ptr tb; - if ((tb = boost::dynamic_pointer_cast (processor)) == 0) { + if ((tb = std::dynamic_pointer_cast (processor)) == 0) { return false; } @@ -4439,7 +4439,7 @@ ProcessorBox::edit_triggerbox (boost::shared_ptr processor) } void -ProcessorBox::edit_processor (boost::shared_ptr processor) +ProcessorBox::edit_processor (std::shared_ptr processor) { if (!processor) { return; @@ -4466,7 +4466,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) } void -ProcessorBox::generic_edit_processor (boost::shared_ptr processor) +ProcessorBox::generic_edit_processor (std::shared_ptr processor) { if (!processor) { return; @@ -4490,7 +4490,7 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr processor) } void -ProcessorBox::manage_pins (boost::shared_ptr processor) +ProcessorBox::manage_pins (std::shared_ptr processor) { if (!processor) { return; @@ -4517,9 +4517,9 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed) ENSURE_GUI_THREAD (*this, &ProcessorBox::route_property_changed, what_changed); - boost::shared_ptr processor; - boost::shared_ptr plugin_insert; - boost::shared_ptr send; + std::shared_ptr processor; + std::shared_ptr plugin_insert; + std::shared_ptr send; list children = processor_display.children(); @@ -4539,16 +4539,16 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed) /* rename editor windows for sends and plugins */ - if ((send = boost::dynamic_pointer_cast (processor)) != 0) { + if ((send = std::dynamic_pointer_cast (processor)) != 0) { w->set_title (send->name ()); - } else if ((plugin_insert = boost::dynamic_pointer_cast (processor)) != 0) { + } else if ((plugin_insert = std::dynamic_pointer_cast (processor)) != 0) { w->set_title (generate_processor_title (plugin_insert)); } } } string -ProcessorBox::generate_processor_title (boost::shared_ptr pi) +ProcessorBox::generate_processor_title (std::shared_ptr pi) { string maker = pi->plugin()->maker() ? pi->plugin()->maker() : ""; string::size_type email_pos; @@ -4576,7 +4576,7 @@ ProcessorBox::generate_processor_title (boost::shared_ptr pi) * @return the UI window for \a p. */ Window * -ProcessorBox::get_processor_ui (boost::shared_ptr p) const +ProcessorBox::get_processor_ui (std::shared_ptr p) const { ProcessorWindowProxy* wp = p->window_proxy(); if (wp) { @@ -4590,16 +4590,16 @@ ProcessorBox::get_processor_ui (boost::shared_ptr p) const * @param w UI window. */ void -ProcessorBox::set_processor_ui (boost::shared_ptr p, Gtk::Window* w) +ProcessorBox::set_processor_ui (std::shared_ptr p, Gtk::Window* w) { assert (p->window_proxy()); p->window_proxy()->use_window (*w); } void -ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr w) +ProcessorBox::mixer_strip_delivery_changed (std::weak_ptr w) { - boost::shared_ptr d = w.lock (); + std::shared_ptr d = w.lock (); if (!d) { return; } @@ -4677,14 +4677,14 @@ idle_drop_window (WM::ProxyBase* s) return false; } -ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr processor) +ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, std::weak_ptr processor) : WM::ProxyBase (name, string()) , _processor_box (box) , _processor (processor) , is_custom (true) , want_custom (true) { - boost::shared_ptr p = _processor.lock (); + std::shared_ptr p = _processor.lock (); if (!p) { return; } @@ -4694,7 +4694,7 @@ ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* b p->ShowUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::show_the_right_window, this, true), gui_context()); p->HideUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::hide, this), gui_context()); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (pi) { _unmap_connection = signal_unmap.connect (sigc::bind ([] (ProxyBase* self, PluginType type) { ProcessorWindowProxy* me = dynamic_cast (self); @@ -4782,7 +4782,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) Gtk::Window* ProcessorWindowProxy::get (bool create) { - boost::shared_ptr p = _processor.lock (); + std::shared_ptr p = _processor.lock (); if (!p) { return 0; @@ -4834,11 +4834,11 @@ ProcessorWindowProxy::show_the_right_window (bool show_not_toggle) } -PluginPinWindowProxy::PluginPinWindowProxy(std::string const &name, boost::weak_ptr processor) +PluginPinWindowProxy::PluginPinWindowProxy(std::string const &name, std::weak_ptr processor) : WM::ProxyBase (name, string()) , _processor (processor) { - boost::shared_ptr p = _processor.lock (); + std::shared_ptr p = _processor.lock (); if (!p) { return; } @@ -4861,8 +4861,8 @@ PluginPinWindowProxy::session_handle () Gtk::Window* PluginPinWindowProxy::get (bool create) { - boost::shared_ptr p = _processor.lock (); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr p = _processor.lock (); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (!p || !pi) { return 0; } diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 2fa21916ce..9d05c3d0d0 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -89,12 +89,12 @@ class ProcessorBox; class ProcessorWindowProxy : public WM::ProxyBase { public: - ProcessorWindowProxy (std::string const &, ProcessorBox *, boost::weak_ptr); + ProcessorWindowProxy (std::string const &, ProcessorBox *, std::weak_ptr); ~ProcessorWindowProxy(); Gtk::Window* get (bool create = false); - boost::weak_ptr processor () const { + std::weak_ptr processor () const { return _processor; } @@ -107,7 +107,7 @@ public: private: ProcessorBox* _processor_box; - boost::weak_ptr _processor; + std::weak_ptr _processor; bool is_custom; bool want_custom; @@ -122,14 +122,14 @@ private: class PluginPinWindowProxy : public WM::ProxyBase { public: - PluginPinWindowProxy (std::string const &, boost::weak_ptr); + PluginPinWindowProxy (std::string const &, std::weak_ptr); ~PluginPinWindowProxy(); Gtk::Window* get (bool create = false); ARDOUR::SessionHandlePtr* session_handle(); private: - boost::weak_ptr _processor; + std::weak_ptr _processor; void processor_going_away (); PBD::ScopedConnection going_away_connection; @@ -140,7 +140,7 @@ class PluginPinWindowProxy : public WM::ProxyBase class ProcessorEntry : public Gtkmm2ext::DnDVBoxChild, public sigc::trackable { public: - ProcessorEntry (ProcessorBox *, boost::shared_ptr, Width); + ProcessorEntry (ProcessorBox *, std::shared_ptr, Width); ~ProcessorEntry (); Gtk::EventBox& action_widget (); @@ -162,7 +162,7 @@ public: void set_position (ProcessorPosition, uint32_t); bool unknown_processor () const { return _unknown_processor; } ; - boost::shared_ptr processor () const; + std::shared_ptr processor () const; void set_enum_width (Width); /** Hide any widgets that should be hidden */ @@ -198,7 +198,7 @@ private: std::string name (Width) const; void setup_tooltip (); - boost::shared_ptr _processor; + std::shared_ptr _processor; Width _width; PBD::ScopedConnection active_connection; PBD::ScopedConnection name_connection; @@ -207,7 +207,7 @@ private: class Control : public sigc::trackable { public: - Control (ProcessorEntry&, boost::shared_ptr, std::string const &); + Control (ProcessorEntry&, std::shared_ptr, std::string const &); ~Control (); void set_visible (bool); @@ -240,7 +240,7 @@ private: bool button_released (GdkEventButton*); ProcessorEntry& _entry; - boost::weak_ptr _control; + std::weak_ptr _control; /* things for a slider */ Gtk::Adjustment _adjustment; ArdourWidgets::HSliderController _slider; @@ -267,7 +267,7 @@ private: class PluginInlineDisplay : public PluginDisplay { public: - PluginInlineDisplay(ProcessorEntry&, boost::shared_ptr, uint32_t max_height = 80); + PluginInlineDisplay(ProcessorEntry&, std::shared_ptr, uint32_t max_height = 80); ~PluginInlineDisplay() {} protected: void on_size_request (Gtk::Requisition* req); @@ -283,12 +283,12 @@ private: class LuaPluginDisplay : public PluginInlineDisplay { public: - LuaPluginDisplay(ProcessorEntry&, boost::shared_ptr, uint32_t max_height = 80); + LuaPluginDisplay(ProcessorEntry&, std::shared_ptr, uint32_t max_height = 80); ~LuaPluginDisplay(); protected: virtual uint32_t render_inline (cairo_t *, uint32_t width); private: - boost::shared_ptr _luaproc; + std::shared_ptr _luaproc; LuaState lua_gui; luabridge::LuaRef * _lua_render_inline; }; @@ -401,13 +401,13 @@ protected: class PluginInsertProcessorEntry : public ProcessorEntry { public: - PluginInsertProcessorEntry (ProcessorBox *, boost::shared_ptr, Width); + PluginInsertProcessorEntry (ProcessorBox *, std::shared_ptr, Width); void hide_things (); private: void iomap_changed (); - boost::shared_ptr _plugin_insert; + std::shared_ptr _plugin_insert; PBD::ScopedConnectionList _iomap_connection; }; @@ -430,7 +430,7 @@ public: ProcessorSelection&, MixerStrip* parent, bool owner_is_mixer = false); ~ProcessorBox (); - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); void set_width (Width); bool processor_operation (ProcessorOperation); @@ -446,30 +446,30 @@ public: void hide_things (); - bool edit_aux_send (boost::shared_ptr); - bool edit_triggerbox (boost::shared_ptr); + bool edit_aux_send (std::shared_ptr); + bool edit_triggerbox (std::shared_ptr); /* Everything except a WindowProxy object should use this to get the window */ - Gtk::Window* get_processor_ui (boost::shared_ptr) const; + Gtk::Window* get_processor_ui (std::shared_ptr) const; /* a WindowProxy object can use this */ - Gtk::Window* get_editor_window (boost::shared_ptr, bool); - Gtk::Window* get_generic_editor_window (boost::shared_ptr); + Gtk::Window* get_editor_window (std::shared_ptr, bool); + Gtk::Window* get_generic_editor_window (std::shared_ptr); - void manage_pins (boost::shared_ptr); - void edit_processor (boost::shared_ptr); - void generic_edit_processor (boost::shared_ptr); + void manage_pins (std::shared_ptr); + void edit_processor (std::shared_ptr); + void generic_edit_processor (std::shared_ptr); void update_gui_object_state (ProcessorEntry *); - sigc::signal > ProcessorSelected; - sigc::signal > ProcessorUnselected; + sigc::signal > ProcessorSelected; + sigc::signal > ProcessorUnselected; static Glib::RefPtr processor_box_actions; static Gtkmm2ext::Bindings* bindings; static void register_actions(); - typedef std::vector > ProcSelection; + typedef std::vector > ProcSelection; static ProcSelection current_processor_selection () { @@ -488,7 +488,7 @@ private: /* prevent copy construction */ ProcessorBox (ProcessorBox const &); - boost::shared_ptr _route; + std::shared_ptr _route; MixerStrip* _parent_strip; // null if in RouteParamsUI bool _owner_is_mixer; bool ab_direction; @@ -497,7 +497,7 @@ private: boost::function _get_plugin_selector; - boost::shared_ptr _processor_being_created; + std::shared_ptr _processor_being_created; /** Index at which to place a new plugin (based on where the menu was opened), or -1 to * put at the end of the plugin list. @@ -515,7 +515,7 @@ private: Gtkmm2ext::DnDVBox processor_display; Gtk::ScrolledWindow processor_scroller; - boost::shared_ptr find_drop_position (ProcessorEntry* position); + std::shared_ptr find_drop_position (ProcessorEntry* position); void _drop_plugin_preset (Gtk::SelectionData const &, ARDOUR::Route::ProcessorList &); void _drop_plugin (Gtk::SelectionData const &, ARDOUR::Route::ProcessorList &); @@ -534,11 +534,11 @@ private: Gtk::Menu* build_possible_listener_menu(); Gtk::Menu* build_possible_remove_listener_menu(); - void choose_aux (boost::weak_ptr); - void remove_aux (boost::weak_ptr); + void choose_aux (std::weak_ptr); + void remove_aux (std::weak_ptr); void choose_send (); - void send_io_finished (IOSelector::Result, boost::weak_ptr, IOSelectorWindow*); - void return_io_finished (IOSelector::Result, boost::weak_ptr, IOSelectorWindow*); + void send_io_finished (IOSelector::Result, std::weak_ptr, IOSelectorWindow*); + void return_io_finished (IOSelector::Result, std::weak_ptr, IOSelectorWindow*); void choose_insert (); void choose_plugin (); bool use_plugins (const SelectedPlugins&); @@ -550,7 +550,7 @@ private: bool processor_button_press_event (GdkEventButton *, ProcessorEntry *); bool processor_button_release_event (GdkEventButton *, ProcessorEntry *); void redisplay_processors (); - void add_processor_to_display (boost::weak_ptr); + void add_processor_to_display (std::weak_ptr); void reordered (); void report_failed_reorder (); void route_processors_changed (ARDOUR::RouteProcessorChange); @@ -565,14 +565,14 @@ private: void copy_processors (const ProcSelection&); void delete_processors (const ProcSelection&); void paste_processors (); - void paste_processors (boost::shared_ptr before); + void paste_processors (std::shared_ptr before); - void delete_dragged_processors (const std::list >&); + void delete_dragged_processors (const std::list >&); void clear_processors (); void clear_processors (ARDOUR::Placement); void rename_processors (); - void for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr)); + void for_selected_processors (void (ProcessorBox::*pmf)(std::shared_ptr)); void get_selected_processors (ProcSelection&) const; void set_disk_io_position (ARDOUR::DiskIOPoint); @@ -592,12 +592,12 @@ private: static Glib::RefPtr disk_io_action; static Glib::RefPtr edit_action; static Glib::RefPtr edit_generic_action; - void paste_processor_state (const XMLNodeList&, boost::shared_ptr); + void paste_processor_state (const XMLNodeList&, std::shared_ptr); - void hide_processor_editor (boost::shared_ptr); - void rename_processor (boost::shared_ptr); + void hide_processor_editor (std::shared_ptr); + void rename_processor (std::shared_ptr); - gint idle_delete_processor (boost::weak_ptr); + gint idle_delete_processor (std::weak_ptr); void weird_plugin_dialog (ARDOUR::Plugin& p, ARDOUR::Route::ProcessorStreams streams); @@ -605,8 +605,8 @@ private: static ProcessorBox* _current_processor_box; - static void rb_choose_aux (boost::weak_ptr); - static void rb_remove_aux (boost::weak_ptr); + static void rb_choose_aux (std::weak_ptr); + static void rb_remove_aux (std::weak_ptr); static void rb_choose_plugin (); static void rb_choose_insert (); static void rb_choose_send (); @@ -630,21 +630,21 @@ private: static void rb_edit_generic (); void route_property_changed (const PBD::PropertyChange&); - std::string generate_processor_title (boost::shared_ptr pi); + std::string generate_processor_title (std::shared_ptr pi); //typedef std::list ProcessorWindowProxies; //ProcessorWindowProxies _processor_window_info; - ProcessorWindowProxy* find_window_proxy (boost::shared_ptr) const; + ProcessorWindowProxy* find_window_proxy (std::shared_ptr) const; - void set_processor_ui (boost::shared_ptr, Gtk::Window *); - void maybe_add_processor_to_ui_list (boost::weak_ptr); - void maybe_add_processor_pin_mgr (boost::weak_ptr); + void set_processor_ui (std::shared_ptr, Gtk::Window *); + void maybe_add_processor_to_ui_list (std::weak_ptr); + void maybe_add_processor_pin_mgr (std::weak_ptr); bool one_processor_can_be_edited (); - bool processor_can_be_edited (boost::shared_ptr); + bool processor_can_be_edited (std::shared_ptr); - void mixer_strip_delivery_changed (boost::weak_ptr); + void mixer_strip_delivery_changed (std::weak_ptr); XMLNode* entry_gui_object_state (ProcessorEntry *); PBD::ScopedConnection amp_config_connection; diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 299f55c205..80f9508bdd 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -203,7 +203,7 @@ public: * * @param r Region to consider auditioning */ - virtual void consider_auditioning (boost::shared_ptr r) = 0; + virtual void consider_auditioning (std::shared_ptr r) = 0; /* import dialogs -> ardour-ui ?! */ virtual void external_audio_dialog () = 0; @@ -283,12 +283,12 @@ public: /** Import existing media */ virtual void do_import (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, ARDOUR::MidiTrackNameSource, ARDOUR::MidiTempoMapDisposition, Temporal::timepos_t&, - boost::shared_ptr instrument = boost::shared_ptr(), - boost::shared_ptr track = boost::shared_ptr(), + std::shared_ptr instrument = std::shared_ptr(), + std::shared_ptr track = std::shared_ptr(), bool with_markers = false) = 0; virtual void do_embed (std::vector paths, Editing::ImportDisposition, Editing::ImportMode mode, Temporal::timepos_t&, - boost::shared_ptr instrument = boost::shared_ptr(), - boost::shared_ptr track = boost::shared_ptr()) = 0; + std::shared_ptr instrument = std::shared_ptr(), + std::shared_ptr track = std::shared_ptr()) = 0; /** Open main export dialog */ virtual void export_audio () = 0; @@ -312,10 +312,10 @@ public: virtual Editing::ZoomFocus get_zoom_focus () const = 0; virtual samplecnt_t get_current_zoom () const = 0; virtual void reset_zoom (samplecnt_t) = 0; - virtual void clear_playlist (boost::shared_ptr) = 0; + virtual void clear_playlist (std::shared_ptr) = 0; virtual void clear_grouped_playlists (RouteUI*) = 0; - virtual void mapped_select_playlist_matching (RouteUI&, boost::weak_ptr pl) = 0; + virtual void mapped_select_playlist_matching (RouteUI&, std::weak_ptr pl) = 0; virtual void mapover_grouped_routes (sigc::slot sl, RouteUI*, PBD::PropertyID) const = 0; virtual void mapover_armed_routes (sigc::slot sl) const = 0; @@ -381,7 +381,7 @@ public: virtual Temporal::timepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0; virtual void toggle_meter_updating() = 0; virtual void split_regions_at (Temporal::timepos_t const &, RegionSelection&) = 0; - virtual void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0; + virtual void split_region_at_points (std::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0; virtual void mouse_add_new_marker (Temporal::timepos_t where, ARDOUR::Location::Flags extra_flags = ARDOUR::Location::Flags (0), int32_t cue_id = 0) = 0; virtual void foreach_time_axis_view (sigc::slot) = 0; virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0; @@ -416,11 +416,11 @@ public: virtual StripableTimeAxisView* get_stripable_time_axis_by_id (const PBD::ID& id) const = 0; - virtual TimeAxisView* time_axis_view_from_stripable (boost::shared_ptr s) const = 0; + virtual TimeAxisView* time_axis_view_from_stripable (std::shared_ptr s) const = 0; virtual void get_equivalent_regions (RegionView* rv, std::vector&, PBD::PropertyID) const = 0; - virtual RegionView* regionview_from_region (boost::shared_ptr) const = 0; - virtual RouteTimeAxisView* rtav_from_route (boost::shared_ptr) const = 0; + virtual RegionView* regionview_from_region (std::shared_ptr) const = 0; + virtual RouteTimeAxisView* rtav_from_route (std::shared_ptr) const = 0; sigc::signal ZoomChanged; sigc::signal Realized; @@ -490,12 +490,12 @@ public: virtual ArdourCanvas::GtkCanvasViewport* get_track_canvas() const = 0; - virtual void set_current_trimmable (boost::shared_ptr) = 0; - virtual void set_current_movable (boost::shared_ptr) = 0; + virtual void set_current_trimmable (std::shared_ptr) = 0; + virtual void set_current_movable (std::shared_ptr) = 0; virtual void center_screen (samplepos_t) = 0; - virtual TrackViewList axis_views_from_routes (boost::shared_ptr) const = 0; + virtual TrackViewList axis_views_from_routes (std::shared_ptr) const = 0; virtual TrackViewList const & get_track_views () const = 0; virtual MixerStrip* get_current_mixer_strip () const = 0; @@ -550,7 +550,7 @@ public: virtual void get_regions_after (RegionSelection&, Temporal::timepos_t const & where, const TrackViewList& ts) const = 0; virtual RegionSelection get_regions_from_selection_and_mouse (Temporal::timepos_t const &) = 0; virtual void get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const = 0; - virtual void get_per_region_note_selection (std::list > > > >&) const = 0; + virtual void get_per_region_note_selection (std::list > > > >&) const = 0; virtual void build_region_boundary_cache () = 0; virtual void mark_region_boundary_cache_dirty () = 0; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index e7254cdefd..9d9f3659ac 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1452,7 +1452,7 @@ public: if (!_shp->session()) { return; } - boost::shared_ptr ltc_port = _shp->session()->ltc_output_port (); + std::shared_ptr ltc_port = _shp->session()->ltc_output_port (); if (!ltc_port) { return; } @@ -1474,7 +1474,7 @@ public: ++i; /* skip "Disconnected" */ std::string const& pn = _rc_config->get_ltc_output_port (); - boost::shared_ptr ltc_port; + std::shared_ptr ltc_port; if (_shp->session()) { ltc_port = _shp->session()->ltc_output_port (); } @@ -1551,7 +1551,7 @@ public: ++i; /* skip "Disconnected" */ std::string const& pn = _rc_config->get_default_trigger_input_port (); - boost::shared_ptr port; + std::shared_ptr port; PBD::Unwinder uw (_ignore_change, true); @@ -4928,8 +4928,8 @@ RCOptionEditor::parameter_changed (string const & p) _solo_control_is_listen_control->set_sensitive (s); _listen_position->set_sensitive (s); } else if (p == "sync-source") { - boost::shared_ptr tm (TransportMasterManager::instance().current()); - if (boost::dynamic_pointer_cast (tm)) { + std::shared_ptr tm (TransportMasterManager::instance().current()); + if (std::dynamic_pointer_cast (tm)) { _sync_framerate->set_sensitive (true); } else { _sync_framerate->set_sensitive (false); diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc index f970a4b864..b55ef31d36 100644 --- a/gtk2_ardour/recorder_ui.cc +++ b/gtk2_ardour/recorder_ui.cc @@ -564,7 +564,7 @@ RecorderUI::start_updating () size_t iop_audio = 0; size_t iop_midi = 0; - boost::shared_ptr iop; + std::shared_ptr iop; if (_session) { iop = _session->io_plugs (); for (auto& p : *iop) { @@ -597,7 +597,7 @@ RecorderUI::start_updating () /* Audio */ for (PortManager::AudioInputPorts::const_iterator i = aip.begin (); i != aip.end (); ++i) { - _input_ports[i->first] = boost::shared_ptr (new InputPort (i->first, DataType::AUDIO, this, _vertical)); + _input_ports[i->first] = std::shared_ptr (new InputPort (i->first, DataType::AUDIO, this, _vertical)); set_connections (i->first); } @@ -607,7 +607,7 @@ RecorderUI::start_updating () if (PortManager::port_is_control_only (pn)) { continue; } - _input_ports[i->first] = boost::shared_ptr (new InputPort (i->first, DataType::MIDI, this, _vertical)); + _input_ports[i->first] = std::shared_ptr (new InputPort (i->first, DataType::MIDI, this, _vertical)); set_connections (i->first); } @@ -667,7 +667,7 @@ RecorderUI::add_or_remove_io (DataType dt, vector ports, bool add) if (dt==DataType::MIDI && PortManager::port_is_control_only (pn)) { continue; } - _input_ports[*i] = boost::shared_ptr (new InputPort (*i, dt, this, _vertical)); + _input_ports[*i] = std::shared_ptr (new InputPort (*i, dt, this, _vertical)); set_connections (*i); } } else { @@ -684,7 +684,7 @@ void RecorderUI::io_plugins_changed () { _fast_screen_update_connection.disconnect (); - boost::shared_ptr iop (_session->io_plugs ()); + std::shared_ptr iop (_session->io_plugs ()); for (auto& p : *iop) { if (_ioplugins.find (p) != _ioplugins.end ()) { continue; @@ -695,29 +695,29 @@ RecorderUI::io_plugins_changed () } void -RecorderUI::io_plugin_add (boost::shared_ptr p) +RecorderUI::io_plugin_add (std::shared_ptr p) { PortManager::AudioInputPorts const& aip (p->audio_input_ports ()); PortManager::MIDIInputPorts const& mip (p->midi_input_ports ()); _ioplugins.insert (p); - p->DropReferences.connect (_going_away_connections, invalidator (*this), boost::bind (&RecorderUI::io_plugin_going_away, this, boost::weak_ptr(p)), gui_context ()); + p->DropReferences.connect (_going_away_connections, invalidator (*this), boost::bind (&RecorderUI::io_plugin_going_away, this, std::weak_ptr(p)), gui_context ()); for (auto i = aip.begin (); i != aip.end (); ++i) { - _input_ports[i->first] = boost::shared_ptr (new InputPort (i->first, DataType::AUDIO, this, _vertical, true)); + _input_ports[i->first] = std::shared_ptr (new InputPort (i->first, DataType::AUDIO, this, _vertical, true)); set_connections (i->first); } for (auto i = mip.begin (); i != mip.end (); ++i) { - _input_ports[i->first] = boost::shared_ptr (new InputPort (i->first, DataType::MIDI, this, _vertical, true)); + _input_ports[i->first] = std::shared_ptr (new InputPort (i->first, DataType::MIDI, this, _vertical, true)); set_connections (i->first); } } void -RecorderUI::io_plugin_going_away (boost::weak_ptr wp) +RecorderUI::io_plugin_going_away (std::weak_ptr wp) { _fast_screen_update_connection.disconnect (); bool spill_changed = false; - boost::shared_ptr p = wp.lock (); + std::shared_ptr p = wp.lock (); if (!p) { assert (0); return; @@ -767,7 +767,7 @@ RecorderUI::update_io_widget_labels () ips.insert (i->second); } for (InputPortSet::const_iterator i = ips.begin (); i != ips.end (); ++i) { - boost::shared_ptr const& ip = *i; + std::shared_ptr const& ip = *i; if (ip->ioplug ()) { switch (ip->data_type ()) { case DataType::AUDIO: @@ -794,7 +794,7 @@ bool RecorderUI::update_meters () { PortManager::AudioInputPorts const aip (AudioEngine::instance ()->audio_input_ports ()); - boost::shared_ptr iop; + std::shared_ptr iop; if (_session) { iop = _session->io_plugs (); } @@ -896,13 +896,13 @@ RecorderUI::meter_area_layout () InputPortSet ips; for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) { - boost::shared_ptr const& ip = i->second; + std::shared_ptr const& ip = i->second; ip->show (); ips.insert (ip); } for (InputPortSet::const_iterator i = ips.begin (); i != ips.end (); ++i) { - boost::shared_ptr const& ip = *i; + std::shared_ptr const& ip = *i; _meter_table.attach (*ip, col, col + 1, row, row + 1, SHRINK|FILL, SHRINK, spc, spc); if (++col >= _meter_area_cols) { @@ -939,7 +939,7 @@ RecorderUI::meter_area_size_request (GtkRequisition* requisition) int spc = 2; for (InputPortMap::const_iterator i = _input_ports.begin (); i != _input_ports.end (); ++i) { - boost::shared_ptr const& ip = i->second; + std::shared_ptr const& ip = i->second; Requisition r = ip->size_request (); width = std::max (width, r.width + spc * 2); height = std::max (height, r.height + spc * 2); @@ -976,7 +976,7 @@ RecorderUI::port_pretty_name_changed (string pn) } void -RecorderUI::regions_changed (boost::shared_ptr, PBD::PropertyChange const& what_changed) +RecorderUI::regions_changed (std::shared_ptr, PBD::PropertyChange const& what_changed) { PBD::PropertyChange interests; @@ -1024,7 +1024,7 @@ RecorderUI::set_connections (string const& p) WeakRouteList wrl; - boost::shared_ptr rl = _session->get_tracks (); + std::shared_ptr rl = _session->get_tracks (); for (RouteList::const_iterator r = rl->begin(); r != rl->end(); ++r) { if ((*r)->input()->connected_to (p)) { wrl.push_back (*r); @@ -1077,7 +1077,7 @@ RecorderUI::spill_port (string const& p) void RecorderUI::initial_track_display () { - boost::shared_ptr r = _session->get_tracks (); + std::shared_ptr r = _session->get_tracks (); RouteList rl (*r); _recorders.clear (); add_routes (rl); @@ -1089,7 +1089,7 @@ RecorderUI::add_routes (RouteList& rl) rl.sort (Stripable::Sorter ()); for (RouteList::iterator r = rl.begin (); r != rl.end (); ++r) { /* we're only interested in Tracks */ - if (!boost::dynamic_pointer_cast (*r)) { + if (!std::dynamic_pointer_cast (*r)) { continue; } @@ -1132,8 +1132,8 @@ RecorderUI::tra_name_edit (TrackRecordAxis* tra, bool next) struct TrackRecordAxisSorter { bool operator() (const TrackRecordAxis* ca, const TrackRecordAxis* cb) { - boost::shared_ptr const& a = ca->stripable (); - boost::shared_ptr const& b = cb->stripable (); + std::shared_ptr const& a = ca->stripable (); + std::shared_ptr const& b = cb->stripable (); return Stripable::Sorter(true)(a, b); } }; @@ -1304,9 +1304,9 @@ RecorderUI::new_track_for_port (DataType dt, string const& port_name) } if (dt == DataType::AUDIO) { - boost::shared_ptr r; + std::shared_ptr r; try { - list > tl = _session->new_audio_track (1, outputs, NULL, 1, track_name, PresentationInfo::max_order, Normal, false); + list > tl = _session->new_audio_track (1, outputs, NULL, 1, track_name, PresentationInfo::max_order, Normal, false); r = tl.front (); } catch (...) { return; @@ -1316,9 +1316,9 @@ RecorderUI::new_track_for_port (DataType dt, string const& port_name) r->input ()->audio (0)->connect (port_name); } } else if (dt == DataType::MIDI) { - boost::shared_ptr r; + std::shared_ptr r; try { - list > tl = _session->new_midi_track ( + list > tl = _session->new_midi_track ( ChanCount (DataType::MIDI, 1), ChanCount (DataType::MIDI, 1), strict_io, instrument_combo.selected_instrument (), (Plugin::PresetRecord*) 0, @@ -1552,7 +1552,7 @@ RecorderUI::InputPort::update_rec_stat () { bool armed = false; for (WeakRouteList::const_iterator r = _connected_routes.begin(); r != _connected_routes.end(); ++r) { - boost::shared_ptr rt = r->lock (); + std::shared_ptr rt = r->lock (); if (!rt || !rt->rec_enable_control ()) { continue; } diff --git a/gtk2_ardour/recorder_ui.h b/gtk2_ardour/recorder_ui.h index a32de0a238..c6807ba172 100644 --- a/gtk2_ardour/recorder_ui.h +++ b/gtk2_ardour/recorder_ui.h @@ -82,15 +82,15 @@ private: void parameter_changed (std::string const&); void presentation_info_changed (PBD::PropertyChange const&); void gui_extents_changed (); - void regions_changed (boost::shared_ptr, PBD::PropertyChange const&); + void regions_changed (std::shared_ptr, PBD::PropertyChange const&); void start_updating (); void stop_updating (); bool update_meters (); void add_or_remove_io (ARDOUR::DataType, std::vector, bool); void io_plugins_changed (); - void io_plugin_add (boost::shared_ptr); - void io_plugin_going_away (boost::weak_ptr); + void io_plugin_add (std::shared_ptr); + void io_plugin_going_away (std::weak_ptr); void post_add_remove (bool); void update_io_widget_labels (); @@ -250,14 +250,14 @@ private: }; struct InputPortPtrSort { - bool operator() (boost::shared_ptr const& a, boost::shared_ptr const& b) const { + bool operator() (std::shared_ptr const& a, std::shared_ptr const& b) const { return *a < *b; } }; - typedef std::map > InputPortMap; - typedef std::set, InputPortPtrSort> InputPortSet; - typedef std::set> IOPlugSet; + typedef std::map > InputPortMap; + typedef std::set, InputPortPtrSort> InputPortSet; + typedef std::set> IOPlugSet; RecRuler _ruler; Gtk::EventBox _space; diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index b9db6bd50d..e2b788d318 100644 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -49,7 +49,7 @@ using namespace PBD; using namespace std; using namespace Gtkmm2ext; -RegionEditor::RegionEditor (Session* s, boost::shared_ptr r) +RegionEditor::RegionEditor (Session* s, std::shared_ptr r) : ArdourDialog (_("Region")) , _table (9, 2) , _table_row (0) @@ -284,7 +284,7 @@ void RegionEditor::position_clock_changed () { bool in_command = false; - boost::shared_ptr pl = _region->playlist(); + std::shared_ptr pl = _region->playlist(); if (pl) { PublicEditor::instance().begin_reversible_command (_("change region start position")); @@ -304,7 +304,7 @@ void RegionEditor::end_clock_changed () { bool in_command = false; - boost::shared_ptr pl = _region->playlist(); + std::shared_ptr pl = _region->playlist(); if (pl) { PublicEditor::instance().begin_reversible_command (_("change region end position")); @@ -327,7 +327,7 @@ RegionEditor::length_clock_changed () { timecnt_t len = length_clock.current_duration(); bool in_command = false; - boost::shared_ptr pl = _region->playlist(); + std::shared_ptr pl = _region->playlist(); if (pl) { PublicEditor::instance().begin_reversible_command (_("change region length")); diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h index 84fed5edb8..6c19797c8c 100644 --- a/gtk2_ardour/region_editor.h +++ b/gtk2_ardour/region_editor.h @@ -54,7 +54,7 @@ class ClockGroup; class RegionEditor : public ArdourDialog { public: - RegionEditor (ARDOUR::Session*, boost::shared_ptr); + RegionEditor (ARDOUR::Session*, std::shared_ptr); virtual ~RegionEditor (); protected: @@ -64,7 +64,7 @@ protected: int _table_row; private: - boost::shared_ptr _region; + std::shared_ptr _region; void connect_editor_events (); diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index 66385dffc4..cc7bff9b4b 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -43,7 +43,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Container& parent, boost::shared_ptr l) +AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Container& parent, std::shared_ptr l) : AutomationLine (name, r.get_time_axis_view(), parent, l, l->parameter()) , rv (r) { diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h index 82ea387590..2959357f61 100644 --- a/gtk2_ardour/region_gain_line.h +++ b/gtk2_ardour/region_gain_line.h @@ -40,7 +40,7 @@ class AudioRegionView; class AudioRegionGainLine : public AutomationLine { public: - AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Container& parent, boost::shared_ptr); + AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Container& parent, std::shared_ptr); Temporal::timepos_t get_origin() const; diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc index f6c1b8a8ef..a5c2f17cb6 100644 --- a/gtk2_ardour/region_layering_order_editor.cc +++ b/gtk2_ardour/region_layering_order_editor.cc @@ -135,7 +135,7 @@ RegionLayeringOrderEditor::row_selected () /* XXX this should be reversible, really */ for (vector::iterator i = eq.begin(); i != eq.end(); ++i) { - boost::shared_ptr pl = (*i)->region()->playlist(); + std::shared_ptr pl = (*i)->region()->playlist(); if (pl) { pl->raise_region_to_top ((*i)->region()); } @@ -188,7 +188,7 @@ RegionLayeringOrderEditor::refill () } void -RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, TimeAxisView* tav, boost::shared_ptr pl, timepos_t const & pos) +RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, TimeAxisView* tav, std::shared_ptr pl, timepos_t const & pos) { track_name_label.set_text (a_name); diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h index 35142956d3..687f0ccace 100644 --- a/gtk2_ardour/region_layering_order_editor.h +++ b/gtk2_ardour/region_layering_order_editor.h @@ -44,7 +44,7 @@ public: RegionLayeringOrderEditor (PublicEditor&); virtual ~RegionLayeringOrderEditor (); - void set_context (const std::string &, ARDOUR::Session *, TimeAxisView *, boost::shared_ptr, Temporal::timepos_t const &); + void set_context (const std::string &, ARDOUR::Session *, TimeAxisView *, std::shared_ptr, Temporal::timepos_t const &); void maybe_present (); protected: diff --git a/gtk2_ardour/region_list_base.cc b/gtk2_ardour/region_list_base.cc index f757da7887..700f8b16c7 100644 --- a/gtk2_ardour/region_list_base.cc +++ b/gtk2_ardour/region_list_base.cc @@ -240,7 +240,7 @@ RegionListBase::drag_begin (Glib::RefPtr const&) } TreeView::Selection::ListHandle_Path rows = _display.get_selection ()->get_selected_rows (); for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr region = (*_model->get_iter (*i))[_columns.region]; + std::shared_ptr region = (*_model->get_iter (*i))[_columns.region]; PublicEditor::instance ().pbdid_dragged_dt = region->data_type (); break; } @@ -260,7 +260,7 @@ RegionListBase::drag_data_get (Glib::RefPtr const&, Gtk::Selec } TreeView::Selection::ListHandle_Path rows = _display.get_selection ()->get_selected_rows (); for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr region = (*_model->get_iter (*i))[_columns.region]; + std::shared_ptr region = (*_model->get_iter (*i))[_columns.region]; data.set (data.get_target (), region->id ().to_s ()); break; } @@ -283,9 +283,9 @@ RegionListBase::set_session (ARDOUR::Session* s) } void -RegionListBase::remove_weak_region (boost::weak_ptr r) +RegionListBase::remove_weak_region (std::weak_ptr r) { - boost::shared_ptr region = r.lock (); + std::shared_ptr region = r.lock (); if (!region) { return; } @@ -299,14 +299,14 @@ RegionListBase::remove_weak_region (boost::weak_ptr r) } bool -RegionListBase::list_region (boost::shared_ptr region) const +RegionListBase::list_region (std::shared_ptr region) const { /* whole-file regions are shown in the Source List */ return !region->whole_file (); } void -RegionListBase::add_region (boost::shared_ptr region) +RegionListBase::add_region (std::shared_ptr region) { if (!region || !_session || !list_region (region)) { return; @@ -315,40 +315,40 @@ RegionListBase::add_region (boost::shared_ptr region) /* we only show files-on-disk. * if there's some other kind of region, we ignore it (for now) */ - boost::shared_ptr fs = boost::dynamic_pointer_cast (region->source ()); + std::shared_ptr fs = std::dynamic_pointer_cast (region->source ()); if (!fs) { return; } if (fs->empty ()) { /* MIDI sources are allowed to be empty */ - if (!boost::dynamic_pointer_cast (region->source ())) { + if (!std::dynamic_pointer_cast (region->source ())) { return; } } if (region->whole_file ()) { - region->DropReferences.connect (_remove_region_connections, MISSING_INVALIDATOR, boost::bind (&RegionListBase::remove_weak_region, this, boost::weak_ptr (region)), gui_context ()); + region->DropReferences.connect (_remove_region_connections, MISSING_INVALIDATOR, boost::bind (&RegionListBase::remove_weak_region, this, std::weak_ptr (region)), gui_context ()); } PropertyChange pc; - boost::shared_ptr rl (new RegionList); + std::shared_ptr rl (new RegionList); rl->push_back (region); regions_changed (rl, pc); } void -RegionListBase::regions_changed (boost::shared_ptr rl, const PropertyChange& what_changed) +RegionListBase::regions_changed (std::shared_ptr rl, const PropertyChange& what_changed) { bool freeze = rl->size () > 2; if (freeze) { freeze_tree_model (); } for (RegionList::const_iterator i = rl->begin (); i != rl->end (); ++i) { - boost::shared_ptr r = *i; + std::shared_ptr r = *i; RegionRowMap::iterator map_it = region_row_map.find (r); - boost::shared_ptr pl = r->playlist (); + std::shared_ptr pl = r->playlist (); bool is_on_active_playlist = pl && _session && _session->playlist_is_active (pl); @@ -371,7 +371,7 @@ RegionListBase::regions_changed (boost::shared_ptr rl, const Propert /* new region, add it to the list */ TreeModel::iterator iter = _model->append (); TreeModel::Row row = *iter; - region_row_map.insert (pair, Gtk::TreeModel::iterator> (r, iter)); + region_row_map.insert (pair, Gtk::TreeModel::iterator> (r, iter)); /* set the properties that don't change */ row[_columns.region] = r; @@ -427,7 +427,7 @@ RegionListBase::clock_format_changed () TreeModel::Children rows = _model->children (); for (TreeModel::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr r = (*i)[_columns.region]; + std::shared_ptr r = (*i)[_columns.region]; populate_row (r, *i, change); } } @@ -503,13 +503,13 @@ RegionListBase::format_position (timepos_t const& p, char* buf, size_t bufsize, } void -RegionListBase::populate_row (boost::shared_ptr region, TreeModel::Row const& row, PBD::PropertyChange const& what_changed) +RegionListBase::populate_row (std::shared_ptr region, TreeModel::Row const& row, PBD::PropertyChange const& what_changed) { assert (region); { Gdk::Color c; - bool missing_source = boost::dynamic_pointer_cast (region->source ()) != NULL; + bool missing_source = std::dynamic_pointer_cast (region->source ()) != NULL; if (missing_source) { Gtkmm2ext::set_color_from_rgba (c, UIConfiguration::instance ().color ("region list missing source")); } else { @@ -518,7 +518,7 @@ RegionListBase::populate_row (boost::shared_ptr region, TreeModel::Row c row[_columns.color_] = c; } - boost::shared_ptr audioregion = boost::dynamic_pointer_cast (region); + std::shared_ptr audioregion = std::dynamic_pointer_cast (region); PropertyChange c; const bool all = what_changed == c; @@ -562,7 +562,7 @@ RegionListBase::populate_row (boost::shared_ptr region, TreeModel::Row c } void -RegionListBase::populate_row_length (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_length (std::shared_ptr region, TreeModel::Row const& row) { char buf[16]; @@ -579,7 +579,7 @@ RegionListBase::populate_row_length (boost::shared_ptr region, TreeModel } void -RegionListBase::populate_row_end (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_end (std::shared_ptr region, TreeModel::Row const& row) { #ifndef SHOW_REGION_EXTRAS return; @@ -595,7 +595,7 @@ RegionListBase::populate_row_end (boost::shared_ptr region, TreeModel::R } void -RegionListBase::populate_row_position (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_position (std::shared_ptr region, TreeModel::Row const& row) { row[_columns.position] = region->position (); @@ -605,7 +605,7 @@ RegionListBase::populate_row_position (boost::shared_ptr region, TreeMod } void -RegionListBase::populate_row_sync (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_sync (std::shared_ptr region, TreeModel::Row const& row) { #ifndef SHOW_REGION_EXTRAS return; @@ -622,7 +622,7 @@ RegionListBase::populate_row_sync (boost::shared_ptr region, TreeModel:: } void -RegionListBase::populate_row_fade_in (boost::shared_ptr region, TreeModel::Row const& row, boost::shared_ptr audioregion) +RegionListBase::populate_row_fade_in (std::shared_ptr region, TreeModel::Row const& row, std::shared_ptr audioregion) { #ifndef SHOW_REGION_EXTRAS return; @@ -637,7 +637,7 @@ RegionListBase::populate_row_fade_in (boost::shared_ptr region, TreeMode } void -RegionListBase::populate_row_fade_out (boost::shared_ptr region, TreeModel::Row const& row, boost::shared_ptr audioregion) +RegionListBase::populate_row_fade_out (std::shared_ptr region, TreeModel::Row const& row, std::shared_ptr audioregion) { #ifndef SHOW_REGION_EXTRAS return; @@ -652,13 +652,13 @@ RegionListBase::populate_row_fade_out (boost::shared_ptr region, TreeMod } void -RegionListBase::populate_row_locked (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_locked (std::shared_ptr region, TreeModel::Row const& row) { row[_columns.locked] = region->locked (); } void -RegionListBase::populate_row_glued (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_glued (std::shared_ptr region, TreeModel::Row const& row) { if (region->position_time_domain () == Temporal::BeatTime) { row[_columns.glued] = true; @@ -668,19 +668,19 @@ RegionListBase::populate_row_glued (boost::shared_ptr region, TreeModel: } void -RegionListBase::populate_row_muted (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_muted (std::shared_ptr region, TreeModel::Row const& row) { row[_columns.muted] = region->muted (); } void -RegionListBase::populate_row_opaque (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_opaque (std::shared_ptr region, TreeModel::Row const& row) { row[_columns.opaque] = region->opaque (); } void -RegionListBase::populate_row_name (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_name (std::shared_ptr region, TreeModel::Row const& row) { row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name ()); @@ -694,24 +694,24 @@ RegionListBase::populate_row_name (boost::shared_ptr region, TreeModel:: } void -RegionListBase::populate_row_source (boost::shared_ptr region, TreeModel::Row const& row) +RegionListBase::populate_row_source (std::shared_ptr region, TreeModel::Row const& row) { - boost::shared_ptr source = region->source (); - if (boost::dynamic_pointer_cast (source)) { + std::shared_ptr source = region->source (); + if (std::dynamic_pointer_cast (source)) { row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (source->name ()); } else { row[_columns.path] = Gtkmm2ext::markup_escape_text (source->name ()); - boost::shared_ptr fs = boost::dynamic_pointer_cast (source); + std::shared_ptr fs = std::dynamic_pointer_cast (source); if (fs) { - boost::shared_ptr afs = boost::dynamic_pointer_cast (source); + std::shared_ptr afs = std::dynamic_pointer_cast (source); if (afs) { const string audio_directory = _session->session_directory ().sound_path (); if (!PBD::path_is_within (audio_directory, fs->path ())) { row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path ()); } } - boost::shared_ptr mfs = boost::dynamic_pointer_cast (source); + std::shared_ptr mfs = std::dynamic_pointer_cast (source); if (mfs) { const string midi_directory = _session->session_directory ().midi_path (); if (!PBD::path_is_within (midi_directory, fs->path ())) { @@ -788,7 +788,7 @@ RegionListBase::name_editing_started (CellEditable* ce, const Glib::ustring& pat TreeIter iter; if ((iter = _model->get_iter (path))) { - boost::shared_ptr region = (*iter)[_columns.region]; + std::shared_ptr region = (*iter)[_columns.region]; if (region) { e->set_text (region->name ()); @@ -802,7 +802,7 @@ RegionListBase::name_edit (const std::string& path, const std::string& new_text) { _name_editable = 0; - boost::shared_ptr region; + std::shared_ptr region; TreeIter row_iter; if ((row_iter = _model->get_iter (path))) { @@ -831,7 +831,7 @@ RegionListBase::tag_editing_started (CellEditable* ce, const Glib::ustring& path TreeIter iter; if ((iter = _model->get_iter (path))) { - boost::shared_ptr region = (*iter)[_columns.region]; + std::shared_ptr region = (*iter)[_columns.region]; if (region) { e->set_text (region->tags ()); @@ -845,7 +845,7 @@ RegionListBase::tag_edit (const std::string& path, const std::string& new_text) { _tags_editable = 0; - boost::shared_ptr region; + std::shared_ptr region; TreeIter row_iter; if ((row_iter = _model->get_iter (path))) { @@ -895,7 +895,7 @@ RegionListBase::locked_changed (std::string const& path) { TreeIter i = _model->get_iter (path); if (i) { - boost::shared_ptr region = (*i)[_columns.region]; + std::shared_ptr region = (*i)[_columns.region]; if (region) { region->set_locked (!(*i)[_columns.locked]); } @@ -907,7 +907,7 @@ RegionListBase::glued_changed (std::string const& path) { TreeIter i = _model->get_iter (path); if (i) { - boost::shared_ptr region = (*i)[_columns.region]; + std::shared_ptr region = (*i)[_columns.region]; if (region) { /* `glued' means MusicTime, and we're toggling here */ region->set_position_time_domain ((*i)[_columns.glued] ? Temporal::AudioTime : Temporal::BeatTime); @@ -920,7 +920,7 @@ RegionListBase::muted_changed (std::string const& path) { TreeIter i = _model->get_iter (path); if (i) { - boost::shared_ptr region = (*i)[_columns.region]; + std::shared_ptr region = (*i)[_columns.region]; if (region) { region->set_muted (!(*i)[_columns.muted]); } @@ -932,7 +932,7 @@ RegionListBase::opaque_changed (std::string const& path) { TreeIter i = _model->get_iter (path); if (i) { - boost::shared_ptr region = (*i)[_columns.region]; + std::shared_ptr region = (*i)[_columns.region]; if (region) { region->set_opaque (!(*i)[_columns.opaque]); } diff --git a/gtk2_ardour/region_list_base.h b/gtk2_ardour/region_list_base.h index 4950ab3cde..8d47fdc25a 100644 --- a/gtk2_ardour/region_list_base.h +++ b/gtk2_ardour/region_list_base.h @@ -130,7 +130,7 @@ protected: Gtk::TreeModelColumn muted; Gtk::TreeModelColumn opaque; Gtk::TreeModelColumn path; - Gtk::TreeModelColumn> region; + Gtk::TreeModelColumn> region; Gtk::TreeModelColumn color_; Gtk::TreeModelColumn captd_for; Gtk::TreeModelColumn take_id; @@ -166,9 +166,9 @@ protected: void freeze_tree_model (); void thaw_tree_model (); - void remove_weak_region (boost::weak_ptr); + void remove_weak_region (std::weak_ptr); - virtual void regions_changed (boost::shared_ptr, PBD::PropertyChange const&); + virtual void regions_changed (std::shared_ptr, PBD::PropertyChange const&); void name_editing_started (Gtk::CellEditable*, const Glib::ustring&); void tag_editing_started (Gtk::CellEditable*, const Glib::ustring&); @@ -195,22 +195,22 @@ protected: void format_position (Temporal::timepos_t const& pos, char* buf, size_t bufsize, bool onoff = true); - void add_region (boost::shared_ptr); + void add_region (std::shared_ptr); - void populate_row (boost::shared_ptr, Gtk::TreeModel::Row const&, PBD::PropertyChange const&); - void populate_row_used (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_position (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_end (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_sync (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_fade_in (boost::shared_ptr region, Gtk::TreeModel::Row const& row, boost::shared_ptr); - void populate_row_fade_out (boost::shared_ptr region, Gtk::TreeModel::Row const& row, boost::shared_ptr); - void populate_row_locked (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_muted (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_glued (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_opaque (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_length (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_name (boost::shared_ptr region, Gtk::TreeModel::Row const& row); - void populate_row_source (boost::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row (std::shared_ptr, Gtk::TreeModel::Row const&, PBD::PropertyChange const&); + void populate_row_used (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_position (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_end (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_sync (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_fade_in (std::shared_ptr region, Gtk::TreeModel::Row const& row, std::shared_ptr); + void populate_row_fade_out (std::shared_ptr region, Gtk::TreeModel::Row const& row, std::shared_ptr); + void populate_row_locked (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_muted (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_glued (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_opaque (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_length (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_name (std::shared_ptr region, Gtk::TreeModel::Row const& row); + void populate_row_source (std::shared_ptr region, Gtk::TreeModel::Row const& row); void clock_format_changed (); @@ -218,7 +218,7 @@ protected: void drag_end (Glib::RefPtr const&); void drag_data_get (Glib::RefPtr const&, Gtk::SelectionData&, guint, guint); - virtual bool list_region (boost::shared_ptr) const; + virtual bool list_region (std::shared_ptr) const; Columns _columns; @@ -232,13 +232,13 @@ protected: Gtk::ScrolledWindow _scroller; Gtk::Frame _frame; - Gtkmm2ext::DnDTreeView> _display; + Gtkmm2ext::DnDTreeView> _display; Glib::RefPtr _model; bool _no_redisplay; - typedef boost::unordered_map, Gtk::TreeModel::iterator> RegionRowMap; + typedef boost::unordered_map, Gtk::TreeModel::iterator> RegionRowMap; RegionRowMap region_row_map; diff --git a/gtk2_ardour/region_peak_cursor.cc b/gtk2_ardour/region_peak_cursor.cc index 42374ad038..c20e7e87b2 100644 --- a/gtk2_ardour/region_peak_cursor.cc +++ b/gtk2_ardour/region_peak_cursor.cc @@ -83,7 +83,7 @@ RegionPeakCursor::hide () void RegionPeakCursor::set (AudioRegionView* arv, samplepos_t when, samplecnt_t samples_per_pixel) { - boost::shared_ptr ar = boost::dynamic_pointer_cast (arv->region ()); + std::shared_ptr ar = std::dynamic_pointer_cast (arv->region ()); assert (ar); assert (ar->n_channels () > 0); diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc index 913d642b3c..8d9c93f5b3 100644 --- a/gtk2_ardour/region_selection.cc +++ b/gtk2_ardour/region_selection.cc @@ -92,7 +92,7 @@ bool RegionSelection::contains (RegionView* rv) const return find (begin(), end(), rv) != end(); } -bool RegionSelection::contains (boost::shared_ptr region) const +bool RegionSelection::contains (std::shared_ptr region) const { for (const_iterator r = begin (); r != end (); ++r) { if ((*r)->region () == region) { @@ -323,10 +323,10 @@ RegionSelection::end_time () const } /** @return the playlists that the regions in the selection are on */ -set > +set > RegionSelection::playlists () const { - set > pl; + set > pl; for (RegionSelection::const_iterator i = begin(); i != end(); ++i) { pl.insert ((*i)->region()->playlist ()); } diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h index 670b522a64..9f73d9413c 100644 --- a/gtk2_ardour/region_selection.h +++ b/gtk2_ardour/region_selection.h @@ -52,7 +52,7 @@ public: void sort_by_position_and_track (); bool contains (RegionView*) const; - bool contains (boost::shared_ptr) const; + bool contains (std::shared_ptr) const; bool involves (const TimeAxisView&) const; void clear_all(); @@ -66,7 +66,7 @@ public: size_t n_midi_regions() const; - std::set > playlists () const; + std::set > playlists () const; std::list pending; ARDOUR::RegionList regionlist () const; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 223b93cdfd..23c8b93e4f 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -71,7 +71,7 @@ PBD::Signal1 RegionView::RegionViewGoingAway; RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, - const boost::shared_ptr& r, + const std::shared_ptr& r, double spu, uint32_t basic_color, bool automation) @@ -123,7 +123,7 @@ RegionView::RegionView (const RegionView& other) } } -RegionView::RegionView (const RegionView& other, const boost::shared_ptr& other_region) +RegionView::RegionView (const RegionView& other, const std::shared_ptr& other_region) : sigc::trackable(other) , TimeAxisViewItem (other) , sync_mark (nullptr) @@ -153,7 +153,7 @@ RegionView::RegionView (const RegionView& other, const boost::shared_ptr RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, - const boost::shared_ptr& r, + const std::shared_ptr& r, double spu, uint32_t basic_color, bool recording, @@ -553,7 +553,7 @@ RegionView::update_cue_markers () * be appropriate as the origin of cue markers. We use the first one. */ - boost::shared_ptr source = region()->source (0); + std::shared_ptr source = region()->source (0); CueMarkers const & model_markers (source->cue_markers()); /* Remove any view markers that are no longer present in the model cue @@ -976,7 +976,7 @@ RegionView::update_coverage_frame (LayerDisplay d) return; } - boost::shared_ptr pl (_region->playlist ()); + std::shared_ptr pl (_region->playlist ()); if (!pl) { return; } @@ -1061,8 +1061,8 @@ RegionView::trim_front (timepos_t const & new_bound, bool no_overlap) if (no_overlap) { /* Get the next region on the left of this region and shrink/expand it. */ - boost::shared_ptr playlist (_region->playlist()); - boost::shared_ptr region_left = playlist->find_next_region (pos, End, 0); + std::shared_ptr playlist (_region->playlist()); + std::shared_ptr region_left = playlist->find_next_region (pos, End, 0); bool regions_touching = false; @@ -1094,8 +1094,8 @@ RegionView::trim_end (timepos_t const & new_bound, bool no_overlap) if (no_overlap) { /* Get the next region on the right of this region and shrink/expand it. */ - boost::shared_ptr playlist (_region->playlist()); - boost::shared_ptr region_right = playlist->find_next_region (last, Start, 1); + std::shared_ptr playlist (_region->playlist()); + std::shared_ptr region_right = playlist->find_next_region (last, Start, 1); bool regions_touching = false; diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 183417a859..b6d296c4c7 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -56,13 +56,13 @@ class RegionView : public TimeAxisViewItem public: RegionView (ArdourCanvas::Container* parent, TimeAxisView& time_view, - const boost::shared_ptr& region, + const std::shared_ptr& region, double samples_per_pixel, uint32_t base_color, bool automation = false); RegionView (const RegionView& other); - RegionView (const RegionView& other, const boost::shared_ptr& other_region); + RegionView (const RegionView& other, const std::shared_ptr& other_region); ~RegionView (); @@ -70,7 +70,7 @@ public: virtual void init (bool what_changed); - boost::shared_ptr region() const { return _region; } + std::shared_ptr region() const { return _region; } bool is_valid() const { return valid; } @@ -164,7 +164,7 @@ protected: */ RegionView (ArdourCanvas::Container *, TimeAxisView&, - const boost::shared_ptr&, + const std::shared_ptr&, double samples_per_pixel, uint32_t basic_color, bool recording, @@ -195,7 +195,7 @@ protected: Temporal::timecnt_t region_relative_distance (Temporal::timecnt_t const &, Temporal::TimeDomain desired_time_domain); - boost::shared_ptr _region; + std::shared_ptr _region; ArdourCanvas::Polygon* sync_mark; ///< polygon for sync position ArdourCanvas::Line* sync_line; ///< polygon for sync position diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 533744918b..922182220e 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -36,11 +36,11 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr r, Session* session) +ReturnUI::ReturnUI (Gtk::Window* parent, std::shared_ptr r, Session* session) :_return (r) , _gpm (session, 250) { - _gpm.set_controls (boost::shared_ptr(), r->meter(), r->amp(), r->gain_control()); + _gpm.set_controls (std::shared_ptr(), r->meter(), r->amp(), r->gain_control()); _hbox.pack_start (_gpm, true, true); set_name (X_("ReturnUIFrame")); @@ -100,7 +100,7 @@ ReturnUI::fast_update () } } -ReturnUIWindow::ReturnUIWindow (boost::shared_ptr r, ARDOUR::Session* s) +ReturnUIWindow::ReturnUIWindow (std::shared_ptr r, ARDOUR::Session* s) : ArdourWindow (string(_("Return ")) + r->name()) { ui = new ReturnUI (this, r, s); diff --git a/gtk2_ardour/return_ui.h b/gtk2_ardour/return_ui.h index 82339abb55..6e61060cbf 100644 --- a/gtk2_ardour/return_ui.h +++ b/gtk2_ardour/return_ui.h @@ -35,7 +35,7 @@ class IOSelector; class ReturnUI : public Gtk::HBox { public: - ReturnUI (Gtk::Window *,boost::shared_ptr, ARDOUR::Session*); + ReturnUI (Gtk::Window *,std::shared_ptr, ARDOUR::Session*); ~ReturnUI(); void update (); @@ -43,10 +43,10 @@ public: IOSelector* io; - boost::shared_ptr& retrn() { return _return; } + std::shared_ptr& retrn() { return _return; } private: - boost::shared_ptr _return; + std::shared_ptr _return; GainMeter _gpm; Gtk::VBox _vbox; Gtk::VBox _hbox; @@ -61,7 +61,7 @@ private: class ReturnUIWindow : public ArdourWindow { public: - ReturnUIWindow(boost::shared_ptr, ARDOUR::Session*); + ReturnUIWindow(std::shared_ptr, ARDOUR::Session*); ~ReturnUIWindow(); ReturnUI* ui; diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index 76a4c45c40..c65126b1ef 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -241,7 +241,7 @@ RhythmFerret::run_analysis () for (RegionSelection::iterator i = regions_with_transients.begin(); i != regions_with_transients.end(); ++i) { - boost::shared_ptr rd = boost::static_pointer_cast ((*i)->region()); + std::shared_ptr rd = std::static_pointer_cast ((*i)->region()); switch (get_analysis_mode()) { case PercussionOnset: @@ -260,7 +260,7 @@ RhythmFerret::run_analysis () } int -RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readable, sampleoffset_t /*offset*/, AnalysisFeatureList& results) +RhythmFerret::run_percussion_onset_analysis (std::shared_ptr readable, sampleoffset_t /*offset*/, AnalysisFeatureList& results) { try { TransientDetector t (_session->sample_rate()); @@ -315,7 +315,7 @@ RhythmFerret::get_note_onset_function () } int -RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, sampleoffset_t /*offset*/, AnalysisFeatureList& results) +RhythmFerret::run_note_onset_analysis (std::shared_ptr readable, sampleoffset_t /*offset*/, AnalysisFeatureList& results) { try { OnsetDetector t (_session->sample_rate()); diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h index ac0b459842..d406cc4a25 100644 --- a/gtk2_ardour/rhythm_ferret.h +++ b/gtk2_ardour/rhythm_ferret.h @@ -117,8 +117,8 @@ private: int get_note_onset_function (); void run_analysis (); - int run_percussion_onset_analysis (boost::shared_ptr region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results); - int run_note_onset_analysis (boost::shared_ptr region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results); + int run_percussion_onset_analysis (std::shared_ptr region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results); + int run_note_onset_analysis (std::shared_ptr region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results); void do_action (); void do_split_action (); diff --git a/gtk2_ardour/route_group_menu.cc b/gtk2_ardour/route_group_menu.cc index 0f1b118b6d..cdfc1315fc 100644 --- a/gtk2_ardour/route_group_menu.cc +++ b/gtk2_ardour/route_group_menu.cc @@ -64,7 +64,7 @@ RouteGroupMenu::build (WeakRouteList const & s) /* FInd all the route groups that our subjects are members of */ std::set groups; for (WeakRouteList::const_iterator i = _subject.begin (); i != _subject.end(); ++i) { - boost::shared_ptr r = i->lock (); + std::shared_ptr r = i->lock (); if (r) { groups.insert (r->route_group ()); } @@ -145,7 +145,7 @@ RouteGroupMenu::set_group (Gtk::RadioMenuItem* e, RouteGroup* g) } for (WeakRouteList::const_iterator i = _subject.begin(); i != _subject.end(); ++i) { - boost::shared_ptr r = i->lock (); + std::shared_ptr r = i->lock (); if (!r || r->route_group () == g) { /* lock of weak_ptr failed, or the group for this route is already right */ continue; diff --git a/gtk2_ardour/route_list_base.cc b/gtk2_ardour/route_list_base.cc index c0b724e004..2f0fef4bb6 100644 --- a/gtk2_ardour/route_list_base.cc +++ b/gtk2_ardour/route_list_base.cc @@ -289,8 +289,8 @@ void RouteListBase::on_tv_input_active_changed (std::string const& path_string) { Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr mt = boost::dynamic_pointer_cast (stripable); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr mt = std::dynamic_pointer_cast (stripable); if (mt) { mt->set_input_active (!mt->input_active ()); @@ -301,8 +301,8 @@ void RouteListBase::on_tv_rec_enable_changed (std::string const& path_string) { Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac = stripable->rec_enable_control (); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac = stripable->rec_enable_control (); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -313,8 +313,8 @@ void RouteListBase::on_tv_rec_safe_toggled (std::string const& path_string) { Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac (stripable->rec_safe_control ()); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac (stripable->rec_safe_control ()); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -326,8 +326,8 @@ RouteListBase::on_tv_mute_enable_toggled (std::string const& path_string) { // Get the model row that has been toggled. Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac (stripable->mute_control ()); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac (stripable->mute_control ()); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -339,8 +339,8 @@ RouteListBase::on_tv_solo_enable_toggled (std::string const& path_string) { // Get the model row that has been toggled. Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac (stripable->solo_control ()); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac (stripable->solo_control ()); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -352,8 +352,8 @@ RouteListBase::on_tv_solo_isolate_toggled (std::string const& path_string) { // Get the model row that has been toggled. Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac (stripable->solo_isolate_control ()); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac (stripable->solo_isolate_control ()); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -365,8 +365,8 @@ RouteListBase::on_tv_solo_safe_toggled (std::string const& path_string) { // Get the model row that has been toggled. Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr ac (stripable->solo_safe_control ()); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr ac (stripable->solo_safe_control ()); if (ac) { ac->set_value (!ac->get_value (), Controllable::UseGroup); @@ -446,15 +446,15 @@ RouteListBase::on_tv_visible_changed (std::string const& path) if ((iter = _model->get_iter (path))) { bool hidden = (*iter)[_columns.visible]; // toggle -> invert flag - boost::shared_ptr stripable = (*iter)[_columns.stripable]; + std::shared_ptr stripable = (*iter)[_columns.stripable]; if (hidden != stripable->presentation_info ().hidden ()) { stripable->presentation_info ().set_hidden (hidden); - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr route = std::dynamic_pointer_cast (stripable); RouteGroup* rg = route ? route->route_group () : 0; if (rg && rg->is_active () && rg->is_hidden ()) { - boost::shared_ptr rl (rg->route_list ()); + std::shared_ptr rl (rg->route_list ()); for (RouteList::const_iterator i = rl->begin (); i != rl->end (); ++i) { (*i)->presentation_info ().set_hidden (hidden); } @@ -472,7 +472,7 @@ RouteListBase::on_tv_trigger_changed (std::string const& path) Gtk::TreeModel::Row row = *_model->get_iter (path); assert (row[_columns.is_track]); - boost::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr stripable = row[_columns.stripable]; bool const tt = row[_columns.trigger]; stripable->presentation_info ().set_trigger_track (!tt); } @@ -485,8 +485,8 @@ RouteListBase::on_tv_active_changed (std::string const& path) } Gtk::TreeModel::Row row = *_model->get_iter (path); - boost::shared_ptr stripable = row[_columns.stripable]; - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr stripable = row[_columns.stripable]; + std::shared_ptr route = std::dynamic_pointer_cast (stripable); if (route) { bool const active = row[_columns.active]; route->set_active (!active, this); @@ -516,7 +516,7 @@ RouteListBase::add_masters (VCAList& vlist) StripableList sl; for (VCAList::iterator v = vlist.begin (); v != vlist.end (); ++v) { - sl.push_back (boost::dynamic_pointer_cast (*v)); + sl.push_back (std::dynamic_pointer_cast (*v)); } add_stripables (sl); @@ -544,7 +544,7 @@ RouteListBase::add_stripables (StripableList& slist) slist.sort (Stripable::Sorter ()); for (Gtk::TreeModel::Children::iterator it = _model->children ().begin (); it != _model->children ().end (); ++it) { - boost::shared_ptr r = (*it)[_columns.stripable]; + std::shared_ptr r = (*it)[_columns.stripable]; if (r->presentation_info ().order () == (slist.front ()->presentation_info ().order () + slist.size ())) { insert_iter = it; @@ -558,13 +558,13 @@ RouteListBase::add_stripables (StripableList& slist) } for (StripableList::iterator s = slist.begin (); s != slist.end (); ++s) { - boost::shared_ptr stripable = *s; - boost::shared_ptr midi_trk; - boost::shared_ptr route; + std::shared_ptr stripable = *s; + std::shared_ptr midi_trk; + std::shared_ptr route; TreeModel::Row row; - if (boost::dynamic_pointer_cast (stripable)) { + if (std::dynamic_pointer_cast (stripable)) { row = *(_model->insert (insert_iter)); row[_columns.is_track] = false; @@ -572,7 +572,7 @@ RouteListBase::add_stripables (StripableList& slist) row[_columns.is_midi] = false; row[_columns.activatable] = true; - } else if ((route = boost::dynamic_pointer_cast (*s))) { + } else if ((route = std::dynamic_pointer_cast (*s))) { if (route->is_auditioner ()) { continue; } @@ -582,9 +582,9 @@ RouteListBase::add_stripables (StripableList& slist) row = *(_model->insert (insert_iter)); - midi_trk = boost::dynamic_pointer_cast (stripable); + midi_trk = std::dynamic_pointer_cast (stripable); - row[_columns.is_track] = (boost::dynamic_pointer_cast (stripable) != 0); + row[_columns.is_track] = (std::dynamic_pointer_cast (stripable) != 0); row[_columns.activatable] = !stripable->is_master (); if (midi_trk) { @@ -610,7 +610,7 @@ RouteListBase::add_stripables (StripableList& slist) row[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (stripable); row[_columns.name_editable] = true; - boost::weak_ptr ws (stripable); + std::weak_ptr ws (stripable); /* for now, we need both of these. PropertyChanged covers on * pre-defined, "global" things of interest to a @@ -622,8 +622,8 @@ RouteListBase::add_stripables (StripableList& slist) stripable->PropertyChanged.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::route_property_changed, this, _1, ws), gui_context ()); stripable->presentation_info ().PropertyChanged.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::route_property_changed, this, _1, ws), gui_context ()); - if (boost::dynamic_pointer_cast (stripable)) { - boost::shared_ptr t = boost::dynamic_pointer_cast (stripable); + if (std::dynamic_pointer_cast (stripable)) { + std::shared_ptr t = std::dynamic_pointer_cast (stripable); t->rec_enable_control ()->Changed.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::queue_idle_update, this), gui_context ()); t->rec_safe_control ()->Changed.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::queue_idle_update, this), gui_context ()); } @@ -633,7 +633,7 @@ RouteListBase::add_stripables (StripableList& slist) midi_trk->InputActiveChanged.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::update_input_active_display, this), gui_context ()); } - boost::shared_ptr ac; + std::shared_ptr ac; if ((ac = stripable->mute_control ()) != 0) { ac->Changed.connect (_stripable_connections, invalidator (_scroller), boost::bind (&RouteListBase::queue_idle_update, this), gui_context ()); @@ -664,7 +664,7 @@ RouteListBase::add_stripables (StripableList& slist) /* set the treeview model selection state */ TreeModel::Children rows = _model->children (); for (TreeModel::Children::iterator ri = rows.begin (); ri != rows.end (); ++ri) { - boost::shared_ptr stripable = (*ri)[_columns.stripable]; + std::shared_ptr stripable = (*ri)[_columns.stripable]; if (stripable && stripable->is_selected ()) { _display.get_selection ()->select (*ri); } else { @@ -675,9 +675,9 @@ RouteListBase::add_stripables (StripableList& slist) } void -RouteListBase::remove_strip (boost::weak_ptr ws) +RouteListBase::remove_strip (std::weak_ptr ws) { - boost::shared_ptr stripable (ws.lock ()); + std::shared_ptr stripable (ws.lock ()); if (!stripable) { return; @@ -689,7 +689,7 @@ RouteListBase::remove_strip (boost::weak_ptr ws) PBD::Unwinder uw (_ignore_selection_change, true); for (ri = rows.begin (); ri != rows.end (); ++ri) { - boost::shared_ptr s = (*ri)[_columns.stripable]; + std::shared_ptr s = (*ri)[_columns.stripable]; if (s == stripable) { PBD::Unwinder uw (_route_deletion_in_progress, true); _model->erase (ri); @@ -699,7 +699,7 @@ RouteListBase::remove_strip (boost::weak_ptr ws) } void -RouteListBase::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr s) +RouteListBase::route_property_changed (const PropertyChange& what_changed, std::weak_ptr s) { if (_adding_routes) { return; @@ -714,7 +714,7 @@ RouteListBase::route_property_changed (const PropertyChange& what_changed, boost return; } - boost::shared_ptr stripable = s.lock (); + std::shared_ptr stripable = s.lock (); if (!stripable) { return; @@ -722,7 +722,7 @@ RouteListBase::route_property_changed (const PropertyChange& what_changed, boost TreeModel::Children rows = _model->children (); for (TreeModel::Children::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr ss = (*i)[_columns.stripable]; + std::shared_ptr ss = (*i)[_columns.stripable]; if (ss != stripable) { continue; @@ -776,7 +776,7 @@ RouteListBase::sync_presentation_info_from_treeview () PresentationInfo::ChangeSuspender cs; for (TreeModel::Children::iterator ri = rows.begin (); ri != rows.end (); ++ri) { - boost::shared_ptr stripable = (*ri)[_columns.stripable]; + std::shared_ptr stripable = (*ri)[_columns.stripable]; bool visible = (*ri)[_columns.visible]; stripable->presentation_info ().set_hidden (!visible); @@ -811,7 +811,7 @@ RouteListBase::sync_treeview_from_presentation_info (PropertyChange const& what_ TreeOrderKeys sorted; for (TreeModel::Children::iterator ri = rows.begin (); ri != rows.end (); ++ri, ++old_order) { - boost::shared_ptr stripable = (*ri)[_columns.stripable]; + std::shared_ptr stripable = (*ri)[_columns.stripable]; /* use global order */ sorted.push_back (TreeOrderKey (old_order, stripable)); } @@ -857,7 +857,7 @@ RouteListBase::sync_treeview_from_presentation_info (PropertyChange const& what_ /* set the treeview model selection state */ for (TreeModel::Children::iterator ri = rows.begin (); ri != rows.end (); ++ri) { - boost::shared_ptr stripable = (*ri)[_columns.stripable]; + std::shared_ptr stripable = (*ri)[_columns.stripable]; if (stripable && stripable->is_selected ()) { _display.get_selection ()->select (*ri); } else { @@ -877,7 +877,7 @@ RouteListBase::set_all_audio_midi_visibility (int which, bool yn) PBD::Unwinder uw (_ignore_visibility_change, true); for (i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr stripable = (*i)[_columns.stripable]; + std::shared_ptr stripable = (*i)[_columns.stripable]; /* * which = 0: any (incl. VCA) @@ -885,9 +885,9 @@ RouteListBase::set_all_audio_midi_visibility (int which, bool yn) * which = 2: busses * which = 3: midi-tracks */ - bool is_audio = boost::dynamic_pointer_cast (stripable) != 0; - bool is_midi = boost::dynamic_pointer_cast (stripable) != 0; - bool is_bus = !is_audio && !is_midi && boost::dynamic_pointer_cast (stripable) != 0; + bool is_audio = std::dynamic_pointer_cast (stripable) != 0; + bool is_midi = std::dynamic_pointer_cast (stripable) != 0; + bool is_bus = !is_audio && !is_midi && std::dynamic_pointer_cast (stripable) != 0; switch (which) { case 0: @@ -922,7 +922,7 @@ RouteListBase::key_press (GdkEventKey* ev) TreeViewColumn* col; TreePath path; - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); switch (ev->keyval) { case GDK_Tab: @@ -962,7 +962,7 @@ RouteListBase::key_press (GdkEventKey* ev) case 'r': if (get_relevant_routes (rl)) { for (RouteList::const_iterator r = rl->begin (); r != rl->end (); ++r) { - boost::shared_ptr t = boost::dynamic_pointer_cast (*r); + std::shared_ptr t = std::dynamic_pointer_cast (*r); if (t) { _session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !t->rec_enable_control ()->get_value (), Controllable::NoGroup); break; @@ -979,7 +979,7 @@ RouteListBase::key_press (GdkEventKey* ev) } bool -RouteListBase::get_relevant_routes (boost::shared_ptr rl) +RouteListBase::get_relevant_routes (std::shared_ptr rl) { RefPtr selection = _display.get_selection (); TreePath path; @@ -1006,8 +1006,8 @@ RouteListBase::get_relevant_routes (boost::shared_ptr rl) } if (iter) { - boost::shared_ptr stripable = (*iter)[_columns.stripable]; - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr stripable = (*iter)[_columns.stripable]; + std::shared_ptr route = std::dynamic_pointer_cast (stripable); if (route) { rl->push_back (route); } @@ -1114,10 +1114,10 @@ RouteListBase::update_input_active_display () TreeModel::Children::iterator i; for (i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr stripable = (*i)[_columns.stripable]; + std::shared_ptr stripable = (*i)[_columns.stripable]; - if (boost::dynamic_pointer_cast (stripable)) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (stripable); + if (std::dynamic_pointer_cast (stripable)) { + std::shared_ptr mt = std::dynamic_pointer_cast (stripable); if (mt) { (*i)[_columns.is_input_active] = mt->input_active (); @@ -1141,8 +1141,8 @@ RouteListBase::idle_update_mute_rec_solo_etc () TreeModel::Children::iterator i; for (i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr stripable = (*i)[_columns.stripable]; - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr stripable = (*i)[_columns.stripable]; + std::shared_ptr route = std::dynamic_pointer_cast (stripable); (*i)[_columns.mute_state] = RouteUI::mute_active_state (_session, stripable); (*i)[_columns.solo_state] = RouteUI::solo_active_state (stripable); (*i)[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (stripable) ? 1 : 0; @@ -1153,10 +1153,10 @@ RouteListBase::idle_update_mute_rec_solo_etc () (*i)[_columns.active] = true; } - boost::shared_ptr trk (boost::dynamic_pointer_cast (route)); + std::shared_ptr trk (std::dynamic_pointer_cast (route)); if (trk) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (route); + std::shared_ptr mt = std::dynamic_pointer_cast (route); if (trk->rec_enable_control ()->get_value ()) { if (_session->record_status () == Session::Recording) { @@ -1213,7 +1213,7 @@ RouteListBase::name_edit (std::string const& path, std::string const& new_text) return; } - boost::shared_ptr stripable = (*iter)[_columns.stripable]; + std::shared_ptr stripable = (*iter)[_columns.stripable]; if (stripable && stripable->name () != new_text) { stripable->set_name (new_text); @@ -1223,14 +1223,14 @@ RouteListBase::name_edit (std::string const& path, std::string const& new_text) void RouteListBase::show_tracks_with_regions_at_playhead () { - boost::shared_ptr const r = _session->get_routes_with_regions_at (timepos_t (_session->transport_sample ())); + std::shared_ptr const r = _session->get_routes_with_regions_at (timepos_t (_session->transport_sample ())); DisplaySuspender ds; TreeModel::Children rows = _model->children (); for (TreeModel::Children::iterator i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr stripable = (*i)[_columns.stripable]; - boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + std::shared_ptr stripable = (*i)[_columns.stripable]; + std::shared_ptr route = std::dynamic_pointer_cast (stripable); bool to_show = std::find (r->begin (), r->end (), route) != r->end (); stripable->presentation_info ().set_hidden (!to_show); diff --git a/gtk2_ardour/route_list_base.h b/gtk2_ardour/route_list_base.h index 0a593c125f..f2945cee84 100644 --- a/gtk2_ardour/route_list_base.h +++ b/gtk2_ardour/route_list_base.h @@ -157,7 +157,7 @@ protected: Gtk::TreeModelColumn solo_isolate_state; Gtk::TreeModelColumn solo_safe_state; Gtk::TreeModelColumn is_track; - Gtk::TreeModelColumn> stripable; + Gtk::TreeModelColumn> stripable; Gtk::TreeModelColumn name_editable; Gtk::TreeModelColumn is_input_active; Gtk::TreeModelColumn is_midi; @@ -179,7 +179,7 @@ private: void add_routes (ARDOUR::RouteList&); void add_masters (ARDOUR::VCAList&); void add_stripables (ARDOUR::StripableList&); - void remove_strip (boost::weak_ptr); + void remove_strip (std::weak_ptr); void selection_changed (); void row_deleted (Gtk::TreeModel::Path const&); @@ -195,7 +195,7 @@ private: bool idle_update_mute_rec_solo_etc (); void update_input_active_display (); - void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr); + void route_property_changed (const PBD::PropertyChange&, std::weak_ptr); void presentation_info_changed (PBD::PropertyChange const&); void name_edit (std::string const&, std::string const&); @@ -209,7 +209,7 @@ private: bool leave_notify (GdkEventCrossing*); void name_edit_started (Gtk::CellEditable*, const Glib::ustring&); - bool get_relevant_routes (boost::shared_ptr rl); + bool get_relevant_routes (std::shared_ptr rl); Gtk::ScrolledWindow _scroller; Glib::RefPtr _model; diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 6fa8c233eb..e0b1bb0319 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -150,7 +150,7 @@ RouteParams_UI::add_routes (RouteList& routes) ENSURE_GUI_THREAD (*this, &RouteParams_UI::add_routes, routes) for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { - boost::shared_ptr route = (*x); + std::shared_ptr route = (*x); if (route->is_auditioner()) { return; @@ -162,20 +162,20 @@ RouteParams_UI::add_routes (RouteList& routes) //route_select_list.rows().back().select (); - route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr(route)), gui_context()); - route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); + route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_property_changed, this, _1, std::weak_ptr(route)), gui_context()); + route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, std::weak_ptr(route)), gui_context()); } } void -RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr wr) +RouteParams_UI::route_property_changed (const PropertyChange& what_changed, std::weak_ptr wr) { if (!what_changed.contains (ARDOUR::Properties::name)) { return; } - boost::shared_ptr route (wr.lock()); + std::shared_ptr route (wr.lock()); if (!route) { return; @@ -186,7 +186,7 @@ RouteParams_UI::route_property_changed (const PropertyChange& what_changed, boos bool found = false ; TreeModel::Children rows = route_display_model->children(); for(TreeModel::Children::iterator iter = rows.begin(); iter != rows.end(); ++iter) { - boost::shared_ptr r =(*iter)[route_display_columns.route]; + std::shared_ptr r =(*iter)[route_display_columns.route]; if (r == route) { (*iter)[route_display_columns.text] = route->name() ; found = true ; @@ -208,7 +208,7 @@ void RouteParams_UI::map_frozen() { ENSURE_GUI_THREAD (*this, &RouteParams_UI::map_frozen) - boost::shared_ptr at = boost::dynamic_pointer_cast(_route); + std::shared_ptr at = std::dynamic_pointer_cast(_route); if (at && insert_box) { switch (at->freeze_state()) { case AudioTrack::Frozen: @@ -240,7 +240,7 @@ RouteParams_UI::setup_processor_boxes() insert_box = new ProcessorBox (_session, boost::bind (&RouteParams_UI::plugin_selector, this), _p_selection, 0); insert_box->set_route (_route); - boost::shared_ptr at = boost::dynamic_pointer_cast(_route); + std::shared_ptr at = std::dynamic_pointer_cast(_route); if (at) { at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&RouteParams_UI::map_frozen, this), gui_context()); } @@ -318,9 +318,9 @@ RouteParams_UI::cleanup_view (bool stopupdate) } void -RouteParams_UI::route_removed (boost::weak_ptr wr) +RouteParams_UI::route_removed (std::weak_ptr wr) { - boost::shared_ptr route (wr.lock()); + std::shared_ptr route (wr.lock()); if (!route) { return; @@ -332,7 +332,7 @@ RouteParams_UI::route_removed (boost::weak_ptr wr) TreeModel::Children::iterator ri; for(TreeModel::Children::iterator iter = rows.begin(); iter != rows.end(); ++iter) { - boost::shared_ptr r =(*iter)[route_display_columns.route]; + std::shared_ptr r =(*iter)[route_display_columns.route]; if (r == route) { route_display_model->erase(iter); @@ -359,7 +359,7 @@ RouteParams_UI::set_session (Session *sess) route_display_model->clear(); if (_session) { - boost::shared_ptr r = _session->get_routes(); + std::shared_ptr r = _session->get_routes(); add_routes (*r); _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&RouteParams_UI::add_routes, this, _1), gui_context()); } @@ -391,7 +391,7 @@ RouteParams_UI::route_selected() if(iter) { //If anything is selected - boost::shared_ptr route = (*iter)[route_display_columns.route] ; + std::shared_ptr route = (*iter)[route_display_columns.route] ; if (_route == route) { // do nothing @@ -461,41 +461,41 @@ RouteParams_UI::show_track_menu() } void -RouteParams_UI::redirect_selected (boost::shared_ptr proc) +RouteParams_UI::redirect_selected (std::shared_ptr proc) { - boost::shared_ptr send; - boost::shared_ptr retrn; - boost::shared_ptr plugin_insert; - boost::shared_ptr port_insert; + std::shared_ptr send; + std::shared_ptr retrn; + std::shared_ptr plugin_insert; + std::shared_ptr port_insert; - if ((boost::dynamic_pointer_cast (proc)) != 0) { + if ((std::dynamic_pointer_cast (proc)) != 0) { cleanup_view(); _processor.reset ((Processor*) 0); update_title(); return; - } else if ((send = boost::dynamic_pointer_cast (proc)) != 0) { + } else if ((send = std::dynamic_pointer_cast (proc)) != 0) { SendUI *send_ui = new SendUI (this, _session, send); cleanup_view(); - send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, std::weak_ptr(proc)), gui_context()); _active_view = send_ui; redir_hpane.add (*_active_view); redir_hpane.show_all(); - } else if ((retrn = boost::dynamic_pointer_cast (proc)) != 0) { + } else if ((retrn = std::dynamic_pointer_cast (proc)) != 0) { ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, std::weak_ptr(proc)), gui_context()); _active_view = return_ui; redir_hpane.add (*_active_view); redir_hpane.show_all(); - } else if ((plugin_insert = boost::dynamic_pointer_cast (proc)) != 0) { + } else if ((plugin_insert = std::dynamic_pointer_cast (proc)) != 0) { GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); @@ -507,12 +507,12 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) redir_hpane.add (*_active_view); redir_hpane.show_all(); - } else if ((port_insert = boost::dynamic_pointer_cast (proc)) != 0) { + } else if ((port_insert = std::dynamic_pointer_cast (proc)) != 0) { PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); cleanup_view(); - port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr (proc)), gui_context()); + port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, std::weak_ptr (proc)), gui_context()); _active_view = portinsert_ui; redir_hpane.add (*_active_view); @@ -538,9 +538,9 @@ RouteParams_UI::plugin_going_away (Placement place) } void -RouteParams_UI::processor_going_away (boost::weak_ptr wproc) +RouteParams_UI::processor_going_away (std::weak_ptr wproc) { - boost::shared_ptr proc = (wproc.lock()); + std::shared_ptr proc = (wproc.lock()); if (!proc) { return; diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h index 813bae31e7..423b1731ac 100644 --- a/gtk2_ardour/route_params_ui.h +++ b/gtk2_ardour/route_params_ui.h @@ -105,11 +105,11 @@ private: ProcessorSelection _p_selection; - boost::shared_ptr _route; + std::shared_ptr _route; PBD::ScopedConnection _route_processors_connection; PBD::ScopedConnectionList route_connections; - boost::shared_ptr _processor; + std::shared_ptr _processor; PBD::ScopedConnection _processor_going_away_connection; @@ -132,7 +132,7 @@ private: add(route); } Gtk::TreeModelColumn text; - Gtk::TreeModelColumn > route; + Gtk::TreeModelColumn > route; }; RouteDisplayModelColumns route_display_columns ; @@ -142,8 +142,8 @@ private: void add_routes (ARDOUR::RouteList&); - void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr route); - void route_removed (boost::weak_ptr route); + void route_property_changed (const PBD::PropertyChange&, std::weak_ptr route); + void route_removed (std::weak_ptr route); void map_frozen (); @@ -159,10 +159,10 @@ private: void setup_processor_boxes(); void cleanup_processor_boxes(); - void redirect_selected (boost::shared_ptr); + void redirect_selected (std::shared_ptr); void plugin_going_away (ARDOUR::Placement); - void processor_going_away (boost::weak_ptr); + void processor_going_away (std::weak_ptr); gint edit_input_configuration (GdkEventButton *ev); gint edit_output_configuration (GdkEventButton *ev); diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index 34ad5d365c..02eb39aacc 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -73,12 +73,12 @@ RouteProcessorSelection::add_grouped_tracks (AxisView* r) const { std::list rv; - boost::shared_ptr route = boost::dynamic_pointer_cast(r->stripable()); + std::shared_ptr route = std::dynamic_pointer_cast(r->stripable()); if (route) { ARDOUR::RouteGroup* rg = route->route_group (); if (rg && rg->is_active() && rg->is_select ()) { - boost::shared_ptr rl = rg->route_list (); + std::shared_ptr rl = rg->route_list (); for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { AxisView* av = avp.axis_view_by_stripable (*i); rv.push_back (av); @@ -137,7 +137,7 @@ RouteProcessorSelection::add (AxisView* r, bool with_groups) PresentationInfo::ChangeSuspender cs; for (std::list::const_iterator i = avl.begin (); i != avl.end (); ++i) { if (axes.insert (*i).second) { - shp.session()->selection().add ((*i)->stripable(), boost::shared_ptr()); + shp.session()->selection().add ((*i)->stripable(), std::shared_ptr()); MixerStrip* ms = dynamic_cast (*i); if (ms) { ms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RouteProcessorSelection::remove, this, _1, false), gui_context()); @@ -162,7 +162,7 @@ RouteProcessorSelection::remove (AxisView* r, bool with_groups) PresentationInfo::ChangeSuspender cs; for (std::list::const_iterator i = avl.begin (); i != avl.end (); ++i) { - shp.session()->selection().remove ((*i)->stripable(), boost::shared_ptr()); + shp.session()->selection().remove ((*i)->stripable(), std::shared_ptr()); } } diff --git a/gtk2_ardour/route_sorter.h b/gtk2_ardour/route_sorter.h index 16f9261d52..c3467beac7 100644 --- a/gtk2_ardour/route_sorter.h +++ b/gtk2_ardour/route_sorter.h @@ -33,9 +33,9 @@ struct TreeOrderKey { uint32_t old_display_order; - boost::shared_ptr stripable; + std::shared_ptr stripable; - TreeOrderKey (uint32_t ok, boost::shared_ptr s) + TreeOrderKey (uint32_t ok, std::shared_ptr s) : old_display_order (ok) , stripable (s) {} @@ -47,8 +47,8 @@ struct TreeOrderKeySorter { bool operator() (const TreeOrderKey& ok_a, const TreeOrderKey& ok_b) { - boost::shared_ptr const& a = ok_a.stripable; - boost::shared_ptr const& b = ok_b.stripable; + std::shared_ptr const& a = ok_a.stripable; + std::shared_ptr const& b = ok_b.stripable; return ARDOUR::Stripable::Sorter () (a, b); } }; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 2772561c92..2f8cbc0464 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -144,7 +144,7 @@ RouteTimeAxisView::route_property_changed (const PBD::PropertyChange& what_chang } void -RouteTimeAxisView::set_route (boost::shared_ptr rt) +RouteTimeAxisView::set_route (std::shared_ptr rt) { RouteUI::set_route (rt); StripableTimeAxisView::set_stripable (rt); @@ -385,7 +385,7 @@ RouteTimeAxisView::setup_processor_menu_and_curves () continue; } for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { - boost::shared_ptr c = boost::dynamic_pointer_cast ((*i)->processor->control((*ii)->what)); + std::shared_ptr c = std::dynamic_pointer_cast ((*i)->processor->control((*ii)->what)); ctrl_item_map[c] = (*ii)->menu_item; } } @@ -691,7 +691,7 @@ RouteTimeAxisView::build_display_menu () int capture = 0; int automatic = 0; int styles = 0; - boost::shared_ptr first_track; + std::shared_ptr first_track; TrackSelection const & s = _editor.get_selection().tracks; for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) { @@ -1190,15 +1190,15 @@ RouteTimeAxisView::route_group () const return _route->route_group(); } -boost::shared_ptr +std::shared_ptr RouteTimeAxisView::playlist () const { - boost::shared_ptr tr; + std::shared_ptr tr; if ((tr = track()) != 0) { return tr->playlist(); } else { - return boost::shared_ptr (); + return std::shared_ptr (); } } @@ -1228,22 +1228,22 @@ RouteTimeAxisView::name_entry_changed (string const& str) return false; } -boost::shared_ptr +std::shared_ptr RouteTimeAxisView::find_next_region (timepos_t const & pos, RegionPoint point, int32_t dir) { - boost::shared_ptr pl = playlist (); + std::shared_ptr pl = playlist (); if (pl) { return pl->find_next_region (pos, point, dir); } - return boost::shared_ptr (); + return std::shared_ptr (); } timepos_t RouteTimeAxisView::find_next_region_boundary (timepos_t const & pos, int32_t dir) { - boost::shared_ptr pl = playlist (); + std::shared_ptr pl = playlist (); if (pl) { return pl->find_next_region_boundary (pos, dir); @@ -1255,9 +1255,9 @@ RouteTimeAxisView::find_next_region_boundary (timepos_t const & pos, int32_t dir void RouteTimeAxisView::fade_range (TimeSelection& selection) { - boost::shared_ptr what_we_got; - boost::shared_ptr tr = track (); - boost::shared_ptr playlist; + std::shared_ptr what_we_got; + std::shared_ptr tr = track (); + std::shared_ptr playlist; if (tr == 0) { /* route is a bus, not a track */ @@ -1283,9 +1283,9 @@ RouteTimeAxisView::fade_range (TimeSelection& selection) void RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) { - boost::shared_ptr what_we_got; - boost::shared_ptr tr = track (); - boost::shared_ptr playlist; + std::shared_ptr what_we_got; + std::shared_ptr tr = track (); + std::shared_ptr playlist; if (tr == 0) { /* route is a bus, not a track */ @@ -1343,7 +1343,7 @@ RouteTimeAxisView::paste (timepos_t const & pos, const Selection& selection, Pas return false; } - boost::shared_ptr pl = playlist (); + std::shared_ptr pl = playlist (); const ARDOUR::DataType type = pl->data_type(); PlaylistSelection::const_iterator p = selection.playlists.get_nth(type, ctx.counts.n_playlists(type)); @@ -1366,7 +1366,7 @@ RouteTimeAxisView::paste (timepos_t const & pos, const Selection& selection, Pas if (_editor.should_ripple()) { std::pair extent = (*p)->get_extent_with_endspace(); timecnt_t amount = extent.first.distance (extent.second); - pl->ripple (ppos, amount.scale (ctx.times), boost::shared_ptr()); + pl->ripple (ppos, amount.scale (ctx.times), std::shared_ptr()); } pl->paste (*p, ppos, ctx.times); @@ -1452,7 +1452,7 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) { assert (param.type() != PluginAutomation); - boost::shared_ptr track = automation_child (param); + std::shared_ptr track = automation_child (param); Gtk::CheckMenuItem* menu = automation_child_menu_item (param); if (!track) { @@ -1482,7 +1482,7 @@ RouteTimeAxisView::update_pan_track_visibility () bool const showit = pan_automation_item->get_active(); bool changed = false; - for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { + for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { if ((*i)->set_marked_for_display (showit)) { changed = true; } @@ -1497,7 +1497,7 @@ void RouteTimeAxisView::ensure_pan_views (bool show) { bool changed = false; - for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { + for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { changed = true; (*i)->set_marked_for_display (false); } @@ -1514,7 +1514,7 @@ RouteTimeAxisView::ensure_pan_views (bool show) set::iterator p; for (p = params.begin(); p != params.end(); ++p) { - boost::shared_ptr pan_control = _route->pannable()->automation_control(*p); + std::shared_ptr pan_control = _route->pannable()->automation_control(*p); if (pan_control->parameter().type() == NullAutomation) { error << "Pan control has NULL automation type!" << endmsg; @@ -1527,7 +1527,7 @@ RouteTimeAxisView::ensure_pan_views (bool show) std::string const name = _route->pannable()->describe_parameter (pan_control->parameter ()); - boost::shared_ptr t ( + std::shared_ptr t ( new AutomationTimeAxisView (_session, _route, _route->pannable(), @@ -1604,14 +1604,14 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection) } void -RouteTimeAxisView::maybe_hide_automation (bool hide, boost::weak_ptr wctrl) +RouteTimeAxisView::maybe_hide_automation (bool hide, std::weak_ptr wctrl) { ctrl_autohide_connection.disconnect (); if (!hide) { /* disconnect only, leave lane visible */ return; } - boost::shared_ptr ac = boost::dynamic_pointer_cast (wctrl.lock ()); + std::shared_ptr ac = std::dynamic_pointer_cast (wctrl.lock ()); if (!ac) { return; } @@ -1622,7 +1622,7 @@ RouteTimeAxisView::maybe_hide_automation (bool hide, boost::weak_ptr atav = find_atav_by_ctrl (ac); + std::shared_ptr atav = find_atav_by_ctrl (ac); if (atav) { atav->set_marked_for_display (false); request_redraw (); @@ -1630,9 +1630,9 @@ RouteTimeAxisView::maybe_hide_automation (bool hide, boost::weak_ptr wctrl) +RouteTimeAxisView::show_touched_automation (std::weak_ptr wctrl) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (wctrl.lock ()); + std::shared_ptr ac = std::dynamic_pointer_cast (wctrl.lock ()); if (!ac) { return; } @@ -1644,7 +1644,7 @@ RouteTimeAxisView::show_touched_automation (boost::weak_ptr w return; } - boost::shared_ptr atav; + std::shared_ptr atav; Gtk::CheckMenuItem* cmi = find_menu_item_by_ctrl (ac); if (!cmi) { atav = find_atav_by_ctrl (ac); @@ -1699,9 +1699,9 @@ RouteTimeAxisView::region_view_added (RegionView* rv) { /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */ for (Children::iterator i = children.begin(); i != children.end(); ++i) { - boost::shared_ptr atv; + std::shared_ptr atv; - if ((atv = boost::dynamic_pointer_cast (*i)) != 0) { + if ((atv = std::dynamic_pointer_cast (*i)) != 0) { atv->add_ghost(rv); } } @@ -1733,7 +1733,7 @@ RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pa } RouteTimeAxisView::ProcessorAutomationNode* -RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr processor, Evoral::Parameter what) +RouteTimeAxisView::find_processor_automation_node (std::shared_ptr processor, Evoral::Parameter what) { for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { @@ -1751,9 +1751,9 @@ RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr } Gtk::CheckMenuItem* -RouteTimeAxisView::find_menu_item_by_ctrl (boost::shared_ptr ac) +RouteTimeAxisView::find_menu_item_by_ctrl (std::shared_ptr ac) { - std::map, Gtk::CheckMenuItem*>::const_iterator i; + std::map, Gtk::CheckMenuItem*>::const_iterator i; i = ctrl_item_map.find (ac); if (i != ctrl_item_map.end ()) { return i->second; @@ -1761,8 +1761,8 @@ RouteTimeAxisView::find_menu_item_by_ctrl (boost::shared_ptr return 0; } -boost::shared_ptr -RouteTimeAxisView::find_atav_by_ctrl (boost::shared_ptr ac, bool route_owned_only) +std::shared_ptr +RouteTimeAxisView::find_atav_by_ctrl (std::shared_ptr ac, bool route_owned_only) { if (gain_track && gain_track->control () == ac) { return gain_track; @@ -1776,7 +1776,7 @@ RouteTimeAxisView::find_atav_by_ctrl (boost::shared_ptrget_mixbus()) { // XXX this can lead to inconsistent CheckMenuItem state (azimuth, width are treated separately) - for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { + for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { if ((*i)->control () == ac) { return *i; } @@ -1784,22 +1784,22 @@ RouteTimeAxisView::find_atav_by_ctrl (boost::shared_ptr (); + return std::shared_ptr (); } for (Children::iterator j = children.begin(); j != children.end(); ++j) { - boost::shared_ptr atv = boost::dynamic_pointer_cast (*j); + std::shared_ptr atv = std::dynamic_pointer_cast (*j); if (atv && atv->control () == ac) { return atv; } } - return boost::shared_ptr (); + return std::shared_ptr (); } /** Add an AutomationTimeAxisView to display automation for a processor's parameter */ void -RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr processor, Evoral::Parameter what) +RouteTimeAxisView::add_processor_automation_curve (std::shared_ptr processor, Evoral::Parameter what) { string name; ProcessorAutomationNode* pan; @@ -1818,10 +1818,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr return; } - boost::shared_ptr control - = boost::dynamic_pointer_cast(processor->control(what, true)); + std::shared_ptr control + = std::dynamic_pointer_cast(processor->control(what, true)); - pan->view = boost::shared_ptr( + pan->view = std::shared_ptr( new AutomationTimeAxisView (_session, _route, processor, control, control->parameter (), _editor, *this, false, parent_canvas, processor->describe_parameter (what), processor->name())); @@ -1836,7 +1836,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr } void -RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr) +RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, std::shared_ptr) { if (!_hidden) { pan->menu_item->set_active (false); @@ -1848,11 +1848,11 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process } void -RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr p) +RouteTimeAxisView::add_existing_processor_automation_curves (std::weak_ptr p) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); - if (!processor || boost::dynamic_pointer_cast (processor)) { + if (!processor || std::dynamic_pointer_cast (processor)) { /* The Amp processor is a special case and is dealt with separately */ return; } @@ -1863,7 +1863,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr& automatable = processor->what_can_be_automated (); for (std::set::const_iterator i = automatable.begin(); i != automatable.end(); ++i) { - boost::shared_ptr control = boost::dynamic_pointer_cast(processor->control(*i, false)); + std::shared_ptr control = std::dynamic_pointer_cast(processor->control(*i, false)); if (!control) { continue; } @@ -1878,9 +1878,9 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr::iterator i = existing.begin(); i != existing.end(); ++i) { Evoral::Parameter param (*i); - boost::shared_ptr al; + std::shared_ptr al; - boost::shared_ptr control = boost::dynamic_pointer_cast(processor->control(*i, false)); + std::shared_ptr control = std::dynamic_pointer_cast(processor->control(*i, false)); if (!control || control->flags () & Controllable::HiddenControl) { continue; } @@ -1894,9 +1894,9 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr p) +RouteTimeAxisView::add_processor_to_subplugin_menu (std::weak_ptr p) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor || !processor->display_to_user ()) { return; @@ -1907,7 +1907,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p option */ - if (boost::dynamic_pointer_cast (processor) != 0) { + if (std::dynamic_pointer_cast (processor) != 0) { return; } @@ -2012,7 +2012,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p } - boost::shared_ptr atav = pan->view; + std::shared_ptr atav = pan->view; bool visible; if (atav && atav->get_gui_property ("visible", visible)) { mitem->set_active(visible); @@ -2049,7 +2049,7 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto redraw = true; } - boost::shared_ptr atav = pan->view; + std::shared_ptr atav = pan->view; if (atav && atav->set_marked_for_display (showit)) { redraw = true; } @@ -2062,7 +2062,7 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto void RouteTimeAxisView::reread_midnam () { - boost::shared_ptr pi = boost::dynamic_pointer_cast (_route->the_instrument ()); + std::shared_ptr pi = std::dynamic_pointer_cast (_route->the_instrument ()); assert (pi); bool rv = pi->plugin ()->read_midnam(); @@ -2081,8 +2081,8 @@ void RouteTimeAxisView::processors_changed (RouteProcessorChange c) { if (_route) { - boost::shared_ptr the_instrument (_route->the_instrument()); - boost::shared_ptr pi = boost::dynamic_pointer_cast (the_instrument); + std::shared_ptr the_instrument (_route->the_instrument()); + std::shared_ptr pi = std::dynamic_pointer_cast (the_instrument); if (pi && pi->plugin ()->has_midnam ()) { midnam_connection.drop_connections (); the_instrument->DropReferences.connect (midnam_connection, invalidator (*this), @@ -2134,8 +2134,8 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) } } -boost::shared_ptr -RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr processor, Evoral::Parameter what) +std::shared_ptr +RouteTimeAxisView::find_processor_automation_curve (std::shared_ptr processor, Evoral::Parameter what) { ProcessorAutomationNode* pan; @@ -2145,7 +2145,7 @@ RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr } } - return boost::shared_ptr(); + return std::shared_ptr(); } void @@ -2165,7 +2165,7 @@ RouteTimeAxisView::can_edit_name () const } /* we do not allow track name changes if it is record enabled */ - boost::shared_ptr trk (boost::dynamic_pointer_cast (_route)); + std::shared_ptr trk (std::dynamic_pointer_cast (_route)); if (!trk) { return true; } @@ -2459,7 +2459,7 @@ RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param) void RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, bool show) { - boost::shared_ptr c = _route->gain_control(); + std::shared_ptr c = _route->gain_control(); if (!c) { error << "Route has no gain automation, unable to add automation track view." << endmsg; return; @@ -2483,7 +2483,7 @@ RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, void RouteTimeAxisView::create_trim_automation_child (const Evoral::Parameter& param, bool show) { - boost::shared_ptr c = _route->trim()->gain_control(); + std::shared_ptr c = _route->trim()->gain_control(); if (!c || ! _route->trim()->active()) { return; } @@ -2506,7 +2506,7 @@ RouteTimeAxisView::create_trim_automation_child (const Evoral::Parameter& param, void RouteTimeAxisView::create_mute_automation_child (const Evoral::Parameter& param, bool show) { - boost::shared_ptr c = _route->mute_control(); + std::shared_ptr c = _route->mute_control(); if (!c) { error << "Route has no mute automation, unable to add automation track view." << endmsg; return; @@ -2541,7 +2541,7 @@ RouteTimeAxisView::combine_regions () } RegionList selected_regions; - boost::shared_ptr playlist = track()->playlist(); + std::shared_ptr playlist = track()->playlist(); _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions)); @@ -2550,7 +2550,7 @@ RouteTimeAxisView::combine_regions () } playlist->clear_changes (); - boost::shared_ptr compound_region = playlist->combine (selected_regions, track()); + std::shared_ptr compound_region = playlist->combine (selected_regions, track()); _session->add_command (new StatefulDiffCommand (playlist)); /* make the new region be selected */ @@ -2572,7 +2572,7 @@ RouteTimeAxisView::uncombine_regions () } RegionList selected_regions; - boost::shared_ptr playlist = track()->playlist(); + std::shared_ptr playlist = track()->playlist(); /* have to grab selected regions first because the uncombine is going * to change that in the middle of the list traverse @@ -2597,11 +2597,11 @@ RouteTimeAxisView::state_id() const void -RouteTimeAxisView::remove_child (boost::shared_ptr c) +RouteTimeAxisView::remove_child (std::shared_ptr c) { TimeAxisView::remove_child (c); - boost::shared_ptr a = boost::dynamic_pointer_cast (c); + std::shared_ptr a = std::dynamic_pointer_cast (c); if (a) { for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { if (i->second == a) { @@ -2612,7 +2612,7 @@ RouteTimeAxisView::remove_child (boost::shared_ptr c) } } -boost::shared_ptr +std::shared_ptr RouteTimeAxisView::automation_child(Evoral::Parameter param, PBD::ID ctrl_id) { if (param.type() != PluginAutomation) { @@ -2620,26 +2620,26 @@ RouteTimeAxisView::automation_child(Evoral::Parameter param, PBD::ID ctrl_id) } for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { - boost::shared_ptr atv ((*ii)->view); + std::shared_ptr atv ((*ii)->view); if (atv->control()->id() == ctrl_id) { return atv; } } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr RouteTimeAxisView::automation_child_by_alist_id (PBD::ID alist_id) { for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { - boost::shared_ptr atv ((*ii)->view); + std::shared_ptr atv ((*ii)->view); if (!atv) { continue; } - list > lines = atv->lines(); - for (list >::const_iterator li = lines.begin(); li != lines.end(); ++li) { + list > lines = atv->lines(); + for (list >::const_iterator li = lines.begin(); li != lines.end(); ++li) { if ((*li)->the_list()->id() == alist_id) { return *li; } diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index fdf30cc5c7..39727bda67 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -85,9 +85,9 @@ public: bool marked_for_display () const; bool set_marked_for_display (bool); - boost::shared_ptr stripable() const { return RouteUI::stripable(); } + std::shared_ptr stripable() const { return RouteUI::stripable(); } - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); void show_selection (TimeSelection&); void set_button_names (); @@ -107,7 +107,7 @@ public: void toggle_layer_display (); LayerDisplay layer_display () const; - boost::shared_ptr find_next_region (ARDOUR::timepos_t const & pos, ARDOUR::RegionPoint, int32_t dir); + std::shared_ptr find_next_region (ARDOUR::timepos_t const & pos, ARDOUR::RegionPoint, int32_t dir); ARDOUR::timepos_t find_next_region_boundary (ARDOUR::timepos_t const & pos, int32_t dir); /* Editing operations */ @@ -126,11 +126,11 @@ public: int set_state (const XMLNode&, int version); virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter); - virtual boost::shared_ptr automation_child(Evoral::Parameter param, PBD::ID ctrl_id = PBD::ID(0)); + virtual std::shared_ptr automation_child(Evoral::Parameter param, PBD::ID ctrl_id = PBD::ID(0)); StreamView* view() const { return _view; } ARDOUR::RouteGroup* route_group() const; - boost::shared_ptr playlist() const; + std::shared_ptr playlist() const; void fast_update (); void hide_meter (); @@ -156,7 +156,7 @@ protected: struct ProcessorAutomationNode { Evoral::Parameter what; Gtk::CheckMenuItem* menu_item; - boost::shared_ptr view; + std::shared_ptr view; RouteTimeAxisView& parent; ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) @@ -166,12 +166,12 @@ protected: }; struct ProcessorAutomationInfo { - boost::shared_ptr processor; + std::shared_ptr processor; bool valid; Gtk::Menu* menu; std::vector lines; - ProcessorAutomationInfo (boost::shared_ptr i) + ProcessorAutomationInfo (std::shared_ptr i) : processor (i), valid (true), menu (0) {} ~ProcessorAutomationInfo (); @@ -184,34 +184,34 @@ protected: virtual void processors_changed (ARDOUR::RouteProcessorChange); - virtual void add_processor_to_subplugin_menu (boost::weak_ptr); + virtual void add_processor_to_subplugin_menu (std::weak_ptr); void remove_processor_automation_node (ProcessorAutomationNode* pan); void processor_menu_item_toggled (RouteTimeAxisView::ProcessorAutomationInfo*, RouteTimeAxisView::ProcessorAutomationNode*); void processor_automation_track_hidden (ProcessorAutomationNode*, - boost::shared_ptr); + std::shared_ptr); ProcessorAutomationNode* - find_processor_automation_node (boost::shared_ptr i, Evoral::Parameter); + find_processor_automation_node (std::shared_ptr i, Evoral::Parameter); /* O(log(N)) lookup of menu-item by AC */ Gtk::CheckMenuItem* - find_menu_item_by_ctrl (boost::shared_ptr); + find_menu_item_by_ctrl (std::shared_ptr); /* O(1) IFF route_owned_only == true, O(N) otherwise */ - boost::shared_ptr - find_atav_by_ctrl (boost::shared_ptr, bool route_owned_only = true); + std::shared_ptr + find_atav_by_ctrl (std::shared_ptr, bool route_owned_only = true); - boost::shared_ptr - find_processor_automation_curve (boost::shared_ptr i, Evoral::Parameter); + std::shared_ptr + find_processor_automation_curve (std::shared_ptr i, Evoral::Parameter); - void add_processor_automation_curve (boost::shared_ptr r, Evoral::Parameter); - void add_existing_processor_automation_curves (boost::weak_ptr); + void add_processor_automation_curve (std::shared_ptr r, Evoral::Parameter); + void add_existing_processor_automation_curves (std::weak_ptr); - boost::shared_ptr automation_child_by_alist_id (PBD::ID); + std::shared_ptr automation_child_by_alist_id (PBD::ID); void reset_processor_automation_curves (); @@ -272,9 +272,9 @@ protected: */ std::list processor_automation; - std::map, Gtk::CheckMenuItem*> ctrl_item_map; + std::map, Gtk::CheckMenuItem*> ctrl_item_map; - typedef std::vector > ProcessorAutomationCurves; + typedef std::vector > ProcessorAutomationCurves; ProcessorAutomationCurves processor_automation_curves; /** parameter -> menu item map for the plugin automation menu */ ParameterMenuMap _subplugin_menu_map; @@ -303,17 +303,17 @@ protected: */ void ensure_pan_views (bool show = true); - std::list > pan_tracks; + std::list > pan_tracks; Gtk::CheckMenuItem* pan_automation_item; private: - void remove_child (boost::shared_ptr); + void remove_child (std::shared_ptr); void update_playlist_tip (); void parameter_changed (std::string const & p); void update_track_number_visibility(); - void show_touched_automation (boost::weak_ptr); - void maybe_hide_automation (bool, boost::weak_ptr); + void show_touched_automation (std::weak_ptr); + void maybe_hide_automation (bool, std::weak_ptr); void drop_instrument_ref (); void reread_midnam (); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 960485e93f..bb075dadfa 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -96,8 +96,8 @@ using namespace PBD; using namespace std; uint32_t RouteUI::_max_invert_buttons = 3; -PBD::Signal1 > RouteUI::BusSendDisplayChanged; -boost::weak_ptr RouteUI::_showing_sends_to; +PBD::Signal1 > RouteUI::BusSendDisplayChanged; +std::weak_ptr RouteUI::_showing_sends_to; std::string RouteUI::program_port_prefix; RouteUI::IOSelectorMap RouteUI::input_selectors; @@ -106,7 +106,7 @@ RouteUI::IOSelectorMap RouteUI::output_selectors; #define GROUP_ACTION (Config->get_group_override_inverts () ? Controllable::InverseGroup : Controllable::NoGroup) void -RouteUI::delete_ioselector (IOSelectorMap& m, boost::shared_ptr r) +RouteUI::delete_ioselector (IOSelectorMap& m, std::shared_ptr r) { if (!r) { return; @@ -324,7 +324,7 @@ RouteUI::set_session (ARDOUR::Session*s) } void -RouteUI::set_route (boost::shared_ptr rp) +RouteUI::set_route (std::shared_ptr rp) { reset (); @@ -398,7 +398,7 @@ RouteUI::set_route (boost::shared_ptr rp) _route->polarity()->ConfigurationChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context()); if (_session->writable() && is_track()) { - boost::shared_ptr t = boost::dynamic_pointer_cast(_route); + std::shared_ptr t = std::dynamic_pointer_cast(_route); t->rec_enable_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context()); t->rec_safe_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context()); @@ -418,7 +418,7 @@ RouteUI::set_route (boost::shared_ptr rp) */ if (is_track()) { - boost::shared_ptr t = boost::dynamic_pointer_cast(_route); + std::shared_ptr t = std::dynamic_pointer_cast(_route); t->monitoring_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_monitoring_display, this), gui_context()); update_monitoring_display (); @@ -443,7 +443,7 @@ RouteUI::set_route (boost::shared_ptr rp) setup_invert_buttons (); - boost::shared_ptr s = _showing_sends_to.lock (); + std::shared_ptr s = _showing_sends_to.lock (); bus_send_display_changed (s); update_mute_display (); @@ -501,7 +501,7 @@ RouteUI::mute_press (GdkEventButton* ev) * on a copy. */ - boost::shared_ptr copy (new RouteList); + std::shared_ptr copy (new RouteList); *copy = *_session->get_routes (); @@ -534,7 +534,7 @@ RouteUI::mute_press (GdkEventButton* ev) NOTE: Primary-button2 is MIDI learn. */ - boost::shared_ptr rl; + std::shared_ptr rl; if (ev->button == 1) { @@ -545,7 +545,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->set (rl); } - boost::shared_ptr mc = _route->mute_control(); + std::shared_ptr mc = _route->mute_control(); mc->start_touch (timepos_t (_session->audible_sample ())); _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup); } @@ -554,14 +554,14 @@ RouteUI::mute_press (GdkEventButton* ev) /* plain click applies change to this route */ - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (_route); if (_mute_release) { _mute_release->set (rl); } - boost::shared_ptr mc = _route->mute_control(); + std::shared_ptr mc = _route->mute_control(); mc->start_touch (timepos_t (_session->audible_sample ())); mc->set_value (!_route->muted_by_self(), Controllable::UseGroup); } @@ -588,8 +588,8 @@ RouteUI::mute_release (GdkEventButton* /*ev*/) void RouteUI::edit_output_configuration () { - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); - if (send && !boost::dynamic_pointer_cast(send)) { + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); + if (send && !std::dynamic_pointer_cast(send)) { send.reset (); } @@ -693,7 +693,7 @@ RouteUI::solo_press(GdkEventButton* ev) NOTE: Primary-button2 is MIDI learn. */ - boost::shared_ptr rl; + std::shared_ptr rl; if (ev->button == 1) { @@ -723,7 +723,7 @@ RouteUI::solo_press(GdkEventButton* ev) /* click: solo this route */ - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (route()); if (_solo_release) { @@ -794,7 +794,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) if (ev->button == 1) { - boost::shared_ptr rl; + std::shared_ptr rl; rl.reset (new RouteList); rl->push_back (_route); @@ -808,7 +808,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) } else { - boost::shared_ptr trk = track(); + std::shared_ptr trk = track(); trk->rec_enable_control()->set_value (!trk->rec_enable_control()->get_value(), Controllable::UseGroup); } } @@ -823,7 +823,7 @@ RouteUI::update_monitoring_display () return; } - boost::shared_ptr t = boost::dynamic_pointer_cast(_route); + std::shared_ptr t = std::dynamic_pointer_cast(_route); if (!t) { return; @@ -883,14 +883,14 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice) return false; } - boost::shared_ptr t = boost::dynamic_pointer_cast(_route); + std::shared_ptr t = std::dynamic_pointer_cast(_route); if (!t) { return true; } MonitorChoice mc; - boost::shared_ptr rl; + std::shared_ptr rl; if (t->monitoring_control()->monitoring_choice() & monitor_choice) { mc = MonitorChoice (t->monitoring_control()->monitoring_choice() & ~monitor_choice); @@ -960,7 +960,7 @@ RouteUI::toggle_step_edit () void RouteUI::toggle_rec_safe () { - boost::shared_ptr rs = _route->rec_safe_control(); + std::shared_ptr rs = _route->rec_safe_control(); if (!rs) { return; @@ -1082,7 +1082,7 @@ RouteUI::create_sends (Placement p, bool include_buses) void RouteUI::create_selected_sends (Placement p, bool include_buses) { - boost::shared_ptr rlist (new RouteList); + std::shared_ptr rlist (new RouteList); TrackSelection& selected_tracks (ARDOUR_UI::instance()->the_editor().get_selection().tracks); for (TrackSelection::iterator i = selected_tracks.begin(); i != selected_tracks.end(); ++i) { @@ -1090,7 +1090,7 @@ RouteUI::create_selected_sends (Placement p, bool include_buses) RouteUI* rui; if ((rtv = dynamic_cast(*i)) != 0) { if ((rui = dynamic_cast(rtv)) != 0) { - if (include_buses || boost::dynamic_pointer_cast(rui->route())) { + if (include_buses || std::dynamic_pointer_cast(rui->route())) { rlist->push_back (rui->route()); } } @@ -1142,11 +1142,11 @@ RouteUI::show_sends_press(GdkEventButton* ev) } else if (ev->button == 1) { - boost::shared_ptr s = _showing_sends_to.lock (); + std::shared_ptr s = _showing_sends_to.lock (); if (s == _route) { - set_showing_sends_to (boost::shared_ptr ()); - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + set_showing_sends_to (std::shared_ptr ()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } else { set_showing_sends_to (_route); Mixer_UI::instance()->show_spill (_route); @@ -1179,9 +1179,9 @@ RouteUI::send_blink (bool onoff) } Gtkmm2ext::ActiveState -RouteUI::solo_active_state (boost::shared_ptr s) +RouteUI::solo_active_state (std::shared_ptr s) { - boost::shared_ptr sc = s->solo_control(); + std::shared_ptr sc = s->solo_control(); if (!sc) { return Gtkmm2ext::Off; @@ -1202,9 +1202,9 @@ RouteUI::solo_active_state (boost::shared_ptr s) } Gtkmm2ext::ActiveState -RouteUI::solo_isolate_active_state (boost::shared_ptr s) +RouteUI::solo_isolate_active_state (std::shared_ptr s) { - boost::shared_ptr sc = s->solo_isolate_control(); + std::shared_ptr sc = s->solo_isolate_control(); if (!sc) { return Gtkmm2ext::Off; @@ -1222,9 +1222,9 @@ RouteUI::solo_isolate_active_state (boost::shared_ptr s) } Gtkmm2ext::ActiveState -RouteUI::solo_safe_active_state (boost::shared_ptr s) +RouteUI::solo_safe_active_state (std::shared_ptr s) { - boost::shared_ptr sc = s->solo_safe_control(); + std::shared_ptr sc = s->solo_safe_control(); if (!sc) { return Gtkmm2ext::Off; @@ -1289,9 +1289,9 @@ RouteUI::solo_changed_so_update_mute () } ActiveState -RouteUI::mute_active_state (Session*, boost::shared_ptr s) +RouteUI::mute_active_state (Session*, std::shared_ptr s) { - boost::shared_ptr mc = s->mute_control(); + std::shared_ptr mc = s->mute_control(); if (s->is_monitor()) { return Gtkmm2ext::Off; @@ -1361,7 +1361,7 @@ RouteUI::blink_rec_display (bool blinkOn) return; } - if (boost::dynamic_pointer_cast(_current_delivery)) { + if (std::dynamic_pointer_cast(_current_delivery)) { return; } @@ -1540,7 +1540,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev) /* flip just this route */ - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (_route); _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup); } @@ -1562,7 +1562,7 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev) if (ev->button == 1) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - boost::shared_ptr rl (_session->get_routes()); + std::shared_ptr rl (_session->get_routes()); if (model) { /* disable solo safe for all routes */ DisplaySuspender ds; @@ -1863,7 +1863,7 @@ RouteUI::disconnect_output () bool RouteUI::is_track () const { - return boost::dynamic_pointer_cast(_route) != 0; + return std::dynamic_pointer_cast(_route) != 0; } bool @@ -1878,34 +1878,34 @@ RouteUI::is_foldbackbus () const return _route && _route->is_foldbackbus (); } -boost::shared_ptr +std::shared_ptr RouteUI::track() const { - return boost::dynamic_pointer_cast(_route); + return std::dynamic_pointer_cast(_route); } bool RouteUI::is_audio_track () const { - return boost::dynamic_pointer_cast(_route) != 0; + return std::dynamic_pointer_cast(_route) != 0; } -boost::shared_ptr +std::shared_ptr RouteUI::audio_track() const { - return boost::dynamic_pointer_cast(_route); + return std::dynamic_pointer_cast(_route); } bool RouteUI::is_midi_track () const { - return boost::dynamic_pointer_cast(_route) != 0; + return std::dynamic_pointer_cast(_route) != 0; } -boost::shared_ptr +std::shared_ptr RouteUI::midi_track() const { - return boost::dynamic_pointer_cast(_route); + return std::dynamic_pointer_cast(_route); } bool @@ -2052,10 +2052,10 @@ RouteUI::setup_invert_buttons () { uint32_t N = _route ? _route->phase_control()->size() : 0; - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); send_connections.drop_connections (); if (send) { - boost::shared_ptr ac = send->polarity_control (); + std::shared_ptr ac = send->polarity_control (); if (ac) { N = 1; ac->Changed.connect (send_connections, invalidator (*this), boost::bind (&RouteUI::update_polarity_display, this), gui_context()); @@ -2119,7 +2119,7 @@ RouteUI::setup_invert_buttons () void RouteUI::update_polarity_display () { - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); if (send) { if (send->polarity_control()) { ArdourButton* b = _invert_buttons.front (); @@ -2163,7 +2163,7 @@ RouteUI::update_polarity_display () void RouteUI::update_polarity_tooltips () { - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); int i = 0; for (auto const& b : _invert_buttons) { if (send) { @@ -2182,7 +2182,7 @@ RouteUI::invert_release (GdkEventButton* ev, uint32_t i) if (ev->button == 1 && i < _invert_buttons.size()) { uint32_t const N = _route->phase_control()->size(); if (N <= _max_invert_buttons) { - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); if (send) { send->polarity_control ()->set_value (_invert_buttons[i]->get_active() ? 0 : 1, Controllable::NoGroup); return false; @@ -2209,7 +2209,7 @@ RouteUI::invert_press (GdkEventButton* ev) return false; } - if (boost::dynamic_pointer_cast(_current_delivery)) { + if (std::dynamic_pointer_cast(_current_delivery)) { /* do not show context menu for send polarity */ return false; } @@ -2246,9 +2246,9 @@ void RouteUI::update_phase_invert_sensitivty () { bool yn = false; - boost::shared_ptr send = boost::dynamic_pointer_cast(_current_delivery); + std::shared_ptr send = std::dynamic_pointer_cast(_current_delivery); if (send) { - boost::shared_ptr ac = send->polarity_control (); + std::shared_ptr ac = send->polarity_control (); if (ac) { yn = (ac->alist()->automation_state() & Play) == 0; } @@ -2316,14 +2316,14 @@ RouteUI::route_color_tint () const } void -RouteUI::set_showing_sends_to (boost::shared_ptr send_to) +RouteUI::set_showing_sends_to (std::shared_ptr send_to) { _showing_sends_to = send_to; BusSendDisplayChanged (send_to); /* EMIT SIGNAL */ } void -RouteUI::bus_send_display_changed (boost::shared_ptr send_to) +RouteUI::bus_send_display_changed (std::shared_ptr send_to) { if (_route == send_to) { show_sends_button->set_active (true); @@ -2341,13 +2341,13 @@ RouteUI::route_group() const } void -RouteUI::help_count_plugins (boost::weak_ptr p, uint32_t* plugin_insert_cnt) +RouteUI::help_count_plugins (std::weak_ptr p, uint32_t* plugin_insert_cnt) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor || !processor->display_to_user()) { return; } - boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); + std::shared_ptr pi = std::dynamic_pointer_cast (processor); #ifdef MIXBUS if (pi && pi->is_channelstrip ()) { return; @@ -2358,9 +2358,9 @@ RouteUI::help_count_plugins (boost::weak_ptr p, uint32_t* plugin_inse } } -RoutePinWindowProxy::RoutePinWindowProxy(std::string const &name, boost::shared_ptr route) +RoutePinWindowProxy::RoutePinWindowProxy(std::string const &name, std::shared_ptr route) : WM::ProxyBase (name, string()) - , _route (boost::weak_ptr (route)) + , _route (std::weak_ptr (route)) { route->DropReferences.connect (going_away_connection, MISSING_INVALIDATOR, boost::bind (&RoutePinWindowProxy::route_going_away, this), gui_context()); } @@ -2381,7 +2381,7 @@ RoutePinWindowProxy::session_handle () Gtk::Window* RoutePinWindowProxy::get (bool create) { - boost::shared_ptr r = _route.lock (); + std::shared_ptr r = _route.lock (); if (!r) { return 0; } @@ -2462,7 +2462,7 @@ RouteUI::mark_hidden (bool yn) return false; } -boost::shared_ptr +std::shared_ptr RouteUI::stripable () const { return _route; @@ -2507,7 +2507,7 @@ RouteUI::playlist_tip () const } std::string -RouteUI::resolve_new_group_playlist_name (std::string const& basename, vector > const& playlists) +RouteUI::resolve_new_group_playlist_name (std::string const& basename, vector > const& playlists) { std::string ret (basename); @@ -2515,7 +2515,7 @@ RouteUI::resolve_new_group_playlist_name (std::string const& basename, vector >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (vector >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { std::string tmp = (*i)->name(); std::string::size_type idx = tmp.find(group_string); @@ -2542,14 +2542,14 @@ RouteUI::resolve_new_group_playlist_name (std::string const& basename, vector > const& playlists_before_op, bool copy) +RouteUI::use_new_playlist (std::string name, std::string gid, vector > const& playlists_before_op, bool copy) { - boost::shared_ptr tr = track (); + std::shared_ptr tr = track (); if (!tr) { return; } - boost::shared_ptr pl = tr->playlist(); + std::shared_ptr pl = tr->playlist(); if (!pl) { return; } @@ -2566,12 +2566,12 @@ RouteUI::use_new_playlist (std::string name, std::string gid, vector tr = track (); + std::shared_ptr tr = track (); if (!tr) { return; } - boost::shared_ptr pl = tr->playlist(); + std::shared_ptr pl = tr->playlist(); if (!pl) { return; } @@ -2599,23 +2599,23 @@ RouteUI::build_playlist_menu () playlist_items.clear(); RadioMenuItem::Group playlist_group; - boost::shared_ptr tr = track (); + std::shared_ptr tr = track (); - vector > playlists_tr = _session->playlists()->playlists_for_track (tr); + vector > playlists_tr = _session->playlists()->playlists_for_track (tr); /* sort the playlists */ PlaylistSorterByID cmp; sort (playlists_tr.begin(), playlists_tr.end(), cmp); /* add the playlists to the menu */ - for (vector >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) { + for (vector >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) { string text = (*i)->name(); playlist_items.push_back (RadioMenuElem (playlist_group, text)); RadioMenuItem *item = static_cast(&playlist_items.back()); if (tr->playlist()->id() == (*i)->id()) { item->set_active(); } - item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::use_playlist), item, boost::weak_ptr (*i))); + item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::use_playlist), item, std::weak_ptr (*i))); } playlist_items.push_back (SeparatorElem()); @@ -2650,7 +2650,7 @@ RouteUI::build_playlist_menu () } void -RouteUI::use_playlist (RadioMenuItem *item, boost::weak_ptr wpl) +RouteUI::use_playlist (RadioMenuItem *item, std::weak_ptr wpl) { // exit if we were triggered by deactivating the old playlist if (item && !item->get_active()) { @@ -2662,13 +2662,13 @@ RouteUI::use_playlist (RadioMenuItem *item, boost::weak_ptr wpl) void -RouteUI::select_playlist_matching (boost::weak_ptr wpl) +RouteUI::select_playlist_matching (std::weak_ptr wpl) { if (!is_track()) { return; } - boost::shared_ptr pl (wpl.lock()); + std::shared_ptr pl (wpl.lock()); if (!pl) { return; @@ -2692,7 +2692,7 @@ RouteUI::select_playlist_matching (boost::weak_ptr wpl) /* Search for a matching playlist .. either by pgroup_id or name */ std::string pgrp_id = pl->pgroup_id(); - boost::shared_ptr ipl = session()->playlists()->for_pgroup(pgrp_id, track()->id()); + std::shared_ptr ipl = session()->playlists()->for_pgroup(pgrp_id, track()->id()); if (ipl) { //found a playlist that matches the pgroup_id, use it track()->use_playlist (track()->data_type(), ipl); @@ -2711,7 +2711,7 @@ RouteUI::select_playlist_matching (boost::weak_ptr wpl) take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name std::string playlist_name = track()->name()+group_string+take_name; - boost::shared_ptr ipl = session()->playlists()->by_name(playlist_name); + std::shared_ptr ipl = session()->playlists()->by_name(playlist_name); if (ipl) { track()->use_playlist(track()->data_type(), ipl); } @@ -2773,12 +2773,12 @@ RouteUI::rename_current_playlist () Prompter prompter (true); string name; - boost::shared_ptr tr = track(); + std::shared_ptr tr = track(); if (!tr) { return; } - boost::shared_ptr pl = tr->playlist(); + std::shared_ptr pl = tr->playlist(); if (!pl) { return; } @@ -2805,8 +2805,8 @@ RouteUI::rename_current_playlist () } if (name.length()) { - vector > playlists_gr = _session->playlists()->playlists_for_pgroup (pl->pgroup_id()); - for (vector >::iterator i = playlists_gr.begin(); i != playlists_gr.end(); ++i) { + vector > playlists_gr = _session->playlists()->playlists_for_pgroup (pl->pgroup_id()); + for (vector >::iterator i = playlists_gr.begin(); i != playlists_gr.end(); ++i) { (*i)->set_name (name); } } diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 41015f2e35..23d5a81ab1 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -75,14 +75,14 @@ class SaveTemplateDialog; class RoutePinWindowProxy : public WM::ProxyBase { public: - RoutePinWindowProxy (std::string const&, boost::shared_ptr); + RoutePinWindowProxy (std::string const&, std::shared_ptr); ~RoutePinWindowProxy (); Gtk::Window* get (bool create = false); ARDOUR::SessionHandlePtr* session_handle (); private: - boost::weak_ptr _route; + std::weak_ptr _route; void route_going_away (); PBD::ScopedConnection going_away_connection; @@ -95,10 +95,10 @@ public: virtual ~RouteUI (); - boost::shared_ptr stripable () const; + std::shared_ptr stripable () const; virtual void set_session (ARDOUR::Session*); - virtual void set_route (boost::shared_ptr); + virtual void set_route (std::shared_ptr); virtual void set_button_names () = 0; bool is_track () const; @@ -108,15 +108,15 @@ public: bool is_midi_track () const; bool has_audio_outputs () const; - boost::shared_ptr route () const + std::shared_ptr route () const { return _route; } ARDOUR::RouteGroup* route_group () const; - boost::shared_ptr track () const; - boost::shared_ptr audio_track () const; - boost::shared_ptr midi_track () const; + std::shared_ptr track () const; + std::shared_ptr audio_track () const; + std::shared_ptr midi_track () const; Gdk::Color route_color () const; Gdk::Color route_color_tint () const; @@ -160,18 +160,18 @@ public: void fan_out (bool to_busses = true, bool group = true); /* The editor calls these when mapping an operation across multiple tracks */ - void use_new_playlist (std::string name, std::string group_id, std::vector > const&, bool copy); + void use_new_playlist (std::string name, std::string group_id, std::vector > const&, bool copy); void clear_playlist (); - void use_playlist (Gtk::RadioMenuItem* item, boost::weak_ptr wpl); - void select_playlist_matching (boost::weak_ptr wpl); + void use_playlist (Gtk::RadioMenuItem* item, std::weak_ptr wpl); + void select_playlist_matching (std::weak_ptr wpl); void show_playlist_selector (); /* used by EditorRoutes */ - static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr); - static Gtkmm2ext::ActiveState solo_isolate_active_state (boost::shared_ptr); - static Gtkmm2ext::ActiveState solo_safe_active_state (boost::shared_ptr); - static Gtkmm2ext::ActiveState mute_active_state (ARDOUR::Session*, boost::shared_ptr); + static Gtkmm2ext::ActiveState solo_active_state (std::shared_ptr); + static Gtkmm2ext::ActiveState solo_isolate_active_state (std::shared_ptr); + static Gtkmm2ext::ActiveState solo_safe_active_state (std::shared_ptr); + static Gtkmm2ext::ActiveState mute_active_state (ARDOUR::Session*, std::shared_ptr); protected: virtual void set_color (uint32_t c); @@ -199,8 +199,8 @@ protected: Gtk::Menu* solo_menu; Gtk::Menu* sends_menu; - boost::shared_ptr _route; - boost::shared_ptr _current_delivery; + std::shared_ptr _route; + std::shared_ptr _current_delivery; Gtk::CheckMenuItem* pre_fader_mute_check; Gtk::CheckMenuItem* post_fader_mute_check; @@ -216,9 +216,9 @@ protected: static IOSelectorMap input_selectors; static IOSelectorMap output_selectors; - static void delete_ioselector (IOSelectorMap&, boost::shared_ptr); + static void delete_ioselector (IOSelectorMap&, std::shared_ptr); - static void help_count_plugins (boost::weak_ptr p, uint32_t*); + static void help_count_plugins (std::weak_ptr p, uint32_t*); PBD::ScopedConnectionList route_connections; PBD::ScopedConnectionList send_connections; @@ -236,7 +236,7 @@ protected: virtual void stop_step_editing () {} virtual void create_sends (ARDOUR::Placement, bool); virtual void create_selected_sends (ARDOUR::Placement, bool); - virtual void bus_send_display_changed (boost::shared_ptr); + virtual void bus_send_display_changed (std::shared_ptr); bool mark_hidden (bool yn); void setup_invert_buttons (); @@ -257,7 +257,7 @@ protected: Gtk::CheckMenuItem* denormal_menu_item; - static void set_showing_sends_to (boost::shared_ptr); + static void set_showing_sends_to (std::shared_ptr); static std::string program_port_prefix; ARDOUR::SoloMuteRelease* _solo_release; @@ -312,7 +312,7 @@ private: void save_as_template_dialog_response (int response, SaveTemplateDialog* d); - std::string resolve_new_group_playlist_name (std::string const&, std::vector > const&); + std::string resolve_new_group_playlist_name (std::string const&, std::vector > const&); PlaylistSelector* _playlist_selector; @@ -339,9 +339,9 @@ private: * by a click on the `Sends' button. The parameter is the route that the sends are * to, or 0 if no route is now in this mode. */ - static PBD::Signal1 > BusSendDisplayChanged; + static PBD::Signal1 > BusSendDisplayChanged; - static boost::weak_ptr _showing_sends_to; + static std::weak_ptr _showing_sends_to; static uint32_t _max_invert_buttons; }; diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index a32d0c3c12..7e50f5f0ac 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -241,7 +241,7 @@ Selection::trigger_regionview_proxy () const } void -Selection::toggle (boost::shared_ptr pl) +Selection::toggle (std::shared_ptr pl) { clear_time(); // enforce object/range exclusivity clear_tracks(); // enforce object/track exclusivity @@ -345,7 +345,7 @@ Selection::toggle (timepos_t const & start, timepos_t const & end) } void -Selection::add (boost::shared_ptr pl) +Selection::add (std::shared_ptr pl) { if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) { @@ -359,11 +359,11 @@ Selection::add (boost::shared_ptr pl) } void -Selection::add (const list >& pllist) +Selection::add (const list >& pllist) { bool changed = false; - for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { + for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { if (find (playlists.begin(), playlists.end(), (*i)) == playlists.end()) { (*i)->use (); playlists.push_back (*i); @@ -519,9 +519,9 @@ Selection::replace (uint32_t sid, timepos_t const & start, timepos_t const & end } void -Selection::add (boost::shared_ptr cl) +Selection::add (std::shared_ptr cl) { - boost::shared_ptr al = boost::dynamic_pointer_cast(cl); + std::shared_ptr al = std::dynamic_pointer_cast(cl); if (!al) { warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg; @@ -539,7 +539,7 @@ Selection::add (boost::shared_ptr cl) * the downside is that we can't perform duplicate checks. * This code was changed in response to #6842 */ - lines.push_back (boost::shared_ptr (new ARDOUR::AutomationList(*al))); + lines.push_back (std::shared_ptr (new ARDOUR::AutomationList(*al))); LinesChanged(); } @@ -586,9 +586,9 @@ Selection::remove (MidiCutBuffer* midi) } void -Selection::remove (boost::shared_ptr track) +Selection::remove (std::shared_ptr track) { - list >::iterator i; + list >::iterator i; if ((i = find (playlists.begin(), playlists.end(), track)) != playlists.end()) { playlists.erase (i); PlaylistsChanged(); @@ -596,13 +596,13 @@ Selection::remove (boost::shared_ptr track) } void -Selection::remove (const list >& pllist) +Selection::remove (const list >& pllist) { bool changed = false; - for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { + for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { - list >::iterator x; + list >::iterator x; if ((x = find (playlists.begin(), playlists.end(), (*i))) != playlists.end()) { playlists.erase (x); @@ -654,7 +654,7 @@ Selection::remove (samplepos_t /*start*/, samplepos_t /*end*/) } void -Selection::remove (boost::shared_ptr ac) +Selection::remove (std::shared_ptr ac) { AutomationSelection::iterator i; if ((i = find (lines.begin(), lines.end(), ac)) != lines.end()) { @@ -676,7 +676,7 @@ Selection::set (const MidiNoteSelection& midi_list) } void -Selection::set (boost::shared_ptr playlist) +Selection::set (std::shared_ptr playlist) { if (playlist) { clear_time (); // enforce region/object exclusivity @@ -688,7 +688,7 @@ Selection::set (boost::shared_ptr playlist) } void -Selection::set (const list >& pllist) +Selection::set (const list >& pllist) { if (!pllist.empty()) { clear_time(); // enforce region/object exclusivity @@ -796,7 +796,7 @@ Selection::set_preserving_all_ranges (timepos_t const & start, timepos_t const & } void -Selection::set (boost::shared_ptr ac) +Selection::set (std::shared_ptr ac) { clear_time(); // enforce region/object exclusivity clear_tracks(); // enforce object/track exclusivity @@ -1144,15 +1144,15 @@ Selection::get_state () const } /* midi region views have thir own internal selection. */ - list > > > > rid_notes; + list > > > > rid_notes; editor->get_per_region_note_selection (rid_notes); - list > > > >::iterator rn_it; + list > > > >::iterator rn_it; for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) { XMLNode* n = node->add_child (X_("MIDINotes")); n->set_property (X_("region-id"), (*rn_it).first); - for (std::set > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) { + for (std::set > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) { XMLNode* nc = n->add_child(X_("note")); nc->set_property(X_("note-id"), (*i)->id()); } @@ -1307,7 +1307,7 @@ Selection::set_state (XMLNode const & node, int) vector cps; if (stv) { - boost::shared_ptr li = stv->automation_child_by_alist_id (alist_id); + std::shared_ptr li = stv->automation_child_by_alist_id (alist_id); if (li) { ControlPoint* cp = li->nth(view_index); if (cp) { @@ -1336,7 +1336,7 @@ Selection::set_state (XMLNode const & node, int) for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { AudioRegionView* arv = dynamic_cast (*rsi); if (arv) { - boost::shared_ptr gl = arv->get_gain_line (); + std::shared_ptr gl = arv->get_gain_line (); ControlPoint* cp = gl->nth(view_index); if (cp) { cps.push_back (cp); @@ -1373,7 +1373,7 @@ Selection::set_state (XMLNode const & node, int) StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (id); if (stv && (*i)->get_property (X_("control_id"), ctrl_id)) { - boost::shared_ptr atv = stv->automation_child (EventTypeMap::instance().from_symbol (param), ctrl_id); + std::shared_ptr atv = stv->automation_child (EventTypeMap::instance().from_symbol (param), ctrl_id); /* the automation could be for an entity that was never saved * in the session file. Don't freak out if we can't find @@ -1436,8 +1436,8 @@ Selection::toggle (const TrackViewList& track_list) PresentationInfo::ChangeSuspender cs; for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) { - boost::shared_ptr s = (*i)->stripable (); - boost::shared_ptr c = (*i)->control (); + std::shared_ptr s = (*i)->stripable (); + std::shared_ptr c = (*i)->control (); selection.toggle (s, c); } } @@ -1459,8 +1459,8 @@ Selection::add (TrackViewList const & track_list) PresentationInfo::ChangeSuspender cs; for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) { - boost::shared_ptr s = (*i)->stripable (); - boost::shared_ptr c = (*i)->control (); + std::shared_ptr s = (*i)->stripable (); + std::shared_ptr c = (*i)->control (); selection.add (s, c); } } @@ -1488,8 +1488,8 @@ Selection::remove (const TrackViewList& t) PresentationInfo::ChangeSuspender cs; for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) { - boost::shared_ptr s = (*i)->stripable (); - boost::shared_ptr c = (*i)->control (); + std::shared_ptr s = (*i)->stripable (); + std::shared_ptr c = (*i)->control (); selection.remove (s, c); } } @@ -1525,8 +1525,8 @@ Selection::set (const TrackViewList& track_list) CoreSelection::StripableAutomationControls sac; selection.get_stripables (sac); for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) { - boost::shared_ptr s = (*i)->stripable (); - boost::shared_ptr c = (*i)->control (); + std::shared_ptr s = (*i)->stripable (); + std::shared_ptr c = (*i)->control (); bool found = false; for (CoreSelection::StripableAutomationControls::iterator j = sac.begin (); j != sac.end (); ++j) { if (j->stripable == s && j->controllable == c) { @@ -1550,8 +1550,8 @@ Selection::set (const TrackViewList& track_list) selection.clear_stripables (); for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) { - boost::shared_ptr s = (*i)->stripable (); - boost::shared_ptr c = (*i)->control (); + std::shared_ptr s = (*i)->stripable (); + std::shared_ptr c = (*i)->control (); selection.add (s, c); } } @@ -1580,8 +1580,8 @@ Selection::selected (TimeAxisView* tv) const } CoreSelection& selection (session->selection()); - boost::shared_ptr s = tv->stripable (); - boost::shared_ptr c = tv->control (); + std::shared_ptr s = tv->stripable (); + std::shared_ptr c = tv->control (); if (c) { return selection.selected (c); diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h index 82a4156dd8..c1a76b143c 100644 --- a/gtk2_ardour/selection.h +++ b/gtk2_ardour/selection.h @@ -149,9 +149,9 @@ public: void set (std::vector&); long set (Temporal::timepos_t const &, Temporal::timepos_t const &); void set_preserving_all_ranges (Temporal::timepos_t const &, Temporal::timepos_t const &); - void set (boost::shared_ptr); - void set (boost::shared_ptr); - void set (const std::list >&); + void set (std::shared_ptr); + void set (std::shared_ptr); + void set (const std::list >&); void set (ControlPoint *); void set (ArdourMarker*); void set (const RegionSelection&); @@ -165,8 +165,8 @@ public: void toggle (std::vector&); long toggle (Temporal::timepos_t const &, Temporal::timepos_t const &); void toggle (ARDOUR::AutomationList*); - void toggle (boost::shared_ptr); - void toggle (const std::list >&); + void toggle (std::shared_ptr); + void toggle (const std::list >&); void toggle (ControlPoint *); void toggle (std::vector const &); void toggle (ArdourMarker*); @@ -179,9 +179,9 @@ public: void add (MidiCutBuffer*); void add (std::vector&); long add (Temporal::timepos_t const &, Temporal::timepos_t const &); - void add (boost::shared_ptr); - void add (boost::shared_ptr); - void add (const std::list >&); + void add (std::shared_ptr); + void add (std::shared_ptr); + void add (const std::list >&); void add (ControlPoint *); void add (std::vector const &); void add (ArdourMarker*); @@ -198,9 +198,9 @@ public: void remove (MidiCutBuffer*); void remove (uint32_t selection_id); void remove (samplepos_t, samplepos_t); - void remove (boost::shared_ptr); - void remove (boost::shared_ptr); - void remove (const std::list >&); + void remove (std::shared_ptr); + void remove (std::shared_ptr); + void remove (const std::list >&); void remove (const std::list&); void remove (ArdourMarker*); void remove (ControlPoint *); diff --git a/gtk2_ardour/selection_properties_box.cc b/gtk2_ardour/selection_properties_box.cc index e2b34f2f7a..7b70beac7d 100644 --- a/gtk2_ardour/selection_properties_box.cc +++ b/gtk2_ardour/selection_properties_box.cc @@ -212,7 +212,7 @@ SelectionPropertiesBox::selection_changed () _audio_ops_box->show(); } - boost::shared_ptr selected_region = boost::shared_ptr(); + std::shared_ptr selected_region = std::shared_ptr(); if (!selection.triggers.empty()) { TriggerSelection ts = selection.triggers; diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index f4088f9ae6..194e67d33f 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -39,7 +39,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -SendUI::SendUI (Gtk::Window* parent, Session* session, boost::shared_ptr s) +SendUI::SendUI (Gtk::Window* parent, Session* session, std::shared_ptr s) : _send (s) , _invert_button (X_("Ø")) , _gpm (session, 250) @@ -59,7 +59,7 @@ SendUI::SendUI (Gtk::Window* parent, Session* session, boost::shared_ptr s _gpm.setup_meters (); _gpm.set_fader_name (X_("SendUIFader")); - _gpm.set_controls (boost::shared_ptr (), s->meter (), s->amp (), s->gain_control ()); + _gpm.set_controls (std::shared_ptr (), s->meter (), s->amp (), s->gain_control ()); _io = Gtk::manage (new IOSelector (parent, session, s->output ())); @@ -133,7 +133,7 @@ SendUI::invert_press (GdkEventButton* ev) return true; } - boost::shared_ptr ac = _send->polarity_control (); + std::shared_ptr ac = _send->polarity_control (); ac->start_touch (timepos_t (ac->session ().audible_sample ())); return true; } @@ -145,13 +145,13 @@ SendUI::invert_release (GdkEventButton* ev) return true; } - boost::shared_ptr ac = _send->polarity_control (); + std::shared_ptr ac = _send->polarity_control (); ac->set_value (_invert_button.get_active () ? 0 : 1, PBD::Controllable::NoGroup); ac->stop_touch (timepos_t (ac->session ().audible_sample ())); return true; } -SendUIWindow::SendUIWindow (Gtk::Window& parent, ARDOUR::Session* session, boost::shared_ptr send) +SendUIWindow::SendUIWindow (Gtk::Window& parent, ARDOUR::Session* session, std::shared_ptr send) : ArdourWindow (parent, string_compose (_("Send: %1"), send->name ())) , _ui (this, session, send) { diff --git a/gtk2_ardour/send_ui.h b/gtk2_ardour/send_ui.h index 69e220fd3d..7fbf6b9acd 100644 --- a/gtk2_ardour/send_ui.h +++ b/gtk2_ardour/send_ui.h @@ -39,7 +39,7 @@ class IOSelector; class SendUI : public Gtk::HBox { public: - SendUI (Gtk::Window*, ARDOUR::Session*, boost::shared_ptr); + SendUI (Gtk::Window*, ARDOUR::Session*, std::shared_ptr); ~SendUI (); private: @@ -49,7 +49,7 @@ private: bool invert_press (GdkEventButton* ev); bool invert_release (GdkEventButton* ev); - boost::shared_ptr _send; + std::shared_ptr _send; ArdourWidgets::ArdourButton _invert_button; GainMeter _gpm; @@ -64,7 +64,7 @@ private: class SendUIWindow : public ArdourWindow { public: - SendUIWindow (Gtk::Window&, ARDOUR::Session*, boost::shared_ptr); + SendUIWindow (Gtk::Window&, ARDOUR::Session*, std::shared_ptr); private: SendUI _ui; diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 4c0727b57e..ce532d5885 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -120,11 +120,11 @@ SessionImportDialog::load_session (const string& filename) error << string_compose (_("Cannot load XML for session from %1"), filename) << endmsg; return; } - boost::shared_ptr region_handler (new AudioRegionImportHandler (tree, *_session)); - boost::shared_ptr pl_handler (new AudioPlaylistImportHandler (tree, *_session, *region_handler)); + std::shared_ptr region_handler (new AudioRegionImportHandler (tree, *_session)); + std::shared_ptr pl_handler (new AudioPlaylistImportHandler (tree, *_session, *region_handler)); - handlers.push_back (boost::static_pointer_cast (region_handler)); - handlers.push_back (boost::static_pointer_cast (pl_handler)); + handlers.push_back (std::static_pointer_cast (region_handler)); + handlers.push_back (std::static_pointer_cast (pl_handler)); handlers.push_back (HandlerPtr(new UnusedAudioPlaylistImportHandler (tree, *_session, *region_handler))); handlers.push_back (HandlerPtr(new AudioTrackImportHandler (tree, *_session, *pl_handler))); handlers.push_back (HandlerPtr(new LocationImportHandler (tree, *_session))); diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h index 20db9240ba..283049c168 100644 --- a/gtk2_ardour/session_import_dialog.h +++ b/gtk2_ardour/session_import_dialog.h @@ -50,10 +50,10 @@ namespace ARDOUR { class SessionImportDialog : public ArdourDialog { private: - typedef boost::shared_ptr HandlerPtr; + typedef std::shared_ptr HandlerPtr; typedef std::list HandlerList; - typedef boost::shared_ptr ElementPtr; + typedef std::shared_ptr ElementPtr; typedef std::list ElementList; public: diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc index 169efaaaef..75487753bb 100644 --- a/gtk2_ardour/session_metadata_dialog.cc +++ b/gtk2_ardour/session_metadata_dialog.cc @@ -662,7 +662,7 @@ SessionMetadataDialog::warn_user (string const & string) } template -boost::shared_ptr > +std::shared_ptr > SessionMetadataDialog::get_custom_widgets (WidgetFunc f) { WidgetListPtr list (new WidgetList); diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h index d92b59cb38..fa1356eec1 100644 --- a/gtk2_ardour/session_metadata_dialog.h +++ b/gtk2_ardour/session_metadata_dialog.h @@ -49,7 +49,7 @@ #include "ardour/session_metadata.h" class MetadataField; -typedef boost::shared_ptr MetadataPtr; +typedef std::shared_ptr MetadataPtr; /// Wraps a metadata field to be used in a GUI class MetadataField @@ -291,7 +291,7 @@ protected: void warn_user (std::string const & string); typedef std::list WidgetList; - typedef boost::shared_ptr WidgetListPtr; + typedef std::shared_ptr WidgetListPtr; typedef Gtk::Widget & (DataSet::*WidgetFunc) (); /// Returns list of widgets gathered by calling f for each data set @@ -310,7 +310,7 @@ private: void init_people_data (); void init_school_data (); - typedef boost::shared_ptr DataSetPtr; + typedef std::shared_ptr DataSetPtr; typedef std::list DataSetList; DataSetList data_list; diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 1610fda838..d0a615bf5b 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -521,12 +521,12 @@ SoundFileBox::audition () return; } - boost::shared_ptr r; + std::shared_ptr r; if (SMFSource::valid_midi_file (path)) { - boost::shared_ptr ms = - boost::dynamic_pointer_cast ( + std::shared_ptr ms = + std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::MIDI, *_session, path, 0, Source::Flag (0), false)); @@ -539,13 +539,13 @@ SoundFileBox::audition () plist.add (ARDOUR::Properties::name, rname); plist.add (ARDOUR::Properties::layer, 0); - r = boost::dynamic_pointer_cast (RegionFactory::create (boost::dynamic_pointer_cast(ms), plist, false)); + r = std::dynamic_pointer_cast (RegionFactory::create (std::dynamic_pointer_cast(ms), plist, false)); assert(r); } else { SourceList srclist; - boost::shared_ptr afs; + std::shared_ptr afs; bool old_sbp = AudioSource::get_build_peakfiles (); /* don't even think of building peakfiles for these files */ @@ -554,12 +554,12 @@ SoundFileBox::audition () for (int n = 0; n < sf_info.channels; ++n) { try { - afs = boost::dynamic_pointer_cast ( + afs = std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false)); if (afs->sample_rate() != _session->nominal_sample_rate()) { - boost::shared_ptr sfs (new SrcFileSource(*_session, afs, _src_quality)); + std::shared_ptr sfs (new SrcFileSource(*_session, afs, _src_quality)); srclist.push_back(sfs); } else { srclist.push_back(afs); @@ -578,7 +578,7 @@ SoundFileBox::audition () return; } - afs = boost::dynamic_pointer_cast (srclist[0]); + afs = std::dynamic_pointer_cast (srclist[0]); string rname = region_name_from_path (afs->path(), false); PropertyList plist; @@ -588,7 +588,7 @@ SoundFileBox::audition () plist.add (ARDOUR::Properties::name, rname); plist.add (ARDOUR::Properties::layer, 0); - r = boost::dynamic_pointer_cast (RegionFactory::create (srclist, plist, false)); + r = std::dynamic_pointer_cast (RegionFactory::create (srclist, plist, false)); } timepos_t audition_position; @@ -991,7 +991,7 @@ SoundFileBrowser::add_gain_meter () gm = new GainMeter (_session, 250); - boost::shared_ptr r = _session->the_auditioner (); + std::shared_ptr r = _session->the_auditioner (); gm->set_controls (r, r->shared_peak_meter(), r->amp(), r->gain_control()); gm->set_fader_name (X_("GainFader")); @@ -2244,7 +2244,7 @@ SoundFileOmega::do_something (int action) _import_active = true; if (copy_files_btn.get_active()) { - PublicEditor::instance().do_import (paths, chns, mode, quality, mts, mtd, where, instrument, boost::shared_ptr(), with_midi_markers); + PublicEditor::instance().do_import (paths, chns, mode, quality, mts, mtd, where, instrument, std::shared_ptr(), with_midi_markers); } else { PublicEditor::instance().do_embed (paths, chns, mode, where, instrument); } diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h index d5c2344357..d0532f9618 100644 --- a/gtk2_ardour/shuttle_control.h +++ b/gtk2_ardour/shuttle_control.h @@ -85,7 +85,7 @@ public: ShuttleControl& sc; }; - boost::shared_ptr controllable () const + std::shared_ptr controllable () const { return _controllable; } @@ -115,7 +115,7 @@ protected: double shuttle_speed_on_grab; double requested_speed; float shuttle_fract; - boost::shared_ptr _controllable; + std::shared_ptr _controllable; cairo_pattern_t* pattern; cairo_pattern_t* shine_pattern; PBD::microseconds_t last_shuttle_request; diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc index 8b20c892e4..57010c2479 100644 --- a/gtk2_ardour/slot_properties_box.cc +++ b/gtk2_ardour/slot_properties_box.cc @@ -105,12 +105,12 @@ SlotPropertyTable::SlotPropertyTable () : _color_button (ArdourButton::Element (ArdourButton::just_led_default_elements | ArdourButton::ColorBox)) , _color_label (_("Color:")) , _velocity_adjustment(1.,0.,1.0,0.01,0.1) - , _velocity_slider (&_velocity_adjustment, boost::shared_ptr(), 24/*length*/, 12/*girth*/ ) + , _velocity_slider (&_velocity_adjustment, std::shared_ptr(), 24/*length*/, 12/*girth*/ ) , _gain_adjustment( 0.0, -20.0, +20.0, 1.0, 3.0, 0) , _gain_spinner (_gain_adjustment) , _allow_button (ArdourButton::Element (ArdourButton::led_default_elements)) , _follow_probability_adjustment(0,0,100,2,5) - , _follow_probability_slider (&_follow_probability_adjustment, boost::shared_ptr(), 24/*length*/, 12/*girth*/ ) + , _follow_probability_slider (&_follow_probability_adjustment, std::shared_ptr(), 24/*length*/, 12/*girth*/ ) , _follow_count_adjustment (1, 1, 128, 1, 4) , _follow_count_spinner (_follow_count_adjustment) , _use_follow_length_button (ArdourButton::default_elements) @@ -410,11 +410,11 @@ SlotPropertyTable::set_quantize (BBT_Offset bbo) void SlotPropertyTable::patch_button_event () { - boost::shared_ptr trigr = trigger(); - if (boost::dynamic_pointer_cast (trigr)) { + std::shared_ptr trigr = trigger(); + if (std::dynamic_pointer_cast (trigr)) { SessionObject* obj = trigr->box ().owner (); - boost::shared_ptr stripable = obj->session().stripable_by_id (obj->id ()); - _patch_change_window.reset (boost::dynamic_pointer_cast (stripable), boost::dynamic_pointer_cast (trigr)); + std::shared_ptr stripable = obj->session().stripable_by_id (obj->id ()); + _patch_change_window.reset (std::dynamic_pointer_cast (stripable), std::dynamic_pointer_cast (trigr)); _patch_change_window.present (); } } @@ -584,11 +584,11 @@ SlotPropertyTable::set_follow_action (FollowAction const & fa, uint64_t idx) void SlotPropertyTable::on_trigger_set () { - boost::shared_ptr trigr = trigger(); - if (boost::dynamic_pointer_cast (trigr)) { + std::shared_ptr trigr = trigger(); + if (std::dynamic_pointer_cast (trigr)) { SessionObject* obj = triggerbox ().owner (); - boost::shared_ptr stripable = obj->session().stripable_by_id (obj->id ()); - _patch_change_window.reset (boost::dynamic_pointer_cast (stripable), boost::dynamic_pointer_cast (trigr)); + std::shared_ptr stripable = obj->session().stripable_by_id (obj->id ()); + _patch_change_window.reset (std::dynamic_pointer_cast (stripable), std::dynamic_pointer_cast (trigr)); _patch_button.show(); _allow_button.show(); } else { diff --git a/gtk2_ardour/source_list_base.cc b/gtk2_ardour/source_list_base.cc index da6020f505..56aa4ccf42 100644 --- a/gtk2_ardour/source_list_base.cc +++ b/gtk2_ardour/source_list_base.cc @@ -40,21 +40,21 @@ SourceListBase::set_session (ARDOUR::Session* s) } void -SourceListBase::remove_weak_source (boost::weak_ptr src) +SourceListBase::remove_weak_source (std::weak_ptr src) { - boost::shared_ptr source = src.lock (); + std::shared_ptr source = src.lock (); if (source) { remove_source (source); } } void -SourceListBase::remove_source (boost::shared_ptr source) +SourceListBase::remove_source (std::shared_ptr source) { TreeModel::iterator i; TreeModel::Children rows = _model->children (); for (i = rows.begin (); i != rows.end (); ++i) { - boost::shared_ptr rr = (*i)[_columns.region]; + std::shared_ptr rr = (*i)[_columns.region]; if (rr->source () == source) { RegionRowMap::iterator map_it = region_row_map.find (rr); assert (map_it != region_row_map.end () && i == map_it->second); @@ -66,7 +66,7 @@ SourceListBase::remove_source (boost::shared_ptr source) } bool -SourceListBase::list_region (boost::shared_ptr region) const +SourceListBase::list_region (std::shared_ptr region) const { /* by definition, the Source List only shows whole-file regions * this roughly equates to Source objects, but preserves the stereo-ness @@ -82,7 +82,7 @@ SourceListBase::tag_edit (const std::string& path, const std::string& new_text) TreeIter row_iter; if ((row_iter = _model->get_iter (path))) { - boost::shared_ptr region = (*row_iter)[_columns.region]; + std::shared_ptr region = (*row_iter)[_columns.region]; if (region) { _session->set_dirty (); // whole-file regions aren't in a playlist to catch property changes, so we need to explicitly set the session dirty } @@ -96,7 +96,7 @@ SourceListBase::name_edit (const std::string& path, const std::string& new_text) TreeIter row_iter; if ((row_iter = _model->get_iter (path))) { - boost::shared_ptr region = (*row_iter)[_columns.region]; + std::shared_ptr region = (*row_iter)[_columns.region]; if (region) { _session->set_dirty (); // whole-file regions aren't in a playlist to catch property changes, so we need to explicitly set the session dirty } diff --git a/gtk2_ardour/source_list_base.h b/gtk2_ardour/source_list_base.h index 430944c57c..c530776643 100644 --- a/gtk2_ardour/source_list_base.h +++ b/gtk2_ardour/source_list_base.h @@ -29,11 +29,11 @@ public: protected: void name_edit (const std::string&, const std::string&); void tag_edit (const std::string&, const std::string&); - bool list_region (boost::shared_ptr) const; + bool list_region (std::shared_ptr) const; private: - void remove_source (boost::shared_ptr); - void remove_weak_source (boost::weak_ptr); + void remove_source (std::shared_ptr); + void remove_weak_source (std::weak_ptr); }; #endif /* _gtk_ardour_source_list_base_h_ */ diff --git a/gtk2_ardour/speaker_dialog.cc b/gtk2_ardour/speaker_dialog.cc index df8c2876cd..2b3e1b3fe3 100644 --- a/gtk2_ardour/speaker_dialog.cc +++ b/gtk2_ardour/speaker_dialog.cc @@ -92,12 +92,12 @@ SpeakerDialog::SpeakerDialog () } void -SpeakerDialog::set_speakers (boost::shared_ptr s) +SpeakerDialog::set_speakers (std::shared_ptr s) { _speakers = s; } -boost::shared_ptr +std::shared_ptr SpeakerDialog::get_speakers () const { return _speakers.lock (); @@ -106,7 +106,7 @@ SpeakerDialog::get_speakers () const bool SpeakerDialog::darea_expose_event (GdkEventExpose* event) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return false; } @@ -269,7 +269,7 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc) bool SpeakerDialog::darea_button_press_event (GdkEventButton *ev) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return false; } @@ -316,7 +316,7 @@ SpeakerDialog::darea_button_press_event (GdkEventButton *ev) bool SpeakerDialog::darea_button_release_event (GdkEventButton *ev) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return false; } @@ -367,7 +367,7 @@ SpeakerDialog::darea_button_release_event (GdkEventButton *ev) int SpeakerDialog::find_closest_object (gdouble x, gdouble y) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return -1; } @@ -422,7 +422,7 @@ SpeakerDialog::darea_motion_notify_event (GdkEventMotion *ev) bool SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return false; } @@ -488,7 +488,7 @@ SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) void SpeakerDialog::add_speaker () { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return; } @@ -500,7 +500,7 @@ SpeakerDialog::add_speaker () void SpeakerDialog::set_selected (int i) { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return; } @@ -530,7 +530,7 @@ SpeakerDialog::set_selected (int i) void SpeakerDialog::azimuth_changed () { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return; } @@ -551,7 +551,7 @@ SpeakerDialog::azimuth_changed () void SpeakerDialog::speaker_position_changed () { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return; } @@ -572,7 +572,7 @@ SpeakerDialog::speaker_position_changed () void SpeakerDialog::remove_speaker () { - boost::shared_ptr speakers = _speakers.lock (); + std::shared_ptr speakers = _speakers.lock (); if (!speakers) { return; } diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h index 6b01d622dc..944054cf88 100644 --- a/gtk2_ardour/speaker_dialog.h +++ b/gtk2_ardour/speaker_dialog.h @@ -36,11 +36,11 @@ class SpeakerDialog : public ArdourWindow public: SpeakerDialog (); - boost::shared_ptr get_speakers() const; - void set_speakers (boost::shared_ptr); + std::shared_ptr get_speakers() const; + void set_speakers (std::shared_ptr); private: - boost::weak_ptr _speakers; + std::weak_ptr _speakers; Gtk::HBox hbox; Gtk::VBox side_vbox; Gtk::AspectFrame aspect_frame; diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc index 21ea9ce819..066e13cd6e 100644 --- a/gtk2_ardour/startup_fsm.cc +++ b/gtk2_ardour/startup_fsm.cc @@ -440,7 +440,7 @@ StartupFSM::start_audio_midi_setup () BootMessage (_("Starting Audio/MIDI Engine")); bool setup_required = false; - boost::shared_ptr backend = AudioEngine::instance()->current_backend(); + std::shared_ptr backend = AudioEngine::instance()->current_backend(); if (!backend) { /* backend is unknown ... */ setup_required = true; diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index a8e3748115..2bce2d32ed 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -36,7 +36,7 @@ using namespace Gtk; using namespace std; using namespace Temporal; -StepEditor::StepEditor (PublicEditor& e, boost::shared_ptr t, MidiTimeAxisView& mtv) +StepEditor::StepEditor (PublicEditor& e, std::shared_ptr t, MidiTimeAxisView& mtv) : _editor (e) , _track (t) , _mtv (mtv) @@ -104,10 +104,10 @@ StepEditor::resync_step_edit_to_edit_point () void StepEditor::prepare_step_edit_region () { - boost::shared_ptr r = _track->playlist()->top_region_at (step_edit_insert_position); + std::shared_ptr r = _track->playlist()->top_region_at (step_edit_insert_position); if (r) { - step_edit_region = boost::dynamic_pointer_cast(r); + step_edit_region = std::dynamic_pointer_cast(r); } if (step_edit_region) { @@ -438,9 +438,9 @@ StepEditor::playlist_changed () } void -StepEditor::region_removed (boost::weak_ptr wr) +StepEditor::region_removed (std::weak_ptr wr) { - boost::shared_ptr r (wr.lock()); + std::shared_ptr r (wr.lock()); if (!r) { return; diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h index c1cdeb416f..4c7f966cfa 100644 --- a/gtk2_ardour/step_editor.h +++ b/gtk2_ardour/step_editor.h @@ -53,7 +53,7 @@ class StepEntry; class StepEditor : public PBD::ScopedConnectionList, public sigc::trackable { public: - StepEditor (PublicEditor&, boost::shared_ptr, MidiTimeAxisView&); + StepEditor (PublicEditor&, std::shared_ptr, MidiTimeAxisView&); virtual ~StepEditor (); void step_entry_done (); @@ -84,14 +84,14 @@ public: private: Temporal::timepos_t step_edit_insert_position; Temporal::Beats step_edit_beat_pos; - boost::shared_ptr step_edit_region; + std::shared_ptr step_edit_region; MidiRegionView* step_edit_region_view; uint8_t _step_edit_triplet_countdown; bool _step_edit_within_chord; Temporal::Beats _step_edit_chord_duration; PBD::ScopedConnection step_edit_region_connection; PublicEditor& _editor; - boost::shared_ptr _track; + std::shared_ptr _track; MidiTimeAxisView& _mtv; int8_t last_added_pitch; Temporal::Beats last_added_end; @@ -99,7 +99,7 @@ private: sigc::connection delete_connection; sigc::connection hide_connection; - void region_removed (boost::weak_ptr); + void region_removed (std::weak_ptr); void playlist_changed (); bool step_entry_hidden (GdkEventAny*); void resync_step_edit_position (); diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 4a288b5348..e63518dc1a 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -67,7 +67,7 @@ bool StereoPanner::have_font = false; using namespace ARDOUR; -StereoPanner::StereoPanner (boost::shared_ptr p) +StereoPanner::StereoPanner (std::shared_ptr p) : PannerInterface (p->panner()) , _panner_shell (p) , position_control (_panner->pannable()->pan_azimuth_control) diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h index e8a7b9a5bc..33896b55fb 100644 --- a/gtk2_ardour/stereo_panner.h +++ b/gtk2_ardour/stereo_panner.h @@ -41,11 +41,11 @@ namespace ARDOUR { class StereoPanner : public PannerInterface { public: - StereoPanner (boost::shared_ptr); + StereoPanner (std::shared_ptr); ~StereoPanner (); - boost::shared_ptr get_position_controllable() const { return position_control; } - boost::shared_ptr get_width_controllable() const { return width_control; } + std::shared_ptr get_position_controllable() const { return position_control; } + std::shared_ptr get_width_controllable() const { return width_control; } sigc::signal StartPositionGesture; sigc::signal StopPositionGesture; @@ -60,17 +60,17 @@ protected: bool on_scroll_event (GdkEventScroll*); bool on_key_press_event (GdkEventKey*); - boost::weak_ptr proxy_controllable () const + std::weak_ptr proxy_controllable () const { - return boost::weak_ptr (position_binder.get_controllable()); + return std::weak_ptr (position_binder.get_controllable()); } private: PannerEditor* editor (); - boost::shared_ptr _panner_shell; + std::shared_ptr _panner_shell; - boost::shared_ptr position_control; - boost::shared_ptr width_control; + std::shared_ptr position_control; + std::shared_ptr width_control; PBD::ScopedConnectionList panvalue_connections; PBD::ScopedConnectionList panshell_connections; bool dragging_position; diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 7a64ae0f20..0dc5868557 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -168,9 +168,9 @@ StreamView::set_samples_per_pixel (double fpp) } void -StreamView::add_region_view (boost::weak_ptr wr) +StreamView::add_region_view (std::weak_ptr wr) { - boost::shared_ptr r (wr.lock()); + std::shared_ptr r (wr.lock()); if (!r) { return; } @@ -183,11 +183,11 @@ StreamView::add_region_view (boost::weak_ptr wr) } void -StreamView::remove_region_view (boost::weak_ptr weak_r) +StreamView::remove_region_view (std::weak_ptr weak_r) { ENSURE_GUI_THREAD (*this, &StreamView::remove_region_view, weak_r) - boost::shared_ptr r (weak_r.lock()); + std::shared_ptr r (weak_r.lock()); if (!r) { return; @@ -219,11 +219,11 @@ StreamView::undisplay_track () } void -StreamView::display_track (boost::shared_ptr tr) +StreamView::display_track (std::shared_ptr tr) { playlist_switched_connection.disconnect(); playlist_switched (tr); - tr->PlaylistChanged.connect (playlist_switched_connection, invalidator (*this), boost::bind (&StreamView::playlist_switched, this, boost::weak_ptr (tr)), gui_context()); + tr->PlaylistChanged.connect (playlist_switched_connection, invalidator (*this), boost::bind (&StreamView::playlist_switched, this, std::weak_ptr (tr)), gui_context()); } void @@ -282,9 +282,9 @@ StreamView::layer_regions() } void -StreamView::playlist_layered (boost::weak_ptr wtr) +StreamView::playlist_layered (std::weak_ptr wtr) { - boost::shared_ptr tr (wtr.lock()); + std::shared_ptr tr (wtr.lock()); if (!tr) { return; @@ -306,9 +306,9 @@ StreamView::playlist_layered (boost::weak_ptr wtr) } void -StreamView::playlist_switched (boost::weak_ptr wtr) +StreamView::playlist_switched (std::weak_ptr wtr) { - boost::shared_ptr tr (wtr.lock()); + std::shared_ptr tr (wtr.lock()); if (!tr) { return; @@ -330,7 +330,7 @@ StreamView::playlist_switched (boost::weak_ptr wtr) /* catch changes */ - tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr (tr)), gui_context()); + tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, std::weak_ptr (tr)), gui_context()); tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::add_region_view, this, _1), gui_context()); tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::remove_region_view, this, _1), gui_context()); tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::update_coverage_frame, this), gui_context()); @@ -464,7 +464,7 @@ StreamView::update_rec_box () } RegionView* -StreamView::find_view (boost::shared_ptr region) +StreamView::find_view (std::shared_ptr region) { for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { @@ -681,7 +681,7 @@ StreamView::update_coverage_frame () } void -StreamView::check_record_layers (boost::shared_ptr region, samplepos_t to) +StreamView::check_record_layers (std::shared_ptr region, samplepos_t to) { if (_new_rec_layer_time < to) { /* The region being recorded has overlapped the start of a top-layered region, so @@ -705,7 +705,7 @@ StreamView::check_record_layers (boost::shared_ptr region, samplepos_t t } void -StreamView::setup_new_rec_layer_time (boost::shared_ptr region) +StreamView::setup_new_rec_layer_time (std::shared_ptr region) { /* If we are in Stacked mode, we may need to (visually) create a new layer to put the recorded region in. To work out where this needs to happen, find the start of the next diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 47025d81b6..55f5ec5e81 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -99,7 +99,7 @@ public: uint32_t num_selected_regionviews () const; - RegionView* find_view (boost::shared_ptr); + RegionView* find_view (std::shared_ptr); void foreach_regionview (sigc::slot slot); void foreach_selected_regionview (sigc::slot slot); @@ -108,9 +108,9 @@ public: void get_inverted_selectables (Selection&, std::list& results); void get_regionviews_at_or_after (Temporal::timepos_t const &, RegionSelection&); - virtual void update_contents_metrics(boost::shared_ptr) {} + virtual void update_contents_metrics(std::shared_ptr) {} - void add_region_view (boost::weak_ptr); + void add_region_view (std::weak_ptr); void region_layered (RegionView*); virtual void update_contents_height (); @@ -119,13 +119,13 @@ public: double child_height () const; ARDOUR::layer_t layers () const { return _layers; } - virtual RegionView* create_region_view (boost::shared_ptr, bool, bool) { + virtual RegionView* create_region_view (std::shared_ptr, bool, bool) { return 0; } - void check_record_layers (boost::shared_ptr, ARDOUR::samplepos_t); + void check_record_layers (std::shared_ptr, ARDOUR::samplepos_t); - virtual void playlist_layered (boost::weak_ptr); + virtual void playlist_layered (std::weak_ptr); sigc::signal RegionViewAdded; sigc::signal RegionViewRemoved; @@ -145,15 +145,15 @@ protected: virtual void setup_rec_box () = 0; virtual void update_rec_box (); - virtual RegionView* add_region_view_internal (boost::shared_ptr, + virtual RegionView* add_region_view_internal (std::shared_ptr, bool wait_for_waves, bool recording = false) = 0; - virtual void remove_region_view (boost::weak_ptr ); + virtual void remove_region_view (std::weak_ptr ); - void display_track (boost::shared_ptr); + void display_track (std::shared_ptr); virtual void undisplay_track (); void layer_regions (); - void playlist_switched (boost::weak_ptr); + void playlist_switched (std::weak_ptr); virtual void color_handler () = 0; @@ -168,7 +168,7 @@ protected: sigc::connection screen_update_connection; std::vector rec_rects; - std::list< std::pair,RegionView* > > rec_regions; + std::list< std::pair,RegionView* > > rec_regions; bool rec_updating; bool rec_active; @@ -190,7 +190,7 @@ protected: being recorded, or max_samplepos if not applicable. */ samplepos_t _new_rec_layer_time; - void setup_new_rec_layer_time (boost::shared_ptr); + void setup_new_rec_layer_time (std::shared_ptr); private: void update_coverage_frame (); diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 88108ed071..6d4fb88a45 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -175,7 +175,7 @@ void StripSilenceDialog::silences (AudioIntervalMap& m) { for (list::iterator v = views.begin(); v != views.end(); ++v) { - pair,AudioIntervalResult> newpair (v->view->region(), v->intervals); + pair,AudioIntervalResult> newpair (v->view->region(), v->intervals); m.insert (newpair); } } @@ -268,7 +268,7 @@ StripSilenceDialog::detection_thread_work () analysis_progress_cur = 0; analysis_progress_max = views.size(); for (list::iterator i = views.begin(); i != views.end(); ++i) { - boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i).view->region()); + std::shared_ptr ar = std::dynamic_pointer_cast ((*i).view->region()); if (ar) { i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), fade_length(), _interthread_info); diff --git a/gtk2_ardour/stripable_colorpicker.cc b/gtk2_ardour/stripable_colorpicker.cc index 5ac4d7ae0d..bab55e6f65 100644 --- a/gtk2_ardour/stripable_colorpicker.cc +++ b/gtk2_ardour/stripable_colorpicker.cc @@ -124,7 +124,7 @@ StripableColorDialog::popup (const std::string& name, uint32_t color) } void -StripableColorDialog::popup (boost::shared_ptr s) +StripableColorDialog::popup (std::shared_ptr s) { if (s && s->active_color_picker()) { s->active_color_picker()->present (); diff --git a/gtk2_ardour/stripable_colorpicker.h b/gtk2_ardour/stripable_colorpicker.h index 22acd77cdd..90166d3ade 100644 --- a/gtk2_ardour/stripable_colorpicker.h +++ b/gtk2_ardour/stripable_colorpicker.h @@ -32,7 +32,7 @@ public: StripableColorDialog (); ~StripableColorDialog (); void reset (); - void popup (boost::shared_ptr s); + void popup (std::shared_ptr s); void popup (const std::string&, uint32_t); sigc::signal ColorChanged; @@ -41,7 +41,7 @@ private: void finish_color_edit (int response); void color_changed (); - boost::shared_ptr _stripable; + std::shared_ptr _stripable; ARDOUR::PresentationInfo::color_t _initial_color; sigc::connection _color_changed_connection; diff --git a/gtk2_ardour/stripable_time_axis.cc b/gtk2_ardour/stripable_time_axis.cc index a507e2b85c..db83aa0e33 100644 --- a/gtk2_ardour/stripable_time_axis.cc +++ b/gtk2_ardour/stripable_time_axis.cc @@ -48,7 +48,7 @@ StripableTimeAxisView::~StripableTimeAxisView () } void -StripableTimeAxisView::set_stripable (boost::shared_ptr s) +StripableTimeAxisView::set_stripable (std::shared_ptr s) { _stripable = s; _editor.ZoomChanged.connect (sigc::mem_fun(*this, &StripableTimeAxisView::reset_samples_per_pixel)); @@ -68,7 +68,7 @@ StripableTimeAxisView::set_samples_per_pixel (double fpp) void -StripableTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr track, bool show) +StripableTimeAxisView::add_automation_child (Evoral::Parameter param, std::shared_ptr track, bool show) { using namespace Menu_Helpers; @@ -163,7 +163,7 @@ StripableTimeAxisView::automation_child_menu_item (Evoral::Parameter param) void StripableTimeAxisView::automation_track_hidden (Evoral::Parameter param) { - boost::shared_ptr track = automation_child (param); + std::shared_ptr track = automation_child (param); if (!track) { return; @@ -180,7 +180,7 @@ StripableTimeAxisView::automation_track_hidden (Evoral::Parameter param) } } -boost::shared_ptr +std::shared_ptr StripableTimeAxisView::automation_child(Evoral::Parameter param, PBD::ID) { assert (param.type() != PluginAutomation); @@ -188,23 +188,23 @@ StripableTimeAxisView::automation_child(Evoral::Parameter param, PBD::ID) if (i != _automation_tracks.end()) { return i->second; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr StripableTimeAxisView::automation_child_by_alist_id (PBD::ID alist_id) { for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - boost::shared_ptr atv (i->second); - std::list > lines = atv->lines(); - for (std::list >::const_iterator li = lines.begin(); li != lines.end(); ++li) { + std::shared_ptr atv (i->second); + std::list > lines = atv->lines(); + for (std::list >::const_iterator li = lines.begin(); li != lines.end(); ++li) { if ((*li)->the_list()->id() == alist_id) { return *li; } } } - return boost::shared_ptr (); + return std::shared_ptr (); } void diff --git a/gtk2_ardour/stripable_time_axis.h b/gtk2_ardour/stripable_time_axis.h index 329968efc9..ddd78f26ba 100644 --- a/gtk2_ardour/stripable_time_axis.h +++ b/gtk2_ardour/stripable_time_axis.h @@ -28,17 +28,17 @@ public: StripableTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); virtual ~StripableTimeAxisView (); - void set_stripable (boost::shared_ptr); - boost::shared_ptr stripable() const { return _stripable; } + void set_stripable (std::shared_ptr); + std::shared_ptr stripable() const { return _stripable; } - typedef std::map > AutomationTracks; + typedef std::map > AutomationTracks; const AutomationTracks& automation_tracks() const { return _automation_tracks; } virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter); virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0; - virtual boost::shared_ptr automation_child (Evoral::Parameter param, PBD::ID ctrl_id = PBD::ID(0)); + virtual std::shared_ptr automation_child (Evoral::Parameter param, PBD::ID ctrl_id = PBD::ID(0)); - virtual boost::shared_ptr automation_child_by_alist_id (PBD::ID); + virtual std::shared_ptr automation_child_by_alist_id (PBD::ID); void request_redraw (); @@ -49,7 +49,7 @@ public: protected: void reset_samples_per_pixel (); virtual void set_samples_per_pixel (double); - void add_automation_child(Evoral::Parameter param, boost::shared_ptr track, bool show=true); + void add_automation_child(Evoral::Parameter param, std::shared_ptr track, bool show=true); virtual void create_gain_automation_child (const Evoral::Parameter &, bool) = 0; virtual void create_trim_automation_child (const Evoral::Parameter &, bool) = 0; @@ -61,11 +61,11 @@ protected: void update_trim_track_visibility (); void update_mute_track_visibility (); - boost::shared_ptr _stripable; + std::shared_ptr _stripable; - boost::shared_ptr gain_track; - boost::shared_ptr trim_track; - boost::shared_ptr mute_track; + std::shared_ptr gain_track; + std::shared_ptr trim_track; + std::shared_ptr mute_track; typedef std::map ParameterMenuMap; /** parameter -> menu item map for the main automation menu */ diff --git a/gtk2_ardour/stripable_treemodel.cc b/gtk2_ardour/stripable_treemodel.cc index 7adc19e6b6..8c00975e93 100644 --- a/gtk2_ardour/stripable_treemodel.cc +++ b/gtk2_ardour/stripable_treemodel.cc @@ -27,7 +27,7 @@ using namespace ARDOUR; -StripableTreeModel::Glue::Glue (boost::shared_ptr s) +StripableTreeModel::Glue::Glue (std::shared_ptr s) : stripable (s) { } @@ -89,7 +89,7 @@ StripableTreeModel::get_value_vfunc (const TreeModel::iterator& iter, int column } const Glue* glue = (const Glue*)iter.gobj()->user_data; - boost::shared_ptr iter_stripable = glue->stripable.lock(); + std::shared_ptr iter_stripable = glue->stripable.lock(); if (!iter_stripable) { return; @@ -102,7 +102,7 @@ StripableTreeModel::get_value_vfunc (const TreeModel::iterator& iter, int column } void -StripableTreeModel::text_value (boost::shared_ptr stripable, Glib::ValueBase& value) const +StripableTreeModel::text_value (std::shared_ptr stripable, Glib::ValueBase& value) const { StringColumn::ValueType val; val.set (stripable->name()); @@ -117,7 +117,7 @@ StripableTreeModel::iter_next_vfunc (const iterator& iter, iterator& iter_next) } const Glue* glue = (const Glue*)iter.gobj()->user_data; - boost::shared_ptr iter_stripable = glue->stripable.lock(); + std::shared_ptr iter_stripable = glue->stripable.lock(); if (!iter_stripable) { return false; diff --git a/gtk2_ardour/stripable_treemodel.h b/gtk2_ardour/stripable_treemodel.h index c323932f18..b1f4c8615d 100644 --- a/gtk2_ardour/stripable_treemodel.h +++ b/gtk2_ardour/stripable_treemodel.h @@ -66,7 +66,7 @@ public: typedef Gtk::TreeModelColumn BoolColumn; typedef Gtk::TreeModelColumn UnsignedColumn; typedef Gtk::TreeModelColumn AVColumn; - typedef Gtk::TreeModelColumn > StripableColumn; + typedef Gtk::TreeModelColumn > StripableColumn; struct Columns : public Gtk::TreeModel::ColumnRecord { @@ -116,13 +116,13 @@ private: int n_columns; - void text_value (boost::shared_ptr stripable, Glib::ValueBase& value) const; + void text_value (std::shared_ptr stripable, Glib::ValueBase& value) const; struct Glue { - Glue (boost::shared_ptr); + Glue (std::shared_ptr); - boost::weak_ptr stripable; + std::weak_ptr stripable; }; typedef std::set GlueList; diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 1449c51f46..6e2661b6e8 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -287,10 +287,10 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d _midi_port_combo.pack_start (_midi_port_cols.pretty_name); AudioEngine::instance ()->PortRegisteredOrUnregistered.connect (_manager_connection, invalidator (*this), boost::bind (&TempoDialog::ports_changed, this), gui_context ()); - boost::shared_ptr port = AudioEngine::instance ()->register_input_port (DataType::MIDI, "Tap Tempo", false, PortFlags (IsInput | Hidden | IsTerminal)); - _midi_tap_port = boost::dynamic_pointer_cast (port); + std::shared_ptr port = AudioEngine::instance ()->register_input_port (DataType::MIDI, "Tap Tempo", false, PortFlags (IsInput | Hidden | IsTerminal)); + _midi_tap_port = std::dynamic_pointer_cast (port); assert (_midi_tap_port); - _midi_tap_parser = boost::shared_ptr (new MIDI::Parser); + _midi_tap_parser = std::shared_ptr (new MIDI::Parser); _midi_tap_parser->any.connect_same_thread (_parser_connection, boost::bind (&TempoDialog::midi_event, this, _2, _3, _4)); _midi_tap_port->set_trace (_midi_tap_parser.get ()); _midi_tap_signal.connect (_xthread_connection, invalidator (*this), boost::bind (&TempoDialog::tap_tempo, this, _1), gui_context ()); diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index f583c5f27b..7efd99472e 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -135,8 +135,8 @@ private: Glib::RefPtr _midi_port_list; PBD::Signal1 _midi_tap_signal; - boost::shared_ptr _midi_tap_parser; - boost::shared_ptr _midi_tap_port; + std::shared_ptr _midi_tap_parser; + std::shared_ptr _midi_tap_port; PBD::ScopedConnection _parser_connection; PBD::ScopedConnection _manager_connection; PBD::ScopedConnection _xthread_connection; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index ad9405dc9b..a9350d45fe 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -1049,17 +1049,17 @@ struct null_deleter { void operator()(void const *) const {} }; bool TimeAxisView::is_child (TimeAxisView* tav) { - return find (children.begin(), children.end(), boost::shared_ptr(tav, null_deleter())) != children.end(); + return find (children.begin(), children.end(), std::shared_ptr(tav, null_deleter())) != children.end(); } void -TimeAxisView::add_child (boost::shared_ptr child) +TimeAxisView::add_child (std::shared_ptr child) { children.push_back (child); } void -TimeAxisView::remove_child (boost::shared_ptr child) +TimeAxisView::remove_child (std::shared_ptr child) { Children::iterator i; @@ -1395,7 +1395,7 @@ TimeAxisView::reset_visual_state () TrackViewList TrackViewList::filter_to_unique_playlists () { - std::set > playlists; + std::set > playlists; TrackViewList ts; for (iterator i = begin(); i != end(); ++i) { @@ -1404,7 +1404,7 @@ TrackViewList::filter_to_unique_playlists () /* not a route: include it anyway */ ts.push_back (*i); } else { - boost::shared_ptr t = rtav->track(); + std::shared_ptr t = rtav->track(); if (t) { if (playlists.insert (t->playlist()).second) { /* playlist not seen yet */ diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 27e01e13a2..c5b8102a8c 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -171,7 +171,7 @@ public: virtual void step_height (bool); virtual ARDOUR::RouteGroup* route_group() const { return 0; } - virtual boost::shared_ptr playlist() const { return boost::shared_ptr (); } + virtual std::shared_ptr playlist() const { return std::shared_ptr (); } virtual void set_samples_per_pixel (double); virtual void show_selection (TimeSelection&); @@ -203,8 +203,8 @@ public: virtual void fade_range (TimeSelection&) {} - virtual boost::shared_ptr find_next_region (ARDOUR::timepos_t const & /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) { - return boost::shared_ptr (); + virtual std::shared_ptr find_next_region (ARDOUR::timepos_t const & /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) { + return std::shared_ptr (); } void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top); @@ -227,7 +227,7 @@ public: virtual LayerDisplay layer_display () const { return Overlaid; } virtual StreamView* view () const { return 0; } - typedef std::vector > Children; + typedef std::vector > Children; Children get_child_list () const; static uint32_t preset_height (Height); @@ -304,8 +304,8 @@ protected: bool is_child (TimeAxisView*); virtual bool propagate_time_selection () const { return false; } - virtual void remove_child (boost::shared_ptr); - void add_child (boost::shared_ptr); + virtual void remove_child (std::shared_ptr); + void add_child (std::shared_ptr); /* selection display */ diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc index 594647ff49..f86562ffc3 100644 --- a/gtk2_ardour/time_info_box.cc +++ b/gtk2_ardour/time_info_box.cc @@ -297,14 +297,14 @@ TimeInfoBox::selection_changed () } } else { /* this is more efficient than tracking changes per region in large selections */ - std::set > playlists; + std::set > playlists; for (RegionSelection::iterator s = selection.regions.begin(); s != selection.regions.end(); ++s) { - boost::shared_ptr pl = (*s)->region()->playlist(); + std::shared_ptr pl = (*s)->region()->playlist(); if (pl) { playlists.insert (pl); } } - for (std::set >::iterator ps = playlists.begin(); ps != playlists.end(); ++ps) { + for (std::set >::iterator ps = playlists.begin(); ps != playlists.end(); ++ps) { (*ps)->ContentsChanged.connect (region_property_connections, invalidator (*this), boost::bind (&TimeInfoBox::region_selection_changed, this), gui_context()); } diff --git a/gtk2_ardour/track_record_axis.cc b/gtk2_ardour/track_record_axis.cc index 0e3712ac2a..14e235e8e6 100644 --- a/gtk2_ardour/track_record_axis.cc +++ b/gtk2_ardour/track_record_axis.cc @@ -78,7 +78,7 @@ PBD::Signal2 TrackRecordAxis::EditNextName; bool TrackRecordAxis::_size_group_initialized = false; Glib::RefPtr TrackRecordAxis::_track_number_size_group; -TrackRecordAxis::TrackRecordAxis (Session* s, boost::shared_ptr rt) +TrackRecordAxis::TrackRecordAxis (Session* s, std::shared_ptr rt) : SessionHandlePtr (s) , RouteUI (s) , _clear_meters (true) @@ -660,7 +660,7 @@ TrackRecordAxis::disconnect_entry_signals () /* ****************************************************************************/ -TrackRecordAxis::TrackSummary::TrackSummary (boost::shared_ptr r) +TrackRecordAxis::TrackSummary::TrackSummary (std::shared_ptr r) : _start (0) , _end (480000) , _xscale (1) @@ -668,7 +668,7 @@ TrackRecordAxis::TrackSummary::TrackSummary (boost::shared_ptr r) , _rec_updating (false) , _rec_active (false) { - _track = boost::dynamic_pointer_cast (r); + _track = std::dynamic_pointer_cast (r); assert (_track); _track->PlaylistChanged.connect (_connections, invalidator (*this), boost::bind (&TrackSummary::playlist_changed, this), gui_context ()); @@ -747,7 +747,7 @@ TrackRecordAxis::TrackSummary::render (Cairo::RefPtr const& cr, } void -TrackRecordAxis::TrackSummary::render_region (boost::shared_ptr r, Cairo::RefPtr const& cr, double y) +TrackRecordAxis::TrackSummary::render_region (std::shared_ptr r, Cairo::RefPtr const& cr, double y) { const samplepos_t rp = r->position_sample (); const samplecnt_t rl = r->length_samples (); diff --git a/gtk2_ardour/track_record_axis.h b/gtk2_ardour/track_record_axis.h index e41562ba94..648377f441 100644 --- a/gtk2_ardour/track_record_axis.h +++ b/gtk2_ardour/track_record_axis.h @@ -57,14 +57,14 @@ class RouteGroupMenu; class TrackRecordAxis : public Gtk::VBox, public AxisView, public RouteUI { public: - TrackRecordAxis (ARDOUR::Session*, boost::shared_ptr); + TrackRecordAxis (ARDOUR::Session*, std::shared_ptr); ~TrackRecordAxis (); /* AxisView */ std::string name () const; Gdk::Color color () const; - boost::shared_ptr stripable() const { + std::shared_ptr stripable() const { return RouteUI::stripable(); } @@ -167,7 +167,7 @@ private: class TrackSummary : public CairoWidget { public: - TrackSummary (boost::shared_ptr); + TrackSummary (std::shared_ptr); ~TrackSummary (); void playhead_position_changed (samplepos_t p); @@ -181,7 +181,7 @@ private: bool on_button_press_event (GdkEventButton*); private: - void render_region (boost::shared_ptr, Cairo::RefPtr const&, double); + void render_region (std::shared_ptr, Cairo::RefPtr const&, double); void playlist_changed (); void playlist_contents_changed (); void property_changed (PBD::PropertyChange const&); @@ -193,7 +193,7 @@ private: return (p - _start) * _xscale; } - boost::shared_ptr _track; + std::shared_ptr _track; samplepos_t _start; samplepos_t _end; double _xscale; diff --git a/gtk2_ardour/transport_control.h b/gtk2_ardour/transport_control.h index eee4a38bf9..55b5d4f961 100644 --- a/gtk2_ardour/transport_control.h +++ b/gtk2_ardour/transport_control.h @@ -54,13 +54,13 @@ public: ToggleType type; }; - boost::shared_ptr roll_controllable; - boost::shared_ptr stop_controllable; - boost::shared_ptr goto_start_controllable; - boost::shared_ptr goto_end_controllable; - boost::shared_ptr auto_loop_controllable; - boost::shared_ptr play_selection_controllable; - boost::shared_ptr rec_controllable; + std::shared_ptr roll_controllable; + std::shared_ptr stop_controllable; + std::shared_ptr goto_start_controllable; + std::shared_ptr goto_end_controllable; + std::shared_ptr auto_loop_controllable; + std::shared_ptr play_selection_controllable; + std::shared_ptr rec_controllable; }; #endif diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc index 62b1c781dc..0aa00b0355 100644 --- a/gtk2_ardour/transport_masters_dialog.cc +++ b/gtk2_ardour/transport_masters_dialog.cc @@ -122,13 +122,13 @@ TransportMastersWidget::~TransportMastersWidget () } void -TransportMastersWidget::set_transport_master (boost::shared_ptr tm) +TransportMastersWidget::set_transport_master (std::shared_ptr tm) { _session->request_sync_source (tm); } void -TransportMastersWidget::current_changed (boost::shared_ptr old_master, boost::shared_ptr new_master) +TransportMastersWidget::current_changed (std::shared_ptr old_master, std::shared_ptr new_master) { for (vector::iterator r = rows.begin(); r != rows.end(); ++r) { if ((*r)->tm == new_master) { @@ -229,7 +229,7 @@ TransportMastersWidget::rebuild () table.attach (r->current_box, col, col+1, n, n+1, FILL, SHRINK); ++col; table.attach (r->last_box, col, col+1, n, n+1, FILL, SHRINK); ++col; - boost::shared_ptr ttm (boost::dynamic_pointer_cast (r->tm)); + std::shared_ptr ttm (std::dynamic_pointer_cast (r->tm)); if (ttm) { table.attach (r->sclock_synced_button, col, col+1, n, n+1, FILL, SHRINK); ++col; @@ -431,11 +431,11 @@ TransportMastersWidget::Row::prop_change (PropertyChange what_changed) } if (what_changed.contains (Properties::fr2997)) { - fr2997_button.set_active (boost::dynamic_pointer_cast (tm)->fr2997()); + fr2997_button.set_active (std::dynamic_pointer_cast (tm)->fr2997()); } if (what_changed.contains (Properties::sclock_synced)) { - sclock_synced_button.set_active (boost::dynamic_pointer_cast (tm)->sample_clock_synced()); + sclock_synced_button.set_active (std::dynamic_pointer_cast (tm)->sample_clock_synced()); } if (what_changed.contains (Properties::collect)) { @@ -461,7 +461,7 @@ TransportMastersWidget::Row::use_button_toggled () void TransportMastersWidget::Row::fr2997_button_toggled () { - boost::dynamic_pointer_cast(tm)->set_fr2997 (fr2997_button.get_active()); + std::dynamic_pointer_cast(tm)->set_fr2997 (fr2997_button.get_active()); } void @@ -558,8 +558,8 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) samplepos_t when; stringstream ss; Time t; - boost::shared_ptr ttm; - boost::shared_ptr mtm; + std::shared_ptr ttm; + std::shared_ptr mtm; if (!AudioEngine::instance()->running() || !s) { return; @@ -571,7 +571,7 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) if (tm->speed_and_position (speed, pos, most_recent, when, now)) { - if ((ttm = boost::dynamic_pointer_cast (tm))) { + if ((ttm = std::dynamic_pointer_cast (tm))) { Timecode::TimecodeFormat fmt = ttm->apparent_timecode_format(); format.set_text (timecode_format_name (fmt)); @@ -580,7 +580,7 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) Timecode::timecode_has_drop_frames (fmt), TEMPORAL_SAMPLE_RATE, 0, false, 0); - } else if ((mtm = boost::dynamic_pointer_cast (tm))) { + } else if ((mtm = std::dynamic_pointer_cast (tm))) { char buf[16]; snprintf (buf, sizeof (buf), "%.1f BPM", mtm->bpm()); buf[15] = '\0'; diff --git a/gtk2_ardour/transport_masters_dialog.h b/gtk2_ardour/transport_masters_dialog.h index 1e39e7d7df..caf756969b 100644 --- a/gtk2_ardour/transport_masters_dialog.h +++ b/gtk2_ardour/transport_masters_dialog.h @@ -58,7 +58,7 @@ class TransportMastersWidget : public Gtk::VBox, public ARDOUR::SessionHandlePtr ~TransportMastersWidget (); void update (Temporal::timepos_t); - void set_transport_master (boost::shared_ptr); + void set_transport_master (std::shared_ptr); void set_session (ARDOUR::Session*); @@ -104,7 +104,7 @@ class TransportMastersWidget : public Gtk::VBox, public ARDOUR::SessionHandlePtr void mod_request_type (ARDOUR::TransportRequestType); - boost::shared_ptr tm; + std::shared_ptr tm; void update (ARDOUR::Session*, ARDOUR::samplepos_t); @@ -168,7 +168,7 @@ class TransportMastersWidget : public Gtk::VBox, public ARDOUR::SessionHandlePtr void rebuild (); void clear (); - void current_changed (boost::shared_ptr old_master, boost::shared_ptr new_master); + void current_changed (std::shared_ptr old_master, std::shared_ptr new_master); void add_master (); void update_usability (); void allow_master_select (bool); diff --git a/gtk2_ardour/trigger_clip_picker.cc b/gtk2_ardour/trigger_clip_picker.cc index 73ff1a53e5..f50c03448e 100644 --- a/gtk2_ardour/trigger_clip_picker.cc +++ b/gtk2_ardour/trigger_clip_picker.cc @@ -497,9 +497,9 @@ TriggerClipPicker::row_selected () std::string path = (*i)[_columns.path]; if (SMFSource::valid_midi_file (path)) { /* TODO: if it's a really big file, we could skip this check */ - boost::shared_ptr ms; + std::shared_ptr ms; try { - ms = boost::dynamic_pointer_cast ( + ms = std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::MIDI, *_session, path, 0, Source::Flag (0), false)); } catch (const std::exception& e) { @@ -619,7 +619,7 @@ TriggerClipPicker::drag_data_received (Glib::RefPtr const& con { if (data.get_target () == "x-ardour/region.pbdid") { PBD::ID rid (data.get_data_as_string ()); - boost::shared_ptr region = RegionFactory::region_by_id (rid); + std::shared_ptr region = RegionFactory::region_by_id (rid); if (export_to_clip_library (region, this)) { context->drag_finish (true, false, time); } else { @@ -978,10 +978,10 @@ TriggerClipPicker::audition (std::string const& path) return; } - boost::shared_ptr r; + std::shared_ptr r; if (SMFSource::valid_midi_file (path)) { - boost::shared_ptr ms = boost::dynamic_pointer_cast (SourceFactory::createExternal (DataType::MIDI, *_session, path, 0, Source::Flag (0), false)); + std::shared_ptr ms = std::dynamic_pointer_cast (SourceFactory::createExternal (DataType::MIDI, *_session, path, 0, Source::Flag (0), false)); std::string rname = region_name_from_path (ms->path (), false); @@ -991,12 +991,12 @@ TriggerClipPicker::audition (std::string const& path) plist.add (ARDOUR::Properties::name, rname); plist.add (ARDOUR::Properties::layer, 0); - r = boost::dynamic_pointer_cast (RegionFactory::create (boost::dynamic_pointer_cast (ms), plist, false)); + r = std::dynamic_pointer_cast (RegionFactory::create (std::dynamic_pointer_cast (ms), plist, false)); assert (r); } else { SourceList srclist; - boost::shared_ptr afs; + std::shared_ptr afs; bool old_sbp = AudioSource::get_build_peakfiles (); /* don't even think of building peakfiles for these files */ @@ -1012,9 +1012,9 @@ TriggerClipPicker::audition (std::string const& path) for (uint16_t n = 0; n < info.channels; ++n) { try { - afs = boost::dynamic_pointer_cast (SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false)); + afs = std::dynamic_pointer_cast (SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false)); if (afs->sample_rate () != _session->nominal_sample_rate ()) { - boost::shared_ptr sfs (new SrcFileSource (*_session, afs, ARDOUR::SrcGood)); + std::shared_ptr sfs (new SrcFileSource (*_session, afs, ARDOUR::SrcGood)); srclist.push_back (sfs); } else { srclist.push_back (afs); @@ -1032,7 +1032,7 @@ TriggerClipPicker::audition (std::string const& path) return; } - afs = boost::dynamic_pointer_cast (srclist[0]); + afs = std::dynamic_pointer_cast (srclist[0]); std::string rname = region_name_from_path (afs->path (), false); PropertyList plist; @@ -1041,7 +1041,7 @@ TriggerClipPicker::audition (std::string const& path) plist.add (ARDOUR::Properties::name, rname); plist.add (ARDOUR::Properties::layer, 0); - r = boost::dynamic_pointer_cast (RegionFactory::create (srclist, plist, false)); + r = std::dynamic_pointer_cast (RegionFactory::create (srclist, plist, false)); } r->set_position (timepos_t ()); @@ -1076,7 +1076,7 @@ void TriggerClipPicker::audition_show_plugin_ui () { if (!_audition_plugnui) { - boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (_session->the_auditioner ()->the_instrument ()); + std::shared_ptr plugin_insert = std::dynamic_pointer_cast (_session->the_auditioner ()->the_instrument ()); if (plugin_insert) { _audition_plugnui = new PluginUIWindow (plugin_insert); _audition_plugnui->set_session (_session); @@ -1113,7 +1113,7 @@ TriggerClipPicker::audition_processors_changed () } if (_session && _session->the_auditioner ()->get_audition_synth_info()) { - boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (_session->the_auditioner ()->the_instrument ()); + std::shared_ptr plugin_insert = std::dynamic_pointer_cast (_session->the_auditioner ()->the_instrument ()); if (plugin_insert) { set_tooltip (_show_plugin_btn, "Show the selected audition-instrument's GUI"); _show_plugin_btn.set_sensitive (true); diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index c0b0953ae8..51cfac0a1a 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -153,7 +153,7 @@ TriggerMaster::~TriggerMaster () } void -TriggerMaster::set_triggerbox (boost::shared_ptr t) +TriggerMaster::set_triggerbox (std::shared_ptr t) { _triggerbox = t; } @@ -727,10 +727,10 @@ CueMaster::context_menu () void CueMaster::get_boxen (TriggerBoxList &boxlist) { - boost::shared_ptr rl = _session->get_routes(); + std::shared_ptr rl = _session->get_routes(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr route = *r; - boost::shared_ptr box = route->triggerbox(); + std::shared_ptr route = *r; + std::shared_ptr box = route->triggerbox(); #warning @Ben disambiguate processor *active* vs *visibility* if (box /*&& box.active*/) { boxlist.push_back(box); diff --git a/gtk2_ardour/trigger_master.h b/gtk2_ardour/trigger_master.h index 16796d6ee8..00c58d3c3c 100644 --- a/gtk2_ardour/trigger_master.h +++ b/gtk2_ardour/trigger_master.h @@ -65,7 +65,7 @@ public: TriggerMaster (ArdourCanvas::Item* canvas); ~TriggerMaster (); - void set_triggerbox (boost::shared_ptr); + void set_triggerbox (std::shared_ptr); void render (ArdourCanvas::Rect const&, Cairo::RefPtr) const; @@ -93,7 +93,7 @@ private: void set_default_colors (); void shape_stop_button (); - boost::shared_ptr _triggerbox; + std::shared_ptr _triggerbox; Loopster* _loopster; @@ -109,7 +109,7 @@ private: sigc::connection _update_connection; }; -typedef std::list > TriggerBoxList; +typedef std::list > TriggerBoxList; class CueMaster : public ArdourCanvas::Rectangle, public ARDOUR::SessionHandlePtr { diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index a5a4d8361e..db7ba152de 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -358,7 +358,7 @@ TriggerPage::add_sidebar_page (string const & name, Gtk::Widget& widget) void TriggerPage::initial_track_display () { - boost::shared_ptr r = _session->get_tracks (); + std::shared_ptr r = _session->get_tracks (); RouteList rl (*r); _strips.clear (); add_routes (rl); @@ -373,7 +373,7 @@ TriggerPage::clear_selected_slot () return; } TriggerPtr trigger = ts.front ()->trigger (); - trigger->set_region (boost::shared_ptr()); + trigger->set_region (std::shared_ptr()); } void @@ -416,7 +416,7 @@ TriggerPage::add_routes (RouteList& rl) rl.sort (Stripable::Sorter ()); for (RouteList::iterator r = rl.begin (); r != rl.end (); ++r) { /* we're only interested in Tracks */ - if (!boost::dynamic_pointer_cast (*r)) { + if (!std::dynamic_pointer_cast (*r)) { continue; } #if 0 @@ -436,8 +436,8 @@ TriggerPage::add_routes (RouteList& rl) TriggerStrip* ts = new TriggerStrip (_session, *r); _strips.push_back (ts); - (*r)->presentation_info ().PropertyChanged.connect (*this, invalidator (*this), boost::bind (&TriggerPage::stripable_property_changed, this, _1, boost::weak_ptr (*r)), gui_context ()); - (*r)->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&TriggerPage::stripable_property_changed, this, _1, boost::weak_ptr (*r)), gui_context ()); + (*r)->presentation_info ().PropertyChanged.connect (*this, invalidator (*this), boost::bind (&TriggerPage::stripable_property_changed, this, _1, std::weak_ptr (*r)), gui_context ()); + (*r)->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&TriggerPage::stripable_property_changed, this, _1, std::weak_ptr (*r)), gui_context ()); ts->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &TriggerPage::strip_button_release_event), ts)); } redisplay_track_list (); @@ -461,8 +461,8 @@ TriggerPage::remove_route (TriggerStrip* ra) struct TriggerStripSorter { bool operator() (const TriggerStrip* ts_a, const TriggerStrip* ts_b) { - boost::shared_ptr const& a = ts_a->stripable (); - boost::shared_ptr const& b = ts_b->stripable (); + std::shared_ptr const& a = ts_a->stripable (); + std::shared_ptr const& b = ts_b->stripable (); return ARDOUR::Stripable::Sorter () (a, b); } }; @@ -475,8 +475,8 @@ TriggerPage::redisplay_track_list () for (list::iterator i = _strips.begin (); i != _strips.end (); ++i) { TriggerStrip* strip = *i; - boost::shared_ptr s = strip->stripable (); - boost::shared_ptr route = boost::dynamic_pointer_cast (s); + std::shared_ptr s = strip->stripable (); + std::shared_ptr route = std::dynamic_pointer_cast (s); bool hidden = s->presentation_info ().hidden (); @@ -507,7 +507,7 @@ TriggerPage::redisplay_track_list () } AxisView* -TriggerPage::axis_view_by_stripable (boost::shared_ptr s) const +TriggerPage::axis_view_by_stripable (std::shared_ptr s) const { for (list::const_iterator i = _strips.begin (); i != _strips.end (); ++i) { TriggerStrip* strip = *i; @@ -519,7 +519,7 @@ TriggerPage::axis_view_by_stripable (boost::shared_ptr s) const } AxisView* -TriggerPage::axis_view_by_control (boost::shared_ptr c) const +TriggerPage::axis_view_by_control (std::shared_ptr c) const { return 0; } @@ -541,11 +541,11 @@ TriggerPage::pi_property_changed (PBD::PropertyChange const& what_changed) } void -TriggerPage::stripable_property_changed (PBD::PropertyChange const& what_changed, boost::weak_ptr ws) +TriggerPage::stripable_property_changed (PBD::PropertyChange const& what_changed, std::weak_ptr ws) { if (what_changed.contains (ARDOUR::Properties::trigger_track)) { #if 0 - boost::shared_ptr s = ws.lock (); + std::shared_ptr s = ws.lock (); /* TODO: find trigger-strip for given stripable, delete *it; */ #else /* For now we just hide it */ @@ -661,25 +661,25 @@ TriggerPage::no_strip_drag_data_received (Glib::RefPtr const& { if (data.get_target () == "x-ardour/region.pbdid") { PBD::ID rid (data.get_data_as_string ()); - boost::shared_ptr region = RegionFactory::region_by_id (rid); - boost::shared_ptr triggerbox; + std::shared_ptr region = RegionFactory::region_by_id (rid); + std::shared_ptr triggerbox; - if (boost::dynamic_pointer_cast (region)) { + if (std::dynamic_pointer_cast (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(); } - std::list > audio_tracks; + std::list > audio_tracks; audio_tracks = session()->new_audio_track (region->sources().size(), output_chan, 0, 1, region->name(), PresentationInfo::max_order, Normal, true, true); if (!audio_tracks.empty()) { triggerbox = audio_tracks.front()->triggerbox (); } - } else if (boost::dynamic_pointer_cast (region)) { + } else if (std::dynamic_pointer_cast (region)) { ChanCount one_midi_port (DataType::MIDI, 1); - list > midi_tracks; + list > midi_tracks; midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, Config->get_strict_io () || Profile->get_mixbus (), - boost::shared_ptr(), + std::shared_ptr(), (ARDOUR::Plugin::PresetRecord*) 0, (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order, Normal, true, true); if (!midi_tracks.empty()) { @@ -693,7 +693,7 @@ TriggerPage::no_strip_drag_data_received (Glib::RefPtr const& } // XXX: check does the region need to be copied? - boost::shared_ptr region_copy = RegionFactory::create (region, true); + std::shared_ptr region_copy = RegionFactory::create (region, true); triggerbox->set_from_selection (0, region_copy); context->drag_finish (true, false, time); diff --git a/gtk2_ardour/trigger_page.h b/gtk2_ardour/trigger_page.h index bac521e209..57e8bb4897 100644 --- a/gtk2_ardour/trigger_page.h +++ b/gtk2_ardour/trigger_page.h @@ -78,7 +78,7 @@ private: void redisplay_track_list (); void pi_property_changed (PBD::PropertyChange const&); - void stripable_property_changed (PBD::PropertyChange const&, boost::weak_ptr); + void stripable_property_changed (PBD::PropertyChange const&, std::weak_ptr); void rec_state_changed (); void rec_state_clicked (); @@ -93,8 +93,8 @@ private: bool idle_drop_paths (std::vector); void drop_paths_part_two (std::vector); - AxisView* axis_view_by_stripable (boost::shared_ptr) const; - AxisView* axis_view_by_control (boost::shared_ptr) const; + AxisView* axis_view_by_stripable (std::shared_ptr) const; + AxisView* axis_view_by_control (std::shared_ptr) const; void selection_changed (); PBD::ScopedConnectionList editor_connections; diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc index 0c8206871d..31844c16b7 100644 --- a/gtk2_ardour/trigger_strip.cc +++ b/gtk2_ardour/trigger_strip.cc @@ -58,7 +58,7 @@ using namespace std; PBD::Signal1 TriggerStrip::CatchDeletion; -TriggerStrip::TriggerStrip (Session* s, boost::shared_ptr rt) +TriggerStrip::TriggerStrip (Session* s, std::shared_ptr rt) : SessionHandlePtr (s) , RouteUI (s) , _clear_meters (true) @@ -189,7 +189,7 @@ TriggerStrip::init () } void -TriggerStrip::set_route (boost::shared_ptr rt) +TriggerStrip::set_route (std::shared_ptr rt) { RouteUI::set_route (rt); @@ -198,7 +198,7 @@ TriggerStrip::set_route (boost::shared_ptr rt) _processor_box.set_route (rt); /* Fader/Gain */ - boost::shared_ptr ac = _route->gain_control (); + std::shared_ptr ac = _route->gain_control (); _gain_control = AutomationController::create (ac->parameter (), ParameterDescriptor (ac->parameter ()), ac, false); _gain_control->set_name (X_("ProcessorControlSlider")); _gain_control->set_size_request (PX_SCALE (19), -1); @@ -291,7 +291,7 @@ TriggerStrip::build_route_ops_menu () items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins))); } - if (active && (boost::dynamic_pointer_cast(_route) || _route->the_instrument ())) { + if (active && (std::dynamic_pointer_cast(_route) || _route->the_instrument ())) { items.push_back (MenuElem (_("Patch Selector..."), sigc::mem_fun(*this, &RouteUI::select_midi_patch))); } @@ -366,7 +366,7 @@ TriggerStrip::connect_to_pan () return; } - boost::shared_ptr p = _route->pannable (); + std::shared_ptr p = _route->pannable (); p->automation_state_changed.connect (_panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &_panners), gui_context ()); @@ -459,12 +459,12 @@ TriggerStrip::plugin_selector () } void -TriggerStrip::hide_processor_editor (boost::weak_ptr p) +TriggerStrip::hide_processor_editor (std::weak_ptr p) { /* TODO consolidate w/ TriggerStrip::hide_processor_editor * -> RouteUI ? */ - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor) { return; } @@ -481,7 +481,7 @@ TriggerStrip::map_frozen () { ENSURE_GUI_THREAD (*this, &TriggerStrip::map_frozen) - boost::shared_ptr at = audio_track (); + std::shared_ptr at = audio_track (); bool en = _route->active () || ARDOUR::Profile->get_mixbus (); diff --git a/gtk2_ardour/trigger_strip.h b/gtk2_ardour/trigger_strip.h index d6e6dfd2d7..15d01591b1 100644 --- a/gtk2_ardour/trigger_strip.h +++ b/gtk2_ardour/trigger_strip.h @@ -46,14 +46,14 @@ class TriggerMaster; class TriggerStrip : public AxisView, public RouteUI, public Gtk::EventBox { public: - TriggerStrip (ARDOUR::Session*, boost::shared_ptr); + TriggerStrip (ARDOUR::Session*, std::shared_ptr); ~TriggerStrip (); /* AxisView */ std::string name () const; Gdk::Color color () const; - boost::shared_ptr stripable () const + std::shared_ptr stripable () const { return RouteUI::stripable (); } @@ -85,7 +85,7 @@ private: void init (); /* RouteUI */ - void set_route (boost::shared_ptr); + void set_route (std::shared_ptr); void route_property_changed (const PBD::PropertyChange&); void route_color_changed (); void update_sensitivity (); @@ -105,7 +105,7 @@ private: /* Plugin related */ PluginSelector* plugin_selector (); - void hide_processor_editor (boost::weak_ptr); + void hide_processor_editor (std::weak_ptr); /* Panner */ void connect_to_pan (); @@ -130,7 +130,7 @@ private: TriggerBoxWidget _trigger_display; PannerUI _panners; LevelMeterVBox _level_meter; - boost::shared_ptr _gain_control; + std::shared_ptr _gain_control; Gtk::Menu* _route_ops_menu; }; diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index cfd3c58dd6..98fda9e265 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -615,7 +615,7 @@ TriggerUI::toggle_trigger_isolated () void TriggerUI::clear_trigger () { - trigger()->set_region (boost::shared_ptr()); + trigger()->set_region (std::shared_ptr()); } void diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index 59461661aa..216a0ab291 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -784,7 +784,7 @@ TriggerEntry::drag_begin (Glib::RefPtr const& context) /* ctx leaves scope, cr is destroyed, and pixmap surface is flush()ed */ } - boost::shared_ptr region = trigger ()->region (); + std::shared_ptr region = trigger ()->region (); if (region) { PublicEditor::instance ().pbdid_dragged_dt = region->data_type (); } else { @@ -812,7 +812,7 @@ TriggerEntry::drag_data_get (Glib::RefPtr const&, Gtk::Selecti return; } if (data.get_target () == "x-ardour/region.pbdid") { - boost::shared_ptr region = trigger ()->region (); + std::shared_ptr region = trigger ()->region (); if (region) { data.set (data.get_target (), region->id ().to_s ()); } @@ -989,7 +989,7 @@ TriggerBoxUI::drag_data_received (Glib::RefPtr const& context, if (data.get_target () == "x-ardour/region.pbdid") { PBD::ID rid (data.get_data_as_string ()); - boost::shared_ptr region = RegionFactory::region_by_id (rid); + std::shared_ptr region = RegionFactory::region_by_id (rid); if (region) { _triggerbox.set_from_selection (n, region); context->drag_finish (true, false, time); @@ -1001,11 +1001,11 @@ TriggerBoxUI::drag_data_received (Glib::RefPtr const& context, if (data.get_target () == "x-ardour/trigger.pbdid") { PBD::ID tid (data.get_data_as_string ()); - boost::shared_ptr source = _triggerbox.session().trigger_by_id (tid); + std::shared_ptr source = _triggerbox.session().trigger_by_id (tid); if (source) { Trigger::UIState *state = new Trigger::UIState(); source->get_ui_state(*state); - boost::shared_ptr state_p (state); + std::shared_ptr state_p (state); _triggerbox.enqueue_trigger_state_for_region(source->region(), state_p); _triggerbox.set_from_selection (n, source->region()); context->drag_finish (true, false, time); diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 221212958e..2241e3e46d 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -970,9 +970,9 @@ ARDOUR_UI_UTILS::convert_drop_to_paths (vector& paths, const SelectionDa } void -ARDOUR_UI_UTILS::copy_patch_changes (boost::shared_ptr a, boost::shared_ptr t) +ARDOUR_UI_UTILS::copy_patch_changes (std::shared_ptr a, std::shared_ptr t) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (t); + std::shared_ptr mt = std::dynamic_pointer_cast (t); if (!mt || !a) { return; diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 4827ad9115..3c2a0e2495 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -113,7 +113,7 @@ bool running_from_source_tree (); void inhibit_screensaver (bool); -void copy_patch_changes (boost::shared_ptr, boost::shared_ptr); +void copy_patch_changes (std::shared_ptr, std::shared_ptr); bool convert_drop_to_paths (std::vector&, const Gtk::SelectionData&); diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 2b24c7cf92..a4423ba5e4 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -51,7 +51,7 @@ using std::string; PBD::Signal1 VCAMasterStrip::CatchDeletion; -VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) +VCAMasterStrip::VCAMasterStrip (Session* s, std::shared_ptr v) : SessionHandlePtr (s) , _vca (v) , gain_meter (s, 254) /* magic number, don't adjust blindly */ @@ -65,11 +65,11 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) _vca->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (unique_random_color())); } - control_slave_ui.set_stripable (boost::dynamic_pointer_cast (v)); + control_slave_ui.set_stripable (std::dynamic_pointer_cast (v)); - gain_meter.set_controls (boost::shared_ptr(), - boost::shared_ptr(), - boost::shared_ptr(), + gain_meter.set_controls (std::shared_ptr(), + std::shared_ptr(), + std::shared_ptr(), _vca->gain_control()); solo_button.set_name ("solo button"); @@ -151,7 +151,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) update_vca_name (); solo_changed (); mute_changed (); - spill_change (boost::shared_ptr()); + spill_change (std::shared_ptr()); Mixer_UI::instance()->show_spill_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); @@ -173,7 +173,7 @@ VCAMasterStrip::~VCAMasterStrip () { if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } delete delete_dialog; @@ -187,14 +187,14 @@ VCAMasterStrip::self_delete () { if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } /* Drop reference immediately, delete self when idle */ _vca.reset (); - gain_meter.set_controls (boost::shared_ptr(), - boost::shared_ptr(), - boost::shared_ptr(), - boost::shared_ptr()); + gain_meter.set_controls (std::shared_ptr(), + std::shared_ptr(), + std::shared_ptr(), + std::shared_ptr()); delete_when_idle (this); } @@ -475,14 +475,14 @@ void VCAMasterStrip::spill () { if (Mixer_UI::instance()->showing_spill_for (_vca)) { - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } else { Mixer_UI::instance()->show_spill (_vca); } } void -VCAMasterStrip::spill_change (boost::shared_ptr vca) +VCAMasterStrip::spill_change (std::shared_ptr vca) { if (vca != _vca) { vertical_button.set_active_state (Gtkmm2ext::Off); @@ -547,7 +547,7 @@ VCAMasterStrip::drop_all_slaves () _vca->Drop (); /* EMIT SIGNAL */ if (Mixer_UI::instance()->showing_spill_for (_vca)) { - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } } @@ -591,7 +591,7 @@ VCAMasterStrip::presentation_info () const return _vca->presentation_info(); } -boost::shared_ptr +std::shared_ptr VCAMasterStrip::stripable () const { return _vca; diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h index 1c41e225e0..81b58f90ae 100644 --- a/gtk2_ardour/vca_master_strip.h +++ b/gtk2_ardour/vca_master_strip.h @@ -45,16 +45,16 @@ class FloatingTextEntry; class VCAMasterStrip : public AxisView, public Gtk::EventBox { public: - VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr); + VCAMasterStrip (ARDOUR::Session*, std::shared_ptr); ~VCAMasterStrip (); - boost::shared_ptr stripable() const; + std::shared_ptr stripable() const; ARDOUR::PresentationInfo const & presentation_info () const; std::string name() const; Gdk::Color color () const; std::string state_id() const; - boost::shared_ptr vca() const { return _vca; } + std::shared_ptr vca() const { return _vca; } static PBD::Signal1 CatchDeletion; @@ -62,7 +62,7 @@ public: bool set_marked_for_display (bool); private: - boost::shared_ptr _vca; + std::shared_ptr _vca; GainMeter gain_meter; Gtk::Frame global_frame; @@ -82,7 +82,7 @@ private: PBD::ScopedConnectionList vca_connections; void spill (); - void spill_change (boost::shared_ptr); + void spill_change (std::shared_ptr); void hide_clicked(); bool width_button_pressed (GdkEventButton *); void set_selected (bool); diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index e12034f734..3507db7ad2 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -165,14 +165,14 @@ VCATimeAxisView::mute_release (GdkEventButton*) } void -VCATimeAxisView::set_vca (boost::shared_ptr v) +VCATimeAxisView::set_vca (std::shared_ptr v) { StripableTimeAxisView::set_stripable (v); _vca = v; - gain_meter.set_controls (boost::shared_ptr(), - boost::shared_ptr(), - boost::shared_ptr(), + gain_meter.set_controls (std::shared_ptr(), + std::shared_ptr(), + std::shared_ptr(), _vca->gain_control()); // Mixer_UI::instance()->show_vca_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); @@ -341,7 +341,7 @@ VCATimeAxisView::presentation_info () const return _vca->presentation_info(); } -boost::shared_ptr +std::shared_ptr VCATimeAxisView::stripable () const { return _vca; @@ -391,14 +391,14 @@ VCATimeAxisView::set_marked_for_display (bool yn) void VCATimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, bool show) { - boost::shared_ptr c = _vca->gain_control(); + std::shared_ptr c = _vca->gain_control(); if (!c) { error << "VCA has no gain automation, unable to add automation track view." << endmsg; return; } gain_track.reset (new AutomationTimeAxisView (_session, - _vca, boost::shared_ptr (), c, param, + _vca, std::shared_ptr (), c, param, _editor, *this, false, @@ -411,14 +411,14 @@ VCATimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, b void VCATimeAxisView::create_mute_automation_child (const Evoral::Parameter& param, bool show) { - boost::shared_ptr c = _vca->mute_control(); + std::shared_ptr c = _vca->mute_control(); if (!c) { error << "VCA has no mute automation, unable to add automation track view." << endmsg; return; } mute_track.reset (new AutomationTimeAxisView (_session, - _vca, boost::shared_ptr (), c, param, + _vca, std::shared_ptr (), c, param, _editor, *this, false, @@ -555,7 +555,7 @@ VCATimeAxisView::drop_all_slaves () _vca->Drop (); /* EMIT SIGNAL */ if (Mixer_UI::instance()->showing_spill_for (_vca)) { - Mixer_UI::instance()->show_spill (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (std::shared_ptr()); } } diff --git a/gtk2_ardour/vca_time_axis.h b/gtk2_ardour/vca_time_axis.h index 74d051d0a9..8863140b01 100644 --- a/gtk2_ardour/vca_time_axis.h +++ b/gtk2_ardour/vca_time_axis.h @@ -41,11 +41,11 @@ public: VCATimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); virtual ~VCATimeAxisView (); - boost::shared_ptr stripable() const; + std::shared_ptr stripable() const; ARDOUR::PresentationInfo const & presentation_info () const; - void set_vca (boost::shared_ptr); - boost::shared_ptr vca() const { return _vca; } + void set_vca (std::shared_ptr); + std::shared_ptr vca() const { return _vca; } std::string name() const; Gdk::Color color () const; @@ -61,7 +61,7 @@ public: void hide_all_automation (bool apply_to_selection = false); protected: - boost::shared_ptr _vca; + std::shared_ptr _vca; ArdourWidgets::ArdourButton solo_button; ArdourWidgets::ArdourButton mute_button; ArdourWidgets::ArdourButton automation_button; diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h index 9a293784d6..ae7a9aa3a1 100644 --- a/gtk2_ardour/video_image_frame.h +++ b/gtk2_ardour/video_image_frame.h @@ -67,7 +67,7 @@ class VideoImageFrame : public sigc::trackable PublicEditor& editor; ArdourCanvas::Container *_parent; ArdourCanvas::Image *image; - boost::shared_ptr img; + std::shared_ptr img; int clip_width; int clip_height; diff --git a/gtk2_ardour/virtual_keyboard_window.cc b/gtk2_ardour/virtual_keyboard_window.cc index 8f80c80249..9f3e203f09 100644 --- a/gtk2_ardour/virtual_keyboard_window.cc +++ b/gtk2_ardour/virtual_keyboard_window.cc @@ -100,11 +100,11 @@ VirtualKeyboardWindow::VirtualKeyboardWindow () _piano_octave_range.set_active ("7"); _transpose_output.set_active ("0"); - _pitchbend = boost::shared_ptr (new VKBDControl ("PB", 8192, 16383)); + _pitchbend = std::shared_ptr (new VKBDControl ("PB", 8192, 16383)); _pitch_slider = manage (new VSliderController (&_pitch_adjustment, _pitchbend, 0, PX_SCALE (15))); _pitch_slider_tooltip = new Gtkmm2ext::PersistentTooltip (_pitch_slider); - _modwheel = boost::shared_ptr (new VKBDControl ("MW", 0, 127)); + _modwheel = std::shared_ptr (new VKBDControl ("MW", 0, 127)); _modwheel_slider = manage (new VSliderController (&_modwheel_adjustment, _modwheel, 0, PX_SCALE (15))); _modwheel_tooltip = new Gtkmm2ext::PersistentTooltip (_modwheel_slider); @@ -137,7 +137,7 @@ VirtualKeyboardWindow::VirtualKeyboardWindow () int col = 4; for (size_t i = 0; i < VKBD_NCTRLS; ++i, ++col) { - _cc[i] = boost::shared_ptr (new VKBDControl ("CC")); + _cc[i] = std::shared_ptr (new VKBDControl ("CC")); _cc_knob[i] = manage (new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Flags (0))); _cc_knob[i]->set_controllable (_cc[i]); _cc_knob[i]->set_size_request (PX_SCALE (21), PX_SCALE (21)); diff --git a/gtk2_ardour/virtual_keyboard_window.h b/gtk2_ardour/virtual_keyboard_window.h index f3d676ab48..514f508232 100644 --- a/gtk2_ardour/virtual_keyboard_window.h +++ b/gtk2_ardour/virtual_keyboard_window.h @@ -137,18 +137,18 @@ private: ArdourWidgets::ArdourDropdown _transpose_output; ArdourWidgets::ArdourButton _send_panic; - boost::shared_ptr _pitchbend; + std::shared_ptr _pitchbend; Gtk::Adjustment _pitch_adjustment; ArdourWidgets::VSliderController* _pitch_slider; Gtkmm2ext::PersistentTooltip* _pitch_slider_tooltip; - boost::shared_ptr _modwheel; + std::shared_ptr _modwheel; Gtk::Adjustment _modwheel_adjustment; ArdourWidgets::VSliderController* _modwheel_slider; Gtkmm2ext::PersistentTooltip* _modwheel_tooltip; #define VKBD_NCTRLS 4 - boost::shared_ptr _cc[VKBD_NCTRLS]; + std::shared_ptr _cc[VKBD_NCTRLS]; ArdourWidgets::ArdourKnob* _cc_knob[VKBD_NCTRLS]; ArdourWidgets::ArdourDropdown _cc_key[VKBD_NCTRLS]; diff --git a/gtk2_ardour/vst3_hwnd_plugin_ui.cc b/gtk2_ardour/vst3_hwnd_plugin_ui.cc index 63ae897d69..bb63fcec43 100644 --- a/gtk2_ardour/vst3_hwnd_plugin_ui.cc +++ b/gtk2_ardour/vst3_hwnd_plugin_ui.cc @@ -36,7 +36,7 @@ using namespace ARDOUR; using namespace Steinberg; -VST3HWNDPluginUI::VST3HWNDPluginUI (boost::shared_ptr pib, boost::shared_ptr vst3) +VST3HWNDPluginUI::VST3HWNDPluginUI (std::shared_ptr pib, std::shared_ptr vst3) : VST3PluginUI (pib, vst3) { /* TODO register window class, implement wndproc etc */ diff --git a/gtk2_ardour/vst3_hwnd_plugin_ui.h b/gtk2_ardour/vst3_hwnd_plugin_ui.h index de05c11f09..f99ca335fe 100644 --- a/gtk2_ardour/vst3_hwnd_plugin_ui.h +++ b/gtk2_ardour/vst3_hwnd_plugin_ui.h @@ -29,7 +29,7 @@ class VST3HWNDPluginUI : public VST3PluginUI { public: - VST3HWNDPluginUI (boost::shared_ptr, boost::shared_ptr); + VST3HWNDPluginUI (std::shared_ptr, std::shared_ptr); ~VST3HWNDPluginUI (); bool on_window_show(const std::string&); diff --git a/gtk2_ardour/vst3_nsview_plugin_ui.h b/gtk2_ardour/vst3_nsview_plugin_ui.h index 1252b402e5..6d8c648ce8 100644 --- a/gtk2_ardour/vst3_nsview_plugin_ui.h +++ b/gtk2_ardour/vst3_nsview_plugin_ui.h @@ -43,7 +43,7 @@ class VST3NSViewPluginUI : public VST3PluginUI { public: - VST3NSViewPluginUI (boost::shared_ptr, boost::shared_ptr); + VST3NSViewPluginUI (std::shared_ptr, std::shared_ptr); ~VST3NSViewPluginUI (); bool on_window_show(const std::string&); diff --git a/gtk2_ardour/vst3_plugin_ui.cc b/gtk2_ardour/vst3_plugin_ui.cc index fb825cacc6..69ad59b962 100644 --- a/gtk2_ardour/vst3_plugin_ui.cc +++ b/gtk2_ardour/vst3_plugin_ui.cc @@ -35,7 +35,7 @@ using namespace Steinberg; DEF_CLASS_IID (Presonus::IPlugInViewScaling) #endif -VST3PluginUI::VST3PluginUI (boost::shared_ptr pib, boost::shared_ptr vst3) +VST3PluginUI::VST3PluginUI (std::shared_ptr pib, std::shared_ptr vst3) : PlugUIBase (pib) , _vst3 (vst3) , _req_width (0) diff --git a/gtk2_ardour/vst3_plugin_ui.h b/gtk2_ardour/vst3_plugin_ui.h index 57ffbefeea..028813d85e 100644 --- a/gtk2_ardour/vst3_plugin_ui.h +++ b/gtk2_ardour/vst3_plugin_ui.h @@ -31,7 +31,7 @@ namespace ARDOUR { class VST3PluginUI : public PlugUIBase, public Gtk::VBox { public: - VST3PluginUI (boost::shared_ptr, boost::shared_ptr); + VST3PluginUI (std::shared_ptr, std::shared_ptr); virtual ~VST3PluginUI (); gint get_preferred_height (); @@ -49,7 +49,7 @@ protected: bool forward_scroll_event (GdkEventScroll*); - boost::shared_ptr _vst3; + std::shared_ptr _vst3; Gtk::HBox _ardour_buttons_box; diff --git a/gtk2_ardour/vst3_x11_plugin_ui.cc b/gtk2_ardour/vst3_x11_plugin_ui.cc index 285b1b538c..2b79d85583 100644 --- a/gtk2_ardour/vst3_x11_plugin_ui.cc +++ b/gtk2_ardour/vst3_x11_plugin_ui.cc @@ -178,7 +178,7 @@ private: VST3X11Runloop static_runloop; -VST3X11PluginUI::VST3X11PluginUI (boost::shared_ptr pib, boost::shared_ptr vst3) +VST3X11PluginUI::VST3X11PluginUI (std::shared_ptr pib, std::shared_ptr vst3) : VST3PluginUI (pib, vst3) //, _runloop (new VST3X11Runloop) { diff --git a/gtk2_ardour/vst3_x11_plugin_ui.h b/gtk2_ardour/vst3_x11_plugin_ui.h index d16f5a47fe..8d77493613 100644 --- a/gtk2_ardour/vst3_x11_plugin_ui.h +++ b/gtk2_ardour/vst3_x11_plugin_ui.h @@ -29,7 +29,7 @@ class VST3X11PluginUI : public VST3PluginUI { public: - VST3X11PluginUI (boost::shared_ptr, boost::shared_ptr); + VST3X11PluginUI (std::shared_ptr, std::shared_ptr); ~VST3X11PluginUI (); bool on_window_show(const std::string&); diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc index cf479624f6..cbdadab8eb 100644 --- a/gtk2_ardour/vst_plugin_ui.cc +++ b/gtk2_ardour/vst_plugin_ui.cc @@ -35,7 +35,7 @@ #include #endif -VSTPluginUI::VSTPluginUI (boost::shared_ptr pib, boost::shared_ptr plugin) +VSTPluginUI::VSTPluginUI (std::shared_ptr pib, std::shared_ptr plugin) : PlugUIBase (pib) , _vst (plugin) { diff --git a/gtk2_ardour/vst_plugin_ui.h b/gtk2_ardour/vst_plugin_ui.h index 4fca6cd51f..fb0a5b649f 100644 --- a/gtk2_ardour/vst_plugin_ui.h +++ b/gtk2_ardour/vst_plugin_ui.h @@ -28,7 +28,7 @@ namespace ARDOUR { class VSTPluginUI : public PlugUIBase, public Gtk::VBox { public: - VSTPluginUI (boost::shared_ptr, boost::shared_ptr); + VSTPluginUI (std::shared_ptr, std::shared_ptr); virtual ~VSTPluginUI (); virtual int get_preferred_height (); @@ -45,7 +45,7 @@ protected: virtual int get_XID () = 0; - boost::shared_ptr _vst; + std::shared_ptr _vst; Gtk::Socket _socket; virtual void top_box_allocated (Gtk::Allocation&) {} diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index 66f1496f5e..199acebf9a 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -39,7 +39,7 @@ using namespace Gtk; using namespace ARDOUR; using namespace PBD; -WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr pib, boost::shared_ptr vp, GtkWidget *parent) +WindowsVSTPluginUI::WindowsVSTPluginUI (std::shared_ptr pib, std::shared_ptr vp, GtkWidget *parent) : VSTPluginUI (pib, vp) { diff --git a/gtk2_ardour/windows_vst_plugin_ui.h b/gtk2_ardour/windows_vst_plugin_ui.h index b16d08e0e4..73fc0a87ab 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.h +++ b/gtk2_ardour/windows_vst_plugin_ui.h @@ -26,7 +26,7 @@ class WindowsVSTPluginUI : public VSTPluginUI { public: - WindowsVSTPluginUI (boost::shared_ptr, boost::shared_ptr, GtkWidget *parent); + WindowsVSTPluginUI (std::shared_ptr, std::shared_ptr, GtkWidget *parent); ~WindowsVSTPluginUI (); bool start_updating (GdkEventAny*) { return false; } diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index d959f0e80a..4e3d123f4e 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -42,7 +42,7 @@ using namespace PBD; #define GAIN_COEFF_DELTA (1e-5) -Amp::Amp (Session& s, const std::string& name, boost::shared_ptr gc, bool control_midi_also) +Amp::Amp (Session& s, const std::string& name, std::shared_ptr gc, bool control_midi_also) : Processor(s, "Amp", Temporal::AudioTime) , _apply_gain_automation(false) , _current_gain(GAIN_COEFF_ZERO) diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc index c97e57ac22..396574d47a 100644 --- a/libs/ardour/analyser.cc +++ b/libs/ardour/analyser.cc @@ -37,7 +37,7 @@ using namespace PBD; Glib::Threads::Mutex Analyser::analysis_active_lock; Glib::Threads::Mutex Analyser::analysis_queue_lock; Glib::Threads::Cond Analyser::SourcesToAnalyse; -list> Analyser::analysis_queue; +list> Analyser::analysis_queue; bool Analyser::analysis_thread_run = false; PBD::Thread* Analyser::analysis_thread = 0; @@ -67,7 +67,7 @@ Analyser::terminate () } void -Analyser::queue_source_for_analysis (boost::shared_ptr src, bool force) +Analyser::queue_source_for_analysis (std::shared_ptr src, bool force) { if (!src->can_be_analysed ()) { return; @@ -78,7 +78,7 @@ Analyser::queue_source_for_analysis (boost::shared_ptr src, bool force) } Glib::Threads::Mutex::Lock lm (analysis_queue_lock); - analysis_queue.push_back (boost::weak_ptr (src)); + analysis_queue.push_back (std::weak_ptr (src)); SourcesToAnalyse.broadcast (); } @@ -104,11 +104,11 @@ Analyser::work () goto wait; } - boost::shared_ptr src (analysis_queue.front ().lock ()); + std::shared_ptr src (analysis_queue.front ().lock ()); analysis_queue.pop_front (); analysis_queue_lock.unlock (); - boost::shared_ptr afs = boost::dynamic_pointer_cast (src); + std::shared_ptr afs = std::dynamic_pointer_cast (src); if (afs && !afs->empty ()) { Glib::Threads::Mutex::Lock lm (analysis_active_lock); @@ -118,7 +118,7 @@ Analyser::work () } void -Analyser::analyse_audio_file_source (boost::shared_ptr src) +Analyser::analyse_audio_file_source (std::shared_ptr src) { AnalysisFeatureList results; diff --git a/libs/ardour/analysis_graph.cc b/libs/ardour/analysis_graph.cc index 827584b3dc..3120c0fa33 100644 --- a/libs/ardour/analysis_graph.cc +++ b/libs/ardour/analysis_graph.cc @@ -55,7 +55,7 @@ AnalysisGraph::~AnalysisGraph () } void -AnalysisGraph::analyze_region (boost::shared_ptr region, bool raw) +AnalysisGraph::analyze_region (std::shared_ptr region, bool raw) { analyze_region (region.get(), raw, (ARDOUR::Progress*)0); } @@ -122,7 +122,7 @@ AnalysisGraph::analyze_region (AudioRegion const* region, bool raw, ARDOUR::Prog } void -AnalysisGraph::analyze_range (boost::shared_ptr route, boost::shared_ptr pl, const std::list& range) +AnalysisGraph::analyze_range (std::shared_ptr route, std::shared_ptr pl, const std::list& range) { const uint32_t n_audio = route->n_inputs().n_audio(); if (n_audio == 0 || n_audio > _max_chunksize) { diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index 58b9dcbf97..1eb1880523 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -38,7 +38,7 @@ class IO; /** Gain Stage (Fader, Trim). */ class LIBARDOUR_API Amp : public Processor { public: - Amp(Session& s, const std::string& display_name, boost::shared_ptr control, bool control_midi_also); + Amp(Session& s, const std::string& display_name, std::shared_ptr control, bool control_midi_also); std::string display_name () const { return _display_name; } void set_display_name (const std::string& name) { _display_name = name; } @@ -63,11 +63,11 @@ public: static gain_t apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, sampleoffset_t offset = 0); static void apply_simple_gain (AudioBuffer& buf, samplecnt_t nframes, gain_t target, sampleoffset_t offset = 0); - boost::shared_ptr gain_control() { + std::shared_ptr gain_control() { return _gain_control; } - boost::shared_ptr gain_control() const { + std::shared_ptr gain_control() const { return _gain_control; } @@ -78,7 +78,7 @@ private: std::string _display_name; - boost::shared_ptr _gain_control; + std::shared_ptr _gain_control; /** Buffer that we should use for gain automation */ gain_t* _gain_automation_buffer; diff --git a/libs/ardour/ardour/analyser.h b/libs/ardour/ardour/analyser.h index 8f175d3175..de678b14cf 100644 --- a/libs/ardour/ardour/analyser.h +++ b/libs/ardour/ardour/analyser.h @@ -37,7 +37,7 @@ public: static void init (); static void terminate (); - static void queue_source_for_analysis (boost::shared_ptr, bool force); + static void queue_source_for_analysis (std::shared_ptr, bool force); static void work (); static void flush (); @@ -45,11 +45,11 @@ private: static Glib::Threads::Mutex analysis_active_lock; static Glib::Threads::Mutex analysis_queue_lock; static Glib::Threads::Cond SourcesToAnalyse; - static std::list> analysis_queue; + static std::list> analysis_queue; static bool analysis_thread_run; static PBD::Thread* analysis_thread; - static void analyse_audio_file_source (boost::shared_ptr); + static void analyse_audio_file_source (std::shared_ptr); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/analysis_graph.h b/libs/ardour/ardour/analysis_graph.h index d4866e8648..4637846a77 100644 --- a/libs/ardour/ardour/analysis_graph.h +++ b/libs/ardour/ardour/analysis_graph.h @@ -46,9 +46,9 @@ class LIBARDOUR_API AnalysisGraph { ~AnalysisGraph (); void analyze_region (ARDOUR::AudioRegion const*, bool raw = false, ARDOUR::Progress* = 0); - void analyze_region (boost::shared_ptr, bool raw = false); + void analyze_region (std::shared_ptr, bool raw = false); - void analyze_range (boost::shared_ptr, boost::shared_ptr, const std::list&); + void analyze_range (std::shared_ptr, std::shared_ptr, const std::list&); const AnalysisResults& results () const { return _results; } @@ -70,9 +70,9 @@ class LIBARDOUR_API AnalysisGraph { samplecnt_t _samples_end; bool _canceled; - typedef boost::shared_ptr AnalysisPtr; - typedef boost::shared_ptr > ChunkerPtr; - typedef boost::shared_ptr > InterleaverPtr; + typedef std::shared_ptr AnalysisPtr; + typedef std::shared_ptr > ChunkerPtr; + typedef std::shared_ptr > InterleaverPtr; InterleaverPtr interleaver; ChunkerPtr chunker; diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index c01aa53fcd..9147e35c3b 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -60,7 +60,7 @@ struct LIBARDOUR_API AudioBackendInfo { * Returns a valid shared_ptr to the object if successfull, * or a "null" shared_ptr otherwise. */ - boost::shared_ptr (*factory) (AudioEngine&); + std::shared_ptr (*factory) (AudioEngine&); /** Return true if the underlying mechanism/API has been * configured and does not need (re)configuration in order diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h index 2f024cc48e..ee767e63fd 100644 --- a/libs/ardour/ardour/audio_playlist_importer.h +++ b/libs/ardour/ardour/audio_playlist_importer.h @@ -23,7 +23,7 @@ #include #include -x + #include "pbd/xml++.h" #include "pbd/id.h" @@ -40,7 +40,7 @@ class Session; class LIBARDOUR_API AudioPlaylistImportHandler : public ElementImportHandler { public: - typedef boost::shared_ptr PlaylistPtr; + typedef std::shared_ptr PlaylistPtr; typedef std::list PlaylistList; AudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler, const char * nodename = "Playlists"); @@ -82,7 +82,7 @@ class LIBARDOUR_API AudioPlaylistImporter : public ElementImporter void _move (); private: - typedef std::list > RegionList; + typedef std::list > RegionList; void populate_region_list (); diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h index d5ea5ad4f9..f973dfa4d0 100644 --- a/libs/ardour/ardour/audio_playlist_source.h +++ b/libs/ardour/ardour/audio_playlist_source.h @@ -55,7 +55,7 @@ public: protected: friend class SourceFactory; - AudioPlaylistSource (Session&, const PBD::ID& orig, const std::string& name, boost::shared_ptr, uint32_t chn, + AudioPlaylistSource (Session&, const PBD::ID& orig, const std::string& name, std::shared_ptr, uint32_t chn, timepos_t const & begin, timepos_t const & len, Source::Flag flags); AudioPlaylistSource (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h index 865badb61f..ba52627539 100644 --- a/libs/ardour/ardour/audio_region_importer.h +++ b/libs/ardour/ardour/audio_region_importer.h @@ -49,8 +49,8 @@ class LIBARDOUR_API AudioRegionImportHandler : public ElementImportHandler // Source management bool check_source (std::string const & filename) const; - void add_source (std::string const & filename, boost::shared_ptr const & source); - boost::shared_ptr const & get_source (std::string const & filename) const; + void add_source (std::string const & filename, std::shared_ptr const & source); + std::shared_ptr const & get_source (std::string const & filename) const; // Id management void register_id (PBD::ID & old_id, PBD::ID & new_id); @@ -58,8 +58,8 @@ class LIBARDOUR_API AudioRegionImportHandler : public ElementImportHandler private: // Source management - typedef std::map > SourceMap; - typedef std::pair > SourcePair; + typedef std::map > SourceMap; + typedef std::pair > SourcePair; SourceMap sources; // Id management @@ -102,7 +102,7 @@ class LIBARDOUR_API AudioRegionImporter : public ElementImporter void prepare_region (); void prepare_sources (); - std::vector > region; + std::vector > region; bool region_prepared; bool sources_prepared; }; diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 3b425309e3..97fac5697f 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -43,18 +43,18 @@ class LIBARDOUR_API AudioTrack : public Track void freeze_me (InterThreadInfo&); void unfreeze (); - bool bounceable (boost::shared_ptr, bool include_endpoint) const; - boost::shared_ptr bounce (InterThreadInfo&, std::string const& name); - boost::shared_ptr bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo&, - boost::shared_ptr endpoint, bool include_endpoint, + bool bounceable (std::shared_ptr, bool include_endpoint) const; + std::shared_ptr bounce (InterThreadInfo&, std::string const& name); + std::shared_ptr bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo&, + std::shared_ptr endpoint, bool include_endpoint, std::string const& name); int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, - boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, MidiNoteTracker&); int set_state (const XMLNode&, int version); - boost::shared_ptr write_source (uint32_t n = 0); + std::shared_ptr write_source (uint32_t n = 0); protected: XMLNode& state (bool save_template) const; diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h index f302162893..ea5a97152e 100644 --- a/libs/ardour/ardour/audio_track_importer.h +++ b/libs/ardour/ardour/audio_track_importer.h @@ -61,7 +61,7 @@ class LIBARDOUR_API AudioTrackImporter : public ElementImporter private: - typedef boost::shared_ptr PlaylistPtr; + typedef std::shared_ptr PlaylistPtr; typedef std::list PlaylistList; bool parse_route_xml (); diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index b5e9ec8ecf..e17cba305b 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -60,7 +60,7 @@ struct LIBARDOUR_API AUParameterDescriptor : public ParameterDescriptor { class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin { public: - AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr comp); + AUPlugin (AudioEngine& engine, Session& session, std::shared_ptr comp); AUPlugin (const AUPlugin& other); virtual ~AUPlugin (); @@ -116,8 +116,8 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin _requires_fixed_size_buffers = yn; } - boost::shared_ptr get_au () { return unit; } - boost::shared_ptr get_comp () const { return comp; } + std::shared_ptr get_au () { return unit; } + std::shared_ptr get_comp () const { return comp; } OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, @@ -162,8 +162,8 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin samplecnt_t plugin_latency() const; void find_presets (); - boost::shared_ptr comp; - boost::shared_ptr unit; + std::shared_ptr comp; + std::shared_ptr unit; bool initialized; int32_t input_channels; @@ -237,7 +237,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin class LIBARDOUR_API AUPluginInfo : public PluginInfo { public: - AUPluginInfo (boost::shared_ptr); + AUPluginInfo (std::shared_ptr); ~AUPluginInfo () {} PluginPtr load (Session& session); @@ -263,10 +263,10 @@ public: static std::string convert_old_unique_id (std::string const&); private: - boost::shared_ptr descriptor; + std::shared_ptr descriptor; }; -typedef boost::shared_ptr AUPluginInfoPtr; +typedef std::shared_ptr AUPluginInfoPtr; } // namespace ARDOUR diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 0f34efe2c2..cb72848616 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -72,8 +72,8 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr int discover_backends(); std::vector available_backends() const; std::string current_backend_name () const; - boost::shared_ptr set_backend (const std::string&, const std::string& arg1, const std::string& arg2); - boost::shared_ptr current_backend() const { return _backend; } + std::shared_ptr set_backend (const std::string&, const std::string& arg1, const std::string& arg2); + std::shared_ptr current_backend() const { return _backend; } bool setup_required () const; ProcessThread* main_thread() const { return _main_thread; } diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index 1eb277d6de..f85506c780 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -40,24 +40,24 @@ class LIBARDOUR_API AudioPlaylist : public ARDOUR::Playlist public: AudioPlaylist (Session&, const XMLNode&, bool hidden = false); AudioPlaylist (Session&, std::string name, bool hidden = false); - AudioPlaylist (boost::shared_ptr, std::string name, bool hidden = false); - AudioPlaylist (boost::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); + AudioPlaylist (std::shared_ptr, std::string name, bool hidden = false); + AudioPlaylist (std::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); timecnt_t read (Sample *dst, Sample *mixdown, float *gain_buffer, timepos_t const & start, timecnt_t const & cnt, uint32_t chan_n=0); - bool destroy_region (boost::shared_ptr); + bool destroy_region (std::shared_ptr); protected: - void pre_combine (std::vector >&); - void post_combine (std::vector >&, boost::shared_ptr); - void pre_uncombine (std::vector >&, boost::shared_ptr); + void pre_combine (std::vector >&); + void post_combine (std::vector >&, std::shared_ptr); + void pre_uncombine (std::vector >&, std::shared_ptr); private: int set_state (const XMLNode&, int version); void dump () const; - bool region_changed (const PBD::PropertyChange&, boost::shared_ptr); - void source_offset_changed (boost::shared_ptr); + bool region_changed (const PBD::PropertyChange&, std::shared_ptr); + void source_offset_changed (std::shared_ptr); void load_legacy_crossfades (const XMLNode&, int version); }; diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 97418a3271..dace501d94 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -49,11 +49,11 @@ namespace Properties { LIBARDOUR_API extern PBD::PropertyDescriptor fade_in_active; LIBARDOUR_API extern PBD::PropertyDescriptor fade_out_active; LIBARDOUR_API extern PBD::PropertyDescriptor scale_amplitude; - LIBARDOUR_API extern PBD::PropertyDescriptor > fade_in; - LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_in; - LIBARDOUR_API extern PBD::PropertyDescriptor > fade_out; - LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_out; - LIBARDOUR_API extern PBD::PropertyDescriptor > envelope; + LIBARDOUR_API extern PBD::PropertyDescriptor > fade_in; + LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_in; + LIBARDOUR_API extern PBD::PropertyDescriptor > fade_out; + LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_out; + LIBARDOUR_API extern PBD::PropertyDescriptor > envelope; } class Playlist; @@ -69,13 +69,13 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable ~AudioRegion(); - void copy_settings (boost::shared_ptr); + void copy_settings (std::shared_ptr); - bool source_equivalent (boost::shared_ptr) const; + bool source_equivalent (std::shared_ptr) const; bool speed_mismatch (float) const; - boost::shared_ptr audio_source (uint32_t n=0) const; + std::shared_ptr audio_source (uint32_t n=0) const; void set_scale_amplitude (gain_t); gain_t scale_amplitude() const { return _scale_amplitude; } @@ -98,11 +98,11 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable bool fade_in_active () const { return _fade_in_active; } bool fade_out_active () const { return _fade_out_active; } - boost::shared_ptr fade_in() { return _fade_in.val (); } - boost::shared_ptr inverse_fade_in() { return _inverse_fade_in.val (); } - boost::shared_ptr fade_out() { return _fade_out.val (); } - boost::shared_ptr inverse_fade_out() { return _inverse_fade_out.val (); } - boost::shared_ptr envelope() { return _envelope.val (); } + std::shared_ptr fade_in() { return _fade_in.val (); } + std::shared_ptr inverse_fade_in() { return _inverse_fade_in.val (); } + std::shared_ptr fade_out() { return _fade_out.val (); } + std::shared_ptr inverse_fade_out() { return _inverse_fade_out.val (); } + std::shared_ptr envelope() { return _envelope.val (); } Temporal::Range body_range () const; @@ -140,13 +140,13 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable void set_fade_in_shape (FadeShape); void set_fade_in_length (samplecnt_t); void set_fade_in (FadeShape, samplecnt_t); - void set_fade_in (boost::shared_ptr); + void set_fade_in (std::shared_ptr); void set_fade_out_active (bool yn); void set_fade_out_shape (FadeShape); void set_fade_out_length (samplecnt_t); void set_fade_out (FadeShape, samplecnt_t); - void set_fade_out (boost::shared_ptr); + void set_fade_out (std::shared_ptr); void set_default_fade_in (); void set_default_fade_out (); @@ -156,16 +156,16 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable void set_envelope_active (bool yn); void set_default_envelope (); - int separate_by_channel (std::vector >&) const; + int separate_by_channel (std::vector >&) const; /* automation */ - boost::shared_ptr + std::shared_ptr control(const Evoral::Parameter& id, bool create=false) { return _automatable.control(id, create); } - virtual boost::shared_ptr + virtual std::shared_ptr control(const Evoral::Parameter& id) const { return _automatable.control(id); } @@ -193,11 +193,11 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable private: friend class RegionFactory; - AudioRegion (boost::shared_ptr); + AudioRegion (std::shared_ptr); AudioRegion (const SourceList &); - AudioRegion (boost::shared_ptr); - AudioRegion (boost::shared_ptr, timecnt_t const & offset); - AudioRegion (boost::shared_ptr, const SourceList&); + AudioRegion (std::shared_ptr); + AudioRegion (std::shared_ptr, timecnt_t const & offset); + AudioRegion (std::shared_ptr, const SourceList&); AudioRegion (SourceList &); private: @@ -246,7 +246,7 @@ class LIBARDOUR_API AudioRegion : public Region, public AudioReadable uint32_t _fade_in_suspended; uint32_t _fade_out_suspended; - boost::shared_ptr get_single_other_xfade_region (bool start) const; + std::shared_ptr get_single_other_xfade_region (bool start) const; protected: /* default constructor for derived (compound) types */ diff --git a/libs/ardour/ardour/audiorom.h b/libs/ardour/ardour/audiorom.h index 870487c7bd..248ed3f9bc 100644 --- a/libs/ardour/ardour/audiorom.h +++ b/libs/ardour/ardour/audiorom.h @@ -30,7 +30,7 @@ class Session; class LIBARDOUR_API AudioRom : public AudioReadable { public: - static boost::shared_ptr new_rom (Sample*, size_t); + static std::shared_ptr new_rom (Sample*, size_t); ~AudioRom(); samplecnt_t read (Sample*, samplepos_t pos, samplecnt_t cnt, int channel) const; diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index c144ae7ba5..ab0a6355cf 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -50,7 +50,7 @@ public: int connect (); bool auditioning() const; - void audition_region (boost::shared_ptr, bool loop = false); + void audition_region (std::shared_ptr, bool loop = false); int play_audition (samplecnt_t nframes); void cancel_audition (); @@ -83,22 +83,22 @@ public: /* fake track */ void set_state_part_two () {} int set_state (const XMLNode&, int) { return 0; } - bool bounceable (boost::shared_ptr, bool) const { return false; } + bool bounceable (std::shared_ptr, bool) const { return false; } void freeze_me (InterThreadInfo&) {} void unfreeze () {} /* MIDI Track -- listen to Bank/Patch */ void update_controls (BufferSet const& bufs); - boost::shared_ptr bounce (InterThreadInfo&, std::string const& name) { - return boost::shared_ptr (); + std::shared_ptr bounce (InterThreadInfo&, std::string const& name) { + return std::shared_ptr (); } - boost::shared_ptr bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, boost::shared_ptr, bool, std::string const&) { - return boost::shared_ptr (); + std::shared_ptr bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, std::shared_ptr, bool, std::string const&) { + return std::shared_ptr (); } - int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr, bool, bool, bool, MidiNoteTracker&) { return -1; } + int export_stuff (BufferSet&, samplepos_t, samplecnt_t, std::shared_ptr, bool, bool, bool, MidiNoteTracker&) { return -1; } void set_audition_synth_info(PluginInfoPtr in); PluginInfoPtr get_audition_synth_info() {return audition_synth_info;} @@ -109,8 +109,8 @@ private: PluginInfoPtr audition_synth_info; //we will use this to create a new synth on-the-fly each time an audition is requested - boost::shared_ptr the_region; - boost::shared_ptr midi_region; + std::shared_ptr the_region; + std::shared_ptr midi_region; samplepos_t current_sample; mutable GATOMIC_QUAL gint _auditioning; Glib::Threads::Mutex lock; @@ -124,7 +124,7 @@ private: bool _queue_panic; bool _loop; - boost::shared_ptr asynth; + std::shared_ptr asynth; Evoral::PatchChange _patch_change[16]; diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 6ec84534fb..2974b7ea35 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -60,9 +60,9 @@ public: static bool skip_saving_automation; // to be used only by session-state - boost::shared_ptr control_factory(const Evoral::Parameter& id); + std::shared_ptr control_factory(const Evoral::Parameter& id); - boost::shared_ptr automation_control (PBD::ID const & id) const; + std::shared_ptr automation_control (PBD::ID const & id) const; /* derived classes need to provide some way to search their own child automatable's for a control. normally, we'd just make the method above virtual, and let them override it. But that wouldn't @@ -77,17 +77,17 @@ public: So, skip around all that with a different name. */ - virtual boost::shared_ptr automation_control_recurse (PBD::ID const & id) const { + virtual std::shared_ptr automation_control_recurse (PBD::ID const & id) const { return automation_control (id); } - boost::shared_ptr automation_control (const Evoral::Parameter& id) { + std::shared_ptr automation_control (const Evoral::Parameter& id) { return automation_control (id, false); } - boost::shared_ptr automation_control (const Evoral::Parameter& id, bool create_if_missing); - boost::shared_ptr automation_control (const Evoral::Parameter& id) const; + std::shared_ptr automation_control (const Evoral::Parameter& id, bool create_if_missing); + std::shared_ptr automation_control (const Evoral::Parameter& id) const; - virtual void add_control(boost::shared_ptr); + virtual void add_control(std::shared_ptr); virtual bool find_next_event (Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev, bool only_active = true) const; void clear_controls (); @@ -136,8 +136,8 @@ protected: SlavableControlList slavables () const { return SlavableControlList(); } - void find_next_ac_event (boost::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; - void find_prev_ac_event (boost::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; + void find_next_ac_event (std::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; + void find_prev_ac_event (std::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; private: PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index b819fcbf7d..932b2bba5d 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -58,18 +58,18 @@ public: AutomationControl(ARDOUR::Session&, const Evoral::Parameter& parameter, const ParameterDescriptor& desc, - boost::shared_ptr l=boost::shared_ptr(), + std::shared_ptr l=std::shared_ptr(), const std::string& name="", PBD::Controllable::Flag flags=PBD::Controllable::Flag (0) ); virtual ~AutomationControl (); - boost::shared_ptr alist() const { - return boost::dynamic_pointer_cast(_list); + std::shared_ptr alist() const { + return std::dynamic_pointer_cast(_list); } - void set_list (boost::shared_ptr); + void set_list (std::shared_ptr); inline bool automation_playback() const { return alist() ? alist()->automation_playback() : false; @@ -125,7 +125,7 @@ public: ControlList grouped_controls () const; protected: - boost::shared_ptr _group; + std::shared_ptr _group; const ParameterDescriptor _desc; @@ -155,7 +155,7 @@ private: declared to be a friend in ControlGroupMember. Oh well. */ friend class ControlGroup; - void set_group (boost::shared_ptr); + void set_group (std::shared_ptr); PBD::ScopedConnection _state_changed_connection; bool _no_session; }; diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 4a5d1cf00e..b181d39d35 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -50,11 +50,11 @@ class BeatsSamplesConverter; class LIBARDOUR_API AutomationListProperty : public PBD::SharedStatefulProperty { public: - AutomationListProperty (PBD::PropertyDescriptor > d, Ptr p) + AutomationListProperty (PBD::PropertyDescriptor > d, Ptr p) : PBD::SharedStatefulProperty (d.property_id, p) {} - AutomationListProperty (PBD::PropertyDescriptor > d, Ptr o, Ptr c) + AutomationListProperty (PBD::PropertyDescriptor > d, Ptr o, Ptr c) : PBD::SharedStatefulProperty (d.property_id, o, c) {} @@ -80,7 +80,7 @@ public: AutomationList (const AutomationList&, timepos_t const & start, timepos_t const & end); ~AutomationList(); - virtual boost::shared_ptr create(const Evoral::Parameter& id, + virtual std::shared_ptr create(const Evoral::Parameter& id, const Evoral::ParameterDescriptor& desc, Temporal::TimeDomain); diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h index a6bad44148..71756f24da 100644 --- a/libs/ardour/ardour/automation_watch.h +++ b/libs/ardour/ardour/automation_watch.h @@ -40,16 +40,16 @@ class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::Ses public: static AutomationWatch& instance(); - void add_automation_watch (boost::shared_ptr); - void remove_automation_watch (boost::shared_ptr); + void add_automation_watch (std::shared_ptr); + void remove_automation_watch (std::shared_ptr); void transport_stop_automation_watches (ARDOUR::samplepos_t); void set_session (ARDOUR::Session*); gint timer (); private: - typedef std::set > AutomationWatches; - typedef std::map, PBD::ScopedConnection> AutomationConnection; + typedef std::set > AutomationWatches; + typedef std::map, PBD::ScopedConnection> AutomationConnection; AutomationWatch (); ~AutomationWatch(); @@ -64,7 +64,7 @@ private: PBD::ScopedConnection transport_connection; void transport_state_change (); - void remove_weak_automation_watch (boost::weak_ptr); + void remove_weak_automation_watch (std::weak_ptr); void thread (); }; diff --git a/libs/ardour/ardour/beatbox.h b/libs/ardour/ardour/beatbox.h index 40e93f4ec2..e8dd62c12d 100644 --- a/libs/ardour/ardour/beatbox.h +++ b/libs/ardour/ardour/beatbox.h @@ -58,14 +58,14 @@ class BeatBox : public ARDOUR::Processor { XMLNode& state() const; XMLNode& get_state () const; - bool fill_source (boost::shared_ptr); + bool fill_source (std::shared_ptr); private: StepSequencer* _sequencer; ARDOUR::MidiNoteTracker inbound_tracker; - bool fill_midi_source (boost::shared_ptr); + bool fill_midi_source (std::shared_ptr); }; diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index f593186aba..49c8ffc6f0 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -73,7 +73,7 @@ class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList Bundle (bool i = true); Bundle (std::string const &, bool i = true); - Bundle (boost::shared_ptr); + Bundle (std::shared_ptr); virtual ~Bundle() {} @@ -102,15 +102,15 @@ class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList bool offers_port_alone (std::string) const; void remove_channel (uint32_t); void remove_channels (); - void add_channels_from_bundle (boost::shared_ptr); - void connect (boost::shared_ptr, AudioEngine &, + void add_channels_from_bundle (std::shared_ptr); + void connect (std::shared_ptr, AudioEngine &, bool allow_partial = false); - void disconnect (boost::shared_ptr, AudioEngine &); - bool connected_to (boost::shared_ptr, AudioEngine &, + void disconnect (std::shared_ptr, AudioEngine &); + bool connected_to (std::shared_ptr, AudioEngine &, DataType type = DataType::NIL, bool exclusive = false); bool connected_to_anything (AudioEngine &); - bool has_same_ports (boost::shared_ptr) const; + bool has_same_ports (std::shared_ptr) const; uint32_t type_channel_to_overall (DataType, uint32_t) const; uint32_t overall_channel_to_type (DataType, uint32_t) const; @@ -164,7 +164,7 @@ class LIBARDOUR_API BundleChannel public: BundleChannel () : channel (-1) {} - BundleChannel (boost::shared_ptr b, int c) + BundleChannel (std::shared_ptr b, int c) : bundle (b), channel (c) {} bool operator== (BundleChannel const& other) const { @@ -175,7 +175,7 @@ public: return bundle != other.bundle || channel != other.channel; } - boost::shared_ptr bundle; + std::shared_ptr bundle; int channel; ///< channel index, or -1 for "all" }; diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h index aaa30e45d6..905e860563 100644 --- a/libs/ardour/ardour/butler.h +++ b/libs/ardour/ardour/butler.h @@ -100,7 +100,7 @@ private: void empty_pool_trash (); void process_delegated_work (); void config_changed (std::string); - bool flush_tracks_to_disk_normal (boost::shared_ptr, uint32_t& errors); + bool flush_tracks_to_disk_normal (std::shared_ptr, uint32_t& errors); void queue_request (Request::Type r); pthread_t thread; diff --git a/libs/ardour/ardour/clip_library.h b/libs/ardour/ardour/clip_library.h index e58f2452c7..1ad9937f9f 100644 --- a/libs/ardour/ardour/clip_library.h +++ b/libs/ardour/ardour/clip_library.h @@ -38,7 +38,7 @@ class Region; extern LIBARDOUR_API PBD::Signal2 LibraryClipAdded; LIBARDOUR_API std::string clip_library_dir (bool create_if_missing = false); -LIBARDOUR_API bool export_to_clip_library (boost::shared_ptr r, void* src = NULL); +LIBARDOUR_API bool export_to_clip_library (std::shared_ptr r, void* src = NULL); } // namespace ARDOUR diff --git a/libs/ardour/ardour/comparable_shared_ptr.h b/libs/ardour/ardour/comparable_shared_ptr.h index d896d22eb7..526e449d21 100644 --- a/libs/ardour/ardour/comparable_shared_ptr.h +++ b/libs/ardour/ardour/comparable_shared_ptr.h @@ -26,32 +26,32 @@ namespace ARDOUR { template -class /*LIBARDOUR_API*/ ComparableSharedPtr : public boost::shared_ptr +class /*LIBARDOUR_API*/ ComparableSharedPtr : public std::shared_ptr , public boost::less_than_comparable > { public: ComparableSharedPtr () {} template - explicit ComparableSharedPtr (Y * p) : boost::shared_ptr (p) {} + explicit ComparableSharedPtr (Y * p) : std::shared_ptr (p) {} template - ComparableSharedPtr (Y * p, D d) : boost::shared_ptr (p, d) {} + ComparableSharedPtr (Y * p, D d) : std::shared_ptr (p, d) {} template - ComparableSharedPtr (Y * p, D d, A a) : boost::shared_ptr (p, d, a) {} + ComparableSharedPtr (Y * p, D d, A a) : std::shared_ptr (p, d, a) {} - ComparableSharedPtr (ComparableSharedPtr const & r) : boost::shared_ptr (r) {} + ComparableSharedPtr (ComparableSharedPtr const & r) : std::shared_ptr (r) {} ComparableSharedPtr& operator=(ComparableSharedPtr const& r) { - boost::shared_ptr(r).swap(*this); + std::shared_ptr(r).swap(*this); return *this; } template - ComparableSharedPtr(ComparableSharedPtr const & r) : boost::shared_ptr (r) {} + ComparableSharedPtr(ComparableSharedPtr const & r) : std::shared_ptr (r) {} template - ComparableSharedPtr(ComparableSharedPtr const & r, T * p) : boost::shared_ptr (r, p) {} + ComparableSharedPtr(ComparableSharedPtr const & r, T * p) : std::shared_ptr (r, p) {} template bool operator< (ComparableSharedPtr const & other) const { return **this < *other; } diff --git a/libs/ardour/ardour/control_group.h b/libs/ardour/ardour/control_group.h index 87a3f16906..0b29eecb51 100644 --- a/libs/ardour/ardour/control_group.h +++ b/libs/ardour/ardour/control_group.h @@ -34,7 +34,7 @@ namespace ARDOUR { -class LIBARDOUR_API ControlGroup : public boost::enable_shared_from_this +class LIBARDOUR_API ControlGroup : public std::enable_shared_from_this { public: ControlGroup (Evoral::Parameter p); @@ -45,8 +45,8 @@ class LIBARDOUR_API ControlGroup : public boost::enable_shared_from_this); - int remove_control (boost::shared_ptr); + int add_control (std::shared_ptr); + int remove_control (std::shared_ptr); ControlList controls () const; @@ -60,7 +60,7 @@ class LIBARDOUR_API ControlGroup : public boost::enable_shared_from_this, double val); + virtual void set_group_value (std::shared_ptr, double val); virtual void pre_realtime_queue_stuff (double val); bool use_me (PBD::Controllable::GroupControlDisposition gcd) const { @@ -77,7 +77,7 @@ class LIBARDOUR_API ControlGroup : public boost::enable_shared_from_this > ControlMap; + typedef std::map > ControlMap; Evoral::Parameter _parameter; mutable Glib::Threads::RWLock controls_lock; ControlMap _controls; @@ -86,7 +86,7 @@ class LIBARDOUR_API ControlGroup : public boost::enable_shared_from_this); + void control_going_away (std::weak_ptr); }; @@ -95,7 +95,7 @@ class LIBARDOUR_API GainControlGroup : public ControlGroup public: GainControlGroup(); - void set_group_value (boost::shared_ptr, double val); + void set_group_value (std::shared_ptr, double val); private: gain_t get_max_factor (gain_t); diff --git a/libs/ardour/ardour/control_group_member.h b/libs/ardour/ardour/control_group_member.h index 2076738a4d..da17bad613 100644 --- a/libs/ardour/ardour/control_group_member.h +++ b/libs/ardour/ardour/control_group_member.h @@ -32,7 +32,7 @@ class LIBARDOUR_API ControlGroupMember /* Only a ControlGroup can call this; all membership changes must be mediated by the ControlGroup, not by operating on the member. */ - virtual void set_group (boost::shared_ptr) = 0; + virtual void set_group (std::shared_ptr) = 0; }; } /* namespace */ diff --git a/libs/ardour/ardour/convolver.h b/libs/ardour/ardour/convolver.h index 0cf7972946..e4934034f0 100644 --- a/libs/ardour/ardour/convolver.h +++ b/libs/ardour/ardour/convolver.h @@ -39,7 +39,7 @@ public: bool add_impdata ( uint32_t c_in, uint32_t c_out, - boost::shared_ptr r, + std::shared_ptr r, float gain = 1.0, uint32_t pre_delay = 0, sampleoffset_t offset = 0, @@ -71,7 +71,7 @@ private: class ImpData : public AudioReadable { public: - ImpData (uint32_t ci, uint32_t co, boost::shared_ptr r, float g, float d, sampleoffset_t s = 0, samplecnt_t l = 0, uint32_t c = 0) + ImpData (uint32_t ci, uint32_t co, std::shared_ptr r, float g, float d, sampleoffset_t s = 0, samplecnt_t l = 0, uint32_t c = 0) : c_in (ci) , c_out (co) , gain (g) @@ -107,7 +107,7 @@ private: } private: - boost::shared_ptr _readable; + std::shared_ptr _readable; sampleoffset_t _offset; samplecnt_t _length; @@ -176,7 +176,7 @@ public: void run_stereo_no_latency (float* L, float* R, uint32_t); private: - std::vector > _readables; + std::vector > _readables; IRChannelConfig _irc; IRSettings _ir_settings; diff --git a/libs/ardour/ardour/delayline.h b/libs/ardour/ardour/delayline.h index 825c3ee730..5de8b0f79c 100644 --- a/libs/ardour/ardour/delayline.h +++ b/libs/ardour/ardour/delayline.h @@ -72,7 +72,7 @@ private: typedef std::vector > MidiDlyBuf; AudioDlyBuf _buf; - boost::shared_ptr _midi_buf; + std::shared_ptr _midi_buf; #ifndef NDEBUG Glib::Threads::Mutex _set_delay_mutex; diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 3e955e2fe3..5a3429f4e8 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -65,11 +65,11 @@ public: /* Delivery to an existing output */ - Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr, boost::shared_ptr mm, const std::string& name, Role); + Delivery (Session& s, std::shared_ptr io, std::shared_ptr, std::shared_ptr mm, const std::string& name, Role); /* Delivery to a new output owned by this object */ - Delivery (Session& s, boost::shared_ptr, boost::shared_ptr mm, const std::string& name, Role); + Delivery (Session& s, std::shared_ptr, std::shared_ptr mm, const std::string& name, Role); ~Delivery (); bool set_name (const std::string& name); @@ -102,12 +102,12 @@ public: static int disable_panners (void); static void reset_panners (); - boost::shared_ptr panner_shell() const { return _panshell; } - boost::shared_ptr panner() const; + std::shared_ptr panner_shell() const { return _panshell; } + std::shared_ptr panner() const; - void set_gain_control (boost::shared_ptr gc); + void set_gain_control (std::shared_ptr gc); - void set_polarity_control (boost::shared_ptr ac) { + void set_polarity_control (std::shared_ptr ac) { _polarity_control = ac; } @@ -119,15 +119,15 @@ public: uint32_t pans_required() const { return _configured_input.n_audio(); } virtual uint32_t pan_outs() const; - boost::shared_ptr gain_control () const { + std::shared_ptr gain_control () const { return _gain_control; } - boost::shared_ptr polarity_control () const { + std::shared_ptr polarity_control () const { return _polarity_control; } - boost::shared_ptr amp() const { + std::shared_ptr amp() const { return _amp; } @@ -137,17 +137,17 @@ protected: Role _role; BufferSet* _output_buffers; gain_t _current_gain; - boost::shared_ptr _panshell; - boost::shared_ptr _amp; + std::shared_ptr _panshell; + std::shared_ptr _amp; gain_t target_gain (); private: bool _no_outs_cuz_we_no_monitor; - boost::shared_ptr _mute_master; - boost::shared_ptr _gain_control; - boost::shared_ptr _polarity_control; + std::shared_ptr _mute_master; + std::shared_ptr _gain_control; + std::shared_ptr _polarity_control; static bool panners_legal; static PBD::Signal0 PannersLegal; diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h index ba36347453..a8084848a6 100644 --- a/libs/ardour/ardour/disk_io.h +++ b/libs/ardour/ardour/disk_io.h @@ -99,12 +99,12 @@ public: bool need_butler() const { return _need_butler; } - boost::shared_ptr get_playlist (DataType dt) const { return _playlists[dt]; } - boost::shared_ptr midi_playlist() const; - boost::shared_ptr audio_playlist() const; + std::shared_ptr get_playlist (DataType dt) const { return _playlists[dt]; } + std::shared_ptr midi_playlist() const; + std::shared_ptr audio_playlist() const; virtual void playlist_modified () {} - virtual int use_playlist (DataType, boost::shared_ptr); + virtual int use_playlist (DataType, std::shared_ptr); virtual void adjust_buffering() = 0; @@ -162,7 +162,7 @@ protected: PBD::RingBufferNPT::rw_vector rw_vector; /* used only by capture */ - boost::shared_ptr write_source; + std::shared_ptr write_source; PBD::RingBufferNPT* capture_transition_buf; /* used in the butler thread only */ @@ -174,14 +174,14 @@ protected: typedef std::vector ChannelList; SerializedRCUManager channels; - virtual int add_channel_to (boost::shared_ptr, uint32_t how_many) = 0; - int remove_channel_from (boost::shared_ptr, uint32_t how_many); + virtual int add_channel_to (std::shared_ptr, uint32_t how_many) = 0; + int remove_channel_from (std::shared_ptr, uint32_t how_many); - boost::shared_ptr _playlists[DataType::num_types]; + std::shared_ptr _playlists[DataType::num_types]; PBD::ScopedConnectionList playlist_connections; virtual void playlist_changed (const PBD::PropertyChange&) {} - virtual void playlist_deleted (boost::weak_ptr); + virtual void playlist_deleted (std::weak_ptr); virtual void playlist_ranges_moved (std::list const &, bool) {} /* The MIDI stuff */ diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index a604a7367a..16b08feba3 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -73,7 +73,7 @@ public: float buffer_load () const; - void move_processor_automation (boost::weak_ptr, std::list const&); + void move_processor_automation (std::weak_ptr, std::list const&); /* called by the Butler in a non-realtime context as part of its normal * buffer refill loop (not due to transport-mechanism requests like @@ -150,10 +150,10 @@ protected: void resolve_tracker (Evoral::EventSink& buffer, samplepos_t time); - int use_playlist (DataType, boost::shared_ptr); + int use_playlist (DataType, std::shared_ptr); void playlist_ranges_moved (std::list const&, bool); - int add_channel_to (boost::shared_ptr, uint32_t how_many); + int add_channel_to (std::shared_ptr, uint32_t how_many); class DeclickAmp { diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h index eca1f3be53..59ddb74c85 100644 --- a/libs/ardour/ardour/disk_writer.h +++ b/libs/ardour/ardour/disk_writer.h @@ -63,15 +63,15 @@ public: std::string write_source_name () const; - boost::shared_ptr audio_write_source (uint32_t n = 0) { - boost::shared_ptr c = channels.reader (); + std::shared_ptr audio_write_source (uint32_t n = 0) { + std::shared_ptr c = channels.reader (); if (n < c->size ()) { return (*c)[n]->write_source; } - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr midi_write_source () const { return _midi_write_source; } + std::shared_ptr midi_write_source () const { return _midi_write_source; } std::string steal_write_source_name (); int use_new_write_source (DataType, uint32_t n = 0); @@ -84,7 +84,7 @@ public: bool configure_io (ChanCount in, ChanCount out); - std::list >& last_capture_sources () { return _last_capture_sources; } + std::list >& last_capture_sources () { return _last_capture_sources; } bool record_enabled () const { return g_atomic_int_get (const_cast(&_record_enabled)); } bool record_safe () const { return g_atomic_int_get (const_cast(&_record_safe)); } @@ -112,7 +112,7 @@ public: * Parameter is the source that it is destined for. * A caller can get a copy of the data with get_gui_feed_buffer () */ - PBD::Signal1 > DataRecorded; + PBD::Signal1 > DataRecorded; PBD::Signal0 RecordEnableChanged; PBD::Signal0 RecordSafeChanged; @@ -122,7 +122,7 @@ public: void adjust_buffering (); - boost::shared_ptr get_gui_feed_buffer () const; + std::shared_ptr get_gui_feed_buffer () const; protected: friend class Track; @@ -138,7 +138,7 @@ protected: virtual XMLNode& state () const; - int use_playlist (DataType, boost::shared_ptr); + int use_playlist (DataType, std::shared_ptr); int do_flush (RunContext context, bool force = false); @@ -147,7 +147,7 @@ protected: private: static samplecnt_t _chunk_samples; - int add_channel_to (boost::shared_ptr, uint32_t how_many); + int add_channel_to (std::shared_ptr, uint32_t how_many); void engage_record_enable (); void disengage_record_enable (); @@ -162,7 +162,7 @@ private: samplecnt_t& rec_offset); void check_record_status (samplepos_t transport_sample, double speed, bool can_record); - void finish_capture (boost::shared_ptr c); + void finish_capture (std::shared_ptr c); void reset_capture (); void loop (samplepos_t); @@ -192,10 +192,10 @@ private: GATOMIC_QUAL gint _samples_pending_write; GATOMIC_QUAL gint _num_captured_loops; - boost::shared_ptr _midi_write_source; + std::shared_ptr _midi_write_source; - std::list > _last_capture_sources; - std::vector > capturing_sources; + std::list > _last_capture_sources; + std::vector > capturing_sources; /** A buffer that we use to put newly-arrived MIDI data in for * the GUI to read (so that it can update itself). diff --git a/libs/ardour/ardour/element_import_handler.h b/libs/ardour/ardour/element_import_handler.h index 87886a9df9..0aa26a7cb3 100644 --- a/libs/ardour/ardour/element_import_handler.h +++ b/libs/ardour/ardour/element_import_handler.h @@ -39,7 +39,7 @@ class ElementImporter; class LIBARDOUR_API ElementImportHandler { public: - typedef boost::shared_ptr ElementPtr; + typedef std::shared_ptr ElementPtr; typedef std::list ElementList; /** ElementImportHandler constructor diff --git a/libs/ardour/ardour/export_analysis.h b/libs/ardour/ardour/export_analysis.h index ea52f35f61..53998174db 100644 --- a/libs/ardour/ardour/export_analysis.h +++ b/libs/ardour/ardour/export_analysis.h @@ -147,7 +147,7 @@ public: std::set truepeakpos[2]; // bins with >= -1dBTB }; -typedef boost::shared_ptr ExportAnalysisPtr; +typedef std::shared_ptr ExportAnalysisPtr; typedef std::map AnalysisResults; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 1ff375f2bc..5975182de4 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -79,7 +79,7 @@ public: class LIBARDOUR_API PortExportChannel : public ExportChannel { public: - typedef std::set> PortSet; + typedef std::set, std::owner_less > > PortSet; PortExportChannel (); ~PortExportChannel (); @@ -98,7 +98,7 @@ public: bool operator< (ExportChannel const& other) const; - void add_port (boost::weak_ptr port) { ports.insert (port); } + void add_port (std::weak_ptr port) { ports.insert (port); } PortSet const& get_ports () const { return ports; } private: @@ -106,7 +106,7 @@ private: samplecnt_t _buffer_size; boost::scoped_array _buffer; mutable AudioBuffer _buf; - std::list>> _delaylines; + std::list>> _delaylines; }; /// Basic export channel that reads from MIDIPorts @@ -134,15 +134,15 @@ public: bool operator< (ExportChannel const& other) const; - boost::shared_ptr port () const { return _port.lock (); } + std::shared_ptr port () const { return _port.lock (); } - void set_port (boost::weak_ptr port) + void set_port (std::weak_ptr port) { _port = port; } private: - boost::weak_ptr _port; + std::weak_ptr _port; mutable FixedDelay _delayline; mutable MidiBuffer _buf; }; @@ -230,14 +230,14 @@ class LIBARDOUR_API RouteExportChannel : public ExportChannel class ProcessorRemover; // fwd declaration public: - RouteExportChannel (boost::shared_ptr processor, + RouteExportChannel (std::shared_ptr processor, DataType type, size_t channel, - boost::shared_ptr remover); + std::shared_ptr remover); ~RouteExportChannel (); - static void create_from_route (std::list& result, boost::shared_ptr route); + static void create_from_route (std::list& result, std::shared_ptr route); static void create_from_state (std::list& result, Session&, XMLNode*); public: // ExportChannel interface @@ -250,7 +250,7 @@ public: // ExportChannel interface bool audio () const; bool midi () const; - boost::shared_ptr route () const { return _remover->route (); } + std::shared_ptr route () const { return _remover->route (); } std::string state_node_name () const { return "RouteExportChannel"; } @@ -264,28 +264,28 @@ private: class ProcessorRemover { public: - ProcessorRemover (boost::shared_ptr route, boost::shared_ptr processor) + ProcessorRemover (std::shared_ptr route, std::shared_ptr processor) : _route (route) , _processor (processor) { } ~ProcessorRemover (); - boost::shared_ptr route () const { return _route; } + std::shared_ptr route () const { return _route; } private: - boost::shared_ptr _route; - boost::shared_ptr _processor; + std::shared_ptr _route; + std::shared_ptr _processor; }; - boost::shared_ptr _processor; + std::shared_ptr _processor; DataType _type; size_t _channel; // Each channel keeps a ref to the remover. Last one alive // will cause the processor to be removed on deletion. - boost::shared_ptr _remover; + std::shared_ptr _remover; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h index d49b3eefac..64b906a680 100644 --- a/libs/ardour/ardour/export_channel_configuration.h +++ b/libs/ardour/ardour/export_channel_configuration.h @@ -37,7 +37,7 @@ namespace ARDOUR { class Session; -class LIBARDOUR_API ExportChannelConfiguration : public boost::enable_shared_from_this +class LIBARDOUR_API ExportChannelConfiguration : public std::enable_shared_from_this { private: friend class ExportElementFactory; @@ -80,7 +80,7 @@ public: /** Returns a list of channel configurations that match the files created. * I.e. many configurations if splitting is enabled, one if not. */ - void configurations_for_files (std::list>& configs); + void configurations_for_files (std::list>& configs); private: Session& session; diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h index 509e00b10b..5b4a63ad3f 100644 --- a/libs/ardour/ardour/export_format_base.h +++ b/libs/ardour/ardour/export_format_base.h @@ -154,8 +154,8 @@ class LIBARDOUR_API ExportFormatBase { virtual ~ExportFormatBase (); - boost::shared_ptr get_intersection (ExportFormatBase const & other) const; - boost::shared_ptr get_union (ExportFormatBase const & other) const; + std::shared_ptr get_intersection (ExportFormatBase const & other) const; + std::shared_ptr get_union (ExportFormatBase const & other) const; bool endiannesses_empty () const { return endiannesses.empty (); } bool sample_formats_empty () const { return sample_formats.empty (); } @@ -200,7 +200,7 @@ class LIBARDOUR_API ExportFormatBase { SetIntersection }; - boost::shared_ptr do_set_operation (ExportFormatBase const & other, SetOperation operation) const; + std::shared_ptr do_set_operation (ExportFormatBase const & other, SetOperation operation) const; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h index cfc3e8fa7b..50b7b4729b 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -62,8 +62,8 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList quality (quality) { set_name (name); } ExportFormatBase::Quality quality; }; - typedef boost::shared_ptr QualityPtr; - typedef boost::weak_ptr WeakQualityPtr; + typedef std::shared_ptr QualityPtr; + typedef std::weak_ptr WeakQualityPtr; typedef std::list QualityList; /* Sample rate states */ @@ -74,8 +74,8 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList : rate (rate) { set_name (name); } ExportFormatBase::SampleRate rate; }; - typedef boost::shared_ptr SampleRatePtr; - typedef boost::weak_ptr WeakSampleRatePtr; + typedef std::shared_ptr SampleRatePtr; + typedef std::weak_ptr WeakSampleRatePtr; typedef std::list SampleRateList; public: diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h index 06831c32c4..c740b259de 100644 --- a/libs/ardour/ardour/export_format_specification.h +++ b/libs/ardour/ardour/export_format_specification.h @@ -78,8 +78,8 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase { /* Modifying functions */ - void set_format (boost::shared_ptr format); - bool is_format (boost::shared_ptr format) const; + void set_format (std::shared_ptr format); + bool is_format (std::shared_ptr format) const; void set_name (std::string const & name) { _name = name; } diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index 22735d3214..97ab7850b7 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -137,7 +137,7 @@ public: int quality; }; - typedef boost::shared_ptr CodecQualityPtr; + typedef std::shared_ptr CodecQualityPtr; typedef std::list CodecQualityList; virtual ~HasCodecQuality () {} @@ -187,12 +187,12 @@ public: ExportFormatBase::DitherType type; }; - typedef boost::shared_ptr SampleFormatPtr; - typedef boost::weak_ptr WeakSampleFormatPtr; + typedef std::shared_ptr SampleFormatPtr; + typedef std::weak_ptr WeakSampleFormatPtr; typedef std::list SampleFormatList; - typedef boost::shared_ptr DitherTypePtr; - typedef boost::weak_ptr WeakDitherTypePtr; + typedef std::shared_ptr DitherTypePtr; + typedef std::weak_ptr WeakDitherTypePtr; typedef std::list DitherTypeList; public: diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index 0936cea88b..e0b1654420 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -62,8 +62,8 @@ class LIBARDOUR_API ExportGraphBuilder private: typedef ExportHandler::FileSpec FileSpec; - typedef boost::shared_ptr > FloatSinkPtr; - typedef boost::shared_ptr AnalysisPtr; + typedef std::shared_ptr > FloatSinkPtr; + typedef std::shared_ptr AnalysisPtr; typedef std::map AnalysisMap; struct AnyExport { @@ -82,7 +82,7 @@ class LIBARDOUR_API ExportGraphBuilder } }; - typedef boost::shared_ptr AnyExportPtr; + typedef std::shared_ptr AnyExportPtr; typedef std::map ChannelMap; public: @@ -98,7 +98,7 @@ class LIBARDOUR_API ExportGraphBuilder void reset (); void cleanup (bool remove_out_files = false); - void set_current_timespan (boost::shared_ptr span); + void set_current_timespan (std::shared_ptr span); void add_config (FileSpec const & config, bool rt); void get_analysis_results (AnalysisResults& results); @@ -122,7 +122,7 @@ class LIBARDOUR_API ExportGraphBuilder class Encoder { public: - template boost::shared_ptr > init (FileSpec const & new_config); + template std::shared_ptr > init (FileSpec const & new_config); void add_child (FileSpec const & new_config); void remove_children (); void destroy_writer (bool delete_out_file); @@ -131,14 +131,14 @@ class LIBARDOUR_API ExportGraphBuilder static int get_real_format (FileSpec const & config); private: - typedef boost::shared_ptr > FloatWriterPtr; - typedef boost::shared_ptr > IntWriterPtr; - typedef boost::shared_ptr > ShortWriterPtr; + typedef std::shared_ptr > FloatWriterPtr; + typedef std::shared_ptr > IntWriterPtr; + typedef std::shared_ptr > ShortWriterPtr; - typedef boost::shared_ptr > FloatPipePtr; + typedef std::shared_ptr > FloatPipePtr; - template void init_writer (boost::shared_ptr > & writer); - template void init_writer (boost::shared_ptr > & writer); + template void init_writer (std::shared_ptr > & writer); + template void init_writer (std::shared_ptr > & writer); void copy_files (std::string orig_path); @@ -170,13 +170,13 @@ class LIBARDOUR_API ExportGraphBuilder void set_peak_lufs (AudioGrapher::LoudnessReader const&); private: - typedef boost::shared_ptr > ChunkerPtr; - typedef boost::shared_ptr DemoNoisePtr; - typedef boost::shared_ptr NormalizerPtr; - typedef boost::shared_ptr LimiterPtr; - typedef boost::shared_ptr > FloatConverterPtr; - typedef boost::shared_ptr > IntConverterPtr; - typedef boost::shared_ptr > ShortConverterPtr; + typedef std::shared_ptr > ChunkerPtr; + typedef std::shared_ptr DemoNoisePtr; + typedef std::shared_ptr NormalizerPtr; + typedef std::shared_ptr LimiterPtr; + typedef std::shared_ptr > FloatConverterPtr; + typedef std::shared_ptr > IntConverterPtr; + typedef std::shared_ptr > ShortConverterPtr; FileSpec config; int data_width; @@ -208,11 +208,11 @@ class LIBARDOUR_API ExportGraphBuilder bool process (); private: - typedef boost::shared_ptr PeakReaderPtr; - typedef boost::shared_ptr LoudnessReaderPtr; - typedef boost::shared_ptr > TmpFilePtr; - typedef boost::shared_ptr > ThreaderPtr; - typedef boost::shared_ptr > BufferPtr; + typedef std::shared_ptr PeakReaderPtr; + typedef std::shared_ptr LoudnessReaderPtr; + typedef std::shared_ptr > TmpFilePtr; + typedef std::shared_ptr > ThreaderPtr; + typedef std::shared_ptr > BufferPtr; void prepare_post_processing (); void start_post_processing (); @@ -245,7 +245,7 @@ class LIBARDOUR_API ExportGraphBuilder bool operator== (FileSpec const & other_config) const; private: - typedef boost::shared_ptr SRConverterPtr; + typedef std::shared_ptr SRConverterPtr; template void add_child_to_list (FileSpec const & new_config, boost::ptr_list & list); @@ -268,7 +268,7 @@ class LIBARDOUR_API ExportGraphBuilder bool operator== (FileSpec const & other_config) const; private: - typedef boost::shared_ptr > SilenceTrimmerPtr; + typedef std::shared_ptr > SilenceTrimmerPtr; ExportGraphBuilder & parent; FileSpec config; @@ -286,8 +286,8 @@ class LIBARDOUR_API ExportGraphBuilder bool operator== (FileSpec const & other_config) const; private: - typedef boost::shared_ptr > InterleaverPtr; - typedef boost::shared_ptr > ChunkerPtr; + typedef std::shared_ptr > InterleaverPtr; + typedef std::shared_ptr > ChunkerPtr; ExportGraphBuilder & parent; FileSpec config; @@ -298,7 +298,7 @@ class LIBARDOUR_API ExportGraphBuilder }; Session const & session; - boost::shared_ptr timespan; + std::shared_ptr timespan; // Roots for export processor trees typedef boost::ptr_list ChannelConfigList; diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index 958f4e466b..d26d847c91 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -98,7 +98,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr * This ensures that it doesn't go out of scope before finalize_audio_export is called */ - friend boost::shared_ptr Session::get_export_handler(); + friend std::shared_ptr Session::get_export_handler(); ExportHandler (Session & session); void command_output(std::string output, size_t size); @@ -133,7 +133,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr int process (samplecnt_t samples); Session & session; - boost::shared_ptr graph_builder; + std::shared_ptr graph_builder; ExportStatusPtr export_status; /* The timespan and corresponding file specifications that we are exporting; diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h index 8161714863..a02d273abf 100644 --- a/libs/ardour/ardour/export_multiplication.h +++ b/libs/ardour/ardour/export_multiplication.h @@ -75,12 +75,12 @@ template class DataNode : public GraphNode { private: - typedef boost::shared_ptr DataPtr; - typedef boost::shared_ptr > SelfPtr; - typedef boost::weak_ptr > WeakSelfPtr; + typedef std::shared_ptr DataPtr; + typedef std::shared_ptr > SelfPtr; + typedef std::weak_ptr > WeakSelfPtr; DataNode (DataPtr data) : _data (data) {} - void set_self_ptr (boost::shared_ptr > ptr) { _self_ptr = ptr; } + void set_self_ptr (std::shared_ptr > ptr) { _self_ptr = ptr; } public: static SelfPtr create (T * data) @@ -101,7 +101,7 @@ SelfPtr self_ptr () { return _self_ptr.lock(); } template // Parent's data type - void sort_parents (list > > const & sort_list) + void sort_parents (list > > const & sort_list) { parents.sort (NodeSorter

(sort_list)); } @@ -117,7 +117,7 @@ template class NodeSorter { public: - typedef list > > ListType; + typedef list > > ListType; NodeSorter (ListType const & list) : list (list) {} @@ -146,16 +146,16 @@ public: typedef DataNode TimespanNode; - typedef boost::shared_ptr TimespanNodePtr; + typedef std::shared_ptr TimespanNodePtr; typedef DataNode ChannelConfigNode; - typedef boost::shared_ptr ChannelConfigNodePtr; + typedef std::shared_ptr ChannelConfigNodePtr; typedef DataNode FormatNode; - typedef boost::shared_ptr FormatNodePtr; + typedef std::shared_ptr FormatNodePtr; typedef DataNode FilenameNode; - typedef boost::shared_ptr FilenameNodePtr; + typedef std::shared_ptr FilenameNodePtr; struct MultiplicationGraph { list timespans; diff --git a/libs/ardour/ardour/export_pointers.h b/libs/ardour/ardour/export_pointers.h index 3d19bbbca9..5e65ea603a 100644 --- a/libs/ardour/ardour/export_pointers.h +++ b/libs/ardour/ardour/export_pointers.h @@ -47,19 +47,19 @@ class ExportPreset; typedef ComparableSharedPtr ExportChannelPtr; typedef ComparableSharedPtr ExportTimespanPtr; -typedef boost::shared_ptr ExportChannelConfigPtr; -typedef boost::shared_ptr ExportFormatBasePtr; -typedef boost::shared_ptr ExportFormatPtr; -typedef boost::shared_ptr ExportFormatSpecPtr; -typedef boost::shared_ptr ExportFormatCompatibilityPtr; -typedef boost::shared_ptr ExportFilenamePtr; -typedef boost::shared_ptr ExportStatusPtr; -typedef boost::shared_ptr ExportPresetPtr; +typedef std::shared_ptr ExportChannelConfigPtr; +typedef std::shared_ptr ExportFormatBasePtr; +typedef std::shared_ptr ExportFormatPtr; +typedef std::shared_ptr ExportFormatSpecPtr; +typedef std::shared_ptr ExportFormatCompatibilityPtr; +typedef std::shared_ptr ExportFilenamePtr; +typedef std::shared_ptr ExportStatusPtr; +typedef std::shared_ptr ExportPresetPtr; -typedef boost::weak_ptr WeakExportFormatCompatibilityPtr; -typedef boost::weak_ptr WeakExportFormatPtr; +typedef std::weak_ptr WeakExportFormatCompatibilityPtr; +typedef std::weak_ptr WeakExportFormatPtr; -typedef boost::shared_ptr BroadcastInfoPtr; +typedef std::shared_ptr BroadcastInfoPtr; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index 038ecc78be..6f0b95b3ef 100644 --- a/libs/ardour/ardour/export_profile_manager.h +++ b/libs/ardour/ardour/export_profile_manager.h @@ -78,7 +78,7 @@ public: void remove_preset (); private: - typedef boost::shared_ptr HandlerPtr; + typedef std::shared_ptr HandlerPtr; typedef std::pair FilePair; typedef std::map FileMap; @@ -112,7 +112,7 @@ private: /* Timespans */ public: typedef std::list TimespanList; - typedef boost::shared_ptr TimespanListPtr; + typedef std::shared_ptr TimespanListPtr; typedef std::list LocationList; enum TimeFormat { @@ -126,11 +126,11 @@ public: TimespanListPtr timespans; TimeFormat time_format; - boost::shared_ptr selection_range; - boost::shared_ptr ranges; + std::shared_ptr selection_range; + std::shared_ptr ranges; - TimespanState (boost::shared_ptr selection_range, - boost::shared_ptr ranges) + TimespanState (std::shared_ptr selection_range, + std::shared_ptr ranges) : timespans (new TimespanList ()) , time_format (Timecode) , selection_range (selection_range) @@ -139,7 +139,7 @@ public: } }; - typedef boost::shared_ptr TimespanStatePtr; + typedef std::shared_ptr TimespanStatePtr; typedef std::list TimespanStateList; void set_selection_range (samplepos_t start = 0, samplepos_t end = 0); @@ -158,9 +158,9 @@ private: /* Locations */ void update_ranges (); - boost::shared_ptr selection_range; - boost::shared_ptr ranges; - boost::shared_ptr single_range; + std::shared_ptr selection_range; + std::shared_ptr ranges; + std::shared_ptr single_range; bool single_range_mode; @@ -175,7 +175,7 @@ public: } }; - typedef boost::shared_ptr ChannelConfigStatePtr; + typedef std::shared_ptr ChannelConfigStatePtr; typedef std::list ChannelConfigStateList; ChannelConfigStateList const& get_channel_configs () { return check_list (channel_configs); } @@ -194,17 +194,17 @@ public: typedef std::list FormatList; struct FormatState { - boost::shared_ptr list; + std::shared_ptr list; ExportFormatSpecPtr format; - FormatState (boost::shared_ptr list, ExportFormatSpecPtr format) + FormatState (std::shared_ptr list, ExportFormatSpecPtr format) : list (list) , format (format) { } }; - typedef boost::shared_ptr FormatStatePtr; + typedef std::shared_ptr FormatStatePtr; typedef std::list FormatStateList; FormatStateList const& get_formats () { return check_list (formats); } @@ -232,7 +232,7 @@ private: ExportFormatSpecPtr load_format (XMLNode& node); void load_format_from_disk (std::string const& path); - boost::shared_ptr format_list; + std::shared_ptr format_list; FileMap format_file_map; /* Filenames */ @@ -246,7 +246,7 @@ public: } }; - typedef boost::shared_ptr FilenameStatePtr; + typedef std::shared_ptr FilenameStatePtr; typedef std::list FilenameStateList; FilenameStateList const& get_filenames () { return check_list (filenames); } @@ -270,10 +270,10 @@ public: std::list conflicting_filenames; }; - boost::shared_ptr get_warnings (); + std::shared_ptr get_warnings (); private: - void check_config (boost::shared_ptr warnings, + void check_config (std::shared_ptr warnings, TimespanStatePtr timespan_state, ExportChannelConfigPtr channel_config, FormatStatePtr format_state, diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 5c301152a2..3be722be11 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -39,7 +39,7 @@ class ExportTempFile; class LIBARDOUR_API ExportTimespan { private: - typedef boost::shared_ptr ExportStatusPtr; + typedef std::shared_ptr ExportStatusPtr; private: friend class ExportElementFactory; diff --git a/libs/ardour/ardour/filter.h b/libs/ardour/ardour/filter.h index dd99d30e9b..7f24bf6db3 100644 --- a/libs/ardour/ardour/filter.h +++ b/libs/ardour/ardour/filter.h @@ -36,14 +36,14 @@ class LIBARDOUR_API Filter { public: virtual ~Filter() {} - virtual int run (boost::shared_ptr, Progress* progress = 0) = 0; - std::vector > results; + virtual int run (std::shared_ptr, Progress* progress = 0) = 0; + std::vector > results; protected: Filter (ARDOUR::Session& s) : session(s) {} - int make_new_sources (boost::shared_ptr, ARDOUR::SourceList&, std::string suffix = "", bool use_session_sample_rate = true); - int finish (boost::shared_ptr, ARDOUR::SourceList&, std::string region_name = ""); + int make_new_sources (std::shared_ptr, ARDOUR::SourceList&, std::string suffix = "", bool use_session_sample_rate = true); + int finish (std::shared_ptr, ARDOUR::SourceList&, std::string region_name = ""); ARDOUR::Session& session; }; diff --git a/libs/ardour/ardour/gain_control.h b/libs/ardour/ardour/gain_control.h index 5ad9b4cc57..f8263adcd1 100644 --- a/libs/ardour/ardour/gain_control.h +++ b/libs/ardour/ardour/gain_control.h @@ -37,12 +37,12 @@ class Session; class LIBARDOUR_API GainControl : public SlavableAutomationControl { public: GainControl (Session& session, const Evoral::Parameter ¶m, - boost::shared_ptr al = boost::shared_ptr()); + std::shared_ptr al = std::shared_ptr()); void inc_gain (gain_t); protected: - void post_add_master (boost::shared_ptr); + void post_add_master (std::shared_ptr); bool get_masters_curve_locked (samplepos_t, samplepos_t, float*, samplecnt_t) const; }; diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index b99df69e7d..85dc5be915 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -51,7 +51,7 @@ class RTTaskList; class Session; class GraphEdges; -typedef boost::shared_ptr node_ptr_t; +typedef std::shared_ptr node_ptr_t; typedef std::list node_list_t; typedef std::set node_set_t; @@ -75,10 +75,10 @@ public: Graph (Session& session); /* public API for use by session-process */ - int process_routes (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler); - int routes_no_roll (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending); - int silence_routes (boost::shared_ptr chain, pframes_t nframes); - int process_io_plugs (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample); + int process_routes (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler); + int routes_no_roll (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending); + int silence_routes (std::shared_ptr chain, pframes_t nframes); + int process_io_plugs (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample); bool in_process_thread () const; uint32_t n_threads () const; diff --git a/libs/ardour/ardour/graph_edges.h b/libs/ardour/ardour/graph_edges.h index ee73c52a3f..433e67fe79 100644 --- a/libs/ardour/ardour/graph_edges.h +++ b/libs/ardour/ardour/graph_edges.h @@ -30,7 +30,7 @@ namespace ARDOUR { class GraphNode; -typedef boost::shared_ptr GraphVertex; +typedef std::shared_ptr GraphVertex; /** A list of edges for a directed graph for routes. * diff --git a/libs/ardour/ardour/graphnode.h b/libs/ardour/ardour/graphnode.h index abb7491e7d..a85c7ad1a5 100644 --- a/libs/ardour/ardour/graphnode.h +++ b/libs/ardour/ardour/graphnode.h @@ -37,7 +37,7 @@ class Graph; class GraphNode; struct GraphChain; -typedef boost::shared_ptr node_ptr_t; +typedef std::shared_ptr node_ptr_t; typedef std::set node_set_t; typedef std::list node_list_t; @@ -74,7 +74,7 @@ protected: class LIBARDOUR_API GraphNode : public ProcessNode, public GraphActivision { public: - GraphNode (boost::shared_ptr Graph); + GraphNode (std::shared_ptr Graph); /* API used by Graph */ void prep (GraphChain const*); @@ -83,13 +83,13 @@ public: /* API used to sort Nodes and create GraphChain */ virtual std::string graph_node_name () const = 0; - virtual bool direct_feeds_according_to_reality (boost::shared_ptr, bool* via_send_only = 0) = 0; + virtual bool direct_feeds_according_to_reality (std::shared_ptr, bool* via_send_only = 0) = 0; protected: void trigger (); virtual void process () = 0; - boost::shared_ptr _graph; + std::shared_ptr _graph; private: void finish (GraphChain const*); diff --git a/libs/ardour/ardour/instrument_info.h b/libs/ardour/ardour/instrument_info.h index 93f22485bf..9207b98cb6 100644 --- a/libs/ardour/ardour/instrument_info.h +++ b/libs/ardour/ardour/instrument_info.h @@ -37,7 +37,7 @@ namespace MIDI { class ValueNameList; class MasterDeviceNames; class ControlNameList; - typedef std::list > PatchNameList; + typedef std::list > PatchNameList; } } @@ -55,7 +55,7 @@ public: std::string mode () const; void set_external_instrument (const std::string& model, const std::string& mode); - void set_internal_instrument (boost::shared_ptr); + void set_internal_instrument (std::shared_ptr); std::string get_note_name (uint16_t bank, uint8_t program, uint8_t channel, uint8_t note) const; @@ -63,12 +63,12 @@ public: std::string get_patch_name_without (uint16_t bank, uint8_t program, uint8_t channel) const; std::string get_controller_name (Evoral::Parameter param) const; - boost::shared_ptr master_device_names () const; + std::shared_ptr master_device_names () const; - boost::shared_ptr get_patches (uint8_t channel); - boost::shared_ptr control_name_list (uint8_t channel); + std::shared_ptr get_patches (uint8_t channel); + std::shared_ptr control_name_list (uint8_t channel); - boost::shared_ptr value_name_list_by_control (uint8_t channel, uint8_t number) const; + std::shared_ptr value_name_list_by_control (uint8_t channel, uint8_t number) const; size_t master_controller_count () const; uint16_t channels_for_control_list (std::string const& ctrl_name_list) const; @@ -94,7 +94,7 @@ private: mutable std::string _plugin_model; mutable std::string _plugin_mode; - boost::weak_ptr internal_instrument; + std::weak_ptr internal_instrument; PBD::ScopedConnection _midnam_changed; }; diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index e6771bb68b..aa26cc2518 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -31,7 +31,7 @@ namespace ARDOUR { class LIBARDOUR_API InternalSend : public Send { public: - InternalSend (Session&, boost::shared_ptr, boost::shared_ptr, boost::shared_ptr send_from, boost::shared_ptr send_to, Delivery::Role role = Delivery::Aux, bool ignore_bitslot = false); + InternalSend (Session&, std::shared_ptr, std::shared_ptr, std::shared_ptr send_from, std::shared_ptr send_to, Delivery::Role role = Delivery::Aux, bool ignore_bitslot = false); virtual ~InternalSend (); std::string display_name() const; @@ -42,13 +42,13 @@ public: void cycle_start (pframes_t); void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool); - bool feeds (boost::shared_ptr other) const; + bool feeds (std::shared_ptr other) const; bool can_support_io_configuration (const ChanCount& in, ChanCount& out); bool configure_io (ChanCount in, ChanCount out); int set_block_size (pframes_t); - boost::shared_ptr source_route() const { return _send_from; } - boost::shared_ptr target_route() const { return _send_to; } + std::shared_ptr source_route() const { return _send_from; } + std::shared_ptr target_route() const { return _send_to; } const PBD::ID& target_id() const { return _send_to_id; } BufferSet const & get_buffers () const { @@ -68,8 +68,8 @@ protected: private: BufferSet mixbufs; - boost::shared_ptr _send_from; - boost::shared_ptr _send_to; + std::shared_ptr _send_from; + std::shared_ptr _send_to; bool _allow_feedback; PBD::ID _send_to_id; PBD::ScopedConnection connect_c; @@ -81,7 +81,7 @@ private: void send_to_property_changed (const PBD::PropertyChange&); int after_connect (); void init_gain (); - int use_target (boost::shared_ptr, bool update_name = true); + int use_target (std::shared_ptr, bool update_name = true); void target_io_changed (); void ensure_mixbufs (); diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 965fd77010..84217c4f0e 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -99,22 +99,22 @@ public: int ensure_io (ChanCount cnt, bool clear, void *src); - int connect_ports_to_bundle (boost::shared_ptr, bool exclusive, void *); - int connect_ports_to_bundle (boost::shared_ptr, bool, bool, void *); - int disconnect_ports_from_bundle (boost::shared_ptr, void *); + int connect_ports_to_bundle (std::shared_ptr, bool exclusive, void *); + int connect_ports_to_bundle (std::shared_ptr, bool, bool, void *); + int disconnect_ports_from_bundle (std::shared_ptr, void *); BundleList bundles_connected (); - boost::shared_ptr bundle () { return _bundle; } + std::shared_ptr bundle () { return _bundle; } bool can_add_port (DataType) const; int add_port (std::string connection, void *src, DataType type = DataType::NIL); - int remove_port (boost::shared_ptr, void *src); - int connect (boost::shared_ptr our_port, std::string other_port, void *src); - int disconnect (boost::shared_ptr our_port, std::string other_port, void *src); + int remove_port (std::shared_ptr, void *src); + int connect (std::shared_ptr our_port, std::string other_port, void *src); + int disconnect (std::shared_ptr our_port, std::string other_port, void *src); int disconnect (void *src); - bool connected_to (boost::shared_ptr) const; + bool connected_to (std::shared_ptr) const; bool connected_to (const std::string&) const; bool connected () const; bool physically_connected () const; @@ -129,20 +129,20 @@ public: PortSet& ports() { return _ports; } const PortSet& ports() const { return _ports; } - bool has_port (boost::shared_ptr) const; + bool has_port (std::shared_ptr) const; - boost::shared_ptr nth (uint32_t n) const { + std::shared_ptr nth (uint32_t n) const { if (n < _ports.num_ports()) { return _ports.port(n); } else { - return boost::shared_ptr (); + return std::shared_ptr (); } } - boost::shared_ptr port_by_name (const std::string& str) const; + std::shared_ptr port_by_name (const std::string& str) const; - boost::shared_ptr audio(uint32_t n) const; - boost::shared_ptr midi(uint32_t n) const; + std::shared_ptr audio(uint32_t n) const; + std::shared_ptr midi(uint32_t n) const; const ChanCount& n_ports () const { return _ports.count(); } @@ -212,11 +212,11 @@ private: void reestablish_port_subscriptions (); PBD::ScopedConnectionList _port_connections; - boost::shared_ptr _bundle; ///< a bundle representing our ports + std::shared_ptr _bundle; ///< a bundle representing our ports struct UserBundleInfo { - UserBundleInfo (IO*, boost::shared_ptr b); - boost::shared_ptr bundle; + UserBundleInfo (IO*, std::shared_ptr b); + std::shared_ptr bundle; PBD::ScopedConnection changed; }; @@ -228,11 +228,11 @@ private: void bundle_changed (Bundle::Change); int set_port_state_2X (const XMLNode& node, int version, bool in); - int get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr& c); - int get_port_counts_2X (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr& c); + int get_port_counts (const XMLNode& node, int version, ChanCount& n, std::shared_ptr& c); + int get_port_counts_2X (const XMLNode& node, int version, ChanCount& n, std::shared_ptr& c); int create_ports (const XMLNode&, int version); - boost::shared_ptr find_possible_bundle (const std::string &desired_name); + std::shared_ptr find_possible_bundle (const std::string &desired_name); int ensure_ports_locked (ChanCount, bool clear, bool& changed); @@ -245,7 +245,7 @@ private: void apply_pretty_name (); std::string _pretty_name_prefix; BufferSet _buffers; - void connection_change (boost::shared_ptr, boost::shared_ptr); + void connection_change (std::shared_ptr, std::shared_ptr); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/io_plug.h b/libs/ardour/ardour/io_plug.h index d4a351e7f2..77fd28fc5d 100644 --- a/libs/ardour/ardour/io_plug.h +++ b/libs/ardour/ardour/io_plug.h @@ -46,7 +46,7 @@ class ReadOnlyControl; class LIBARDOUR_API IOPlug : public SessionObject, public PlugInsertBase, public Latent, public GraphNode { public: - IOPlug (Session&, boost::shared_ptr = boost::shared_ptr(), bool pre = true); + IOPlug (Session&, std::shared_ptr = std::shared_ptr(), bool pre = true); virtual ~IOPlug (); bool set_name (std::string const&); @@ -63,8 +63,8 @@ public: bool is_pre () const { return _pre; } - boost::shared_ptr input () const { return _input; } - boost::shared_ptr output () const { return _output; } + std::shared_ptr input () const { return _input; } + std::shared_ptr output () const { return _output; } Gtkmm2ext::WindowProxy* window_proxy () const { return _window_proxy; } void set_window_proxy (Gtkmm2ext::WindowProxy* wp) { _window_proxy = wp; } @@ -79,7 +79,7 @@ public: /* PlugInsertBase */ uint32_t get_count () const { return 1; } - boost::shared_ptr plugin (uint32_t num = 0) const { return _plugin; } + std::shared_ptr plugin (uint32_t num = 0) const { return _plugin; } PluginType type () const { return _plugin->get_info()->type; } UIElements ui_elements () const; @@ -87,7 +87,7 @@ public: bool write_immediate_event (Evoral::EventType event_type, size_t size, const uint8_t* buf); bool load_preset (Plugin::PresetRecord); - boost::shared_ptr control_output (uint32_t) const; + std::shared_ptr control_output (uint32_t) const; bool reset_parameters_to_default () { return false;} bool can_reset_all_parameters () { return false; } @@ -97,13 +97,13 @@ public: virtual void clear_stats (); /* ControlSet */ - boost::shared_ptr control_factory (const Evoral::Parameter& id); + std::shared_ptr control_factory (const Evoral::Parameter& id); /* GraphNode */ std::string graph_node_name () const { return name (); } - bool direct_feeds_according_to_reality (boost::shared_ptr, bool* via_send_only = 0); + bool direct_feeds_according_to_reality (std::shared_ptr, bool* via_send_only = 0); void process (); protected: @@ -156,12 +156,12 @@ private: bool _pre; uint32_t _plugin_signal_latency; - typedef std::map >CtrlOutMap; + typedef std::map >CtrlOutMap; CtrlOutMap _control_outputs; BufferSet _bufs; - boost::shared_ptr _input; - boost::shared_ptr _output; + std::shared_ptr _input; + std::shared_ptr _output; PortManager::AudioInputPorts _audio_input_ports; PortManager::MIDIInputPorts _midi_input_ports; diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index 75934a74f0..dbea62935f 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -48,7 +48,7 @@ public: const std::string& proc_name, const std::string io_name="", ARDOUR::DataType default_type = DataType::AUDIO, bool sendish=false); - IOProcessor (Session&, boost::shared_ptr input, boost::shared_ptr output, + IOProcessor (Session&, std::shared_ptr input, std::shared_ptr output, const std::string& proc_name, Temporal::TimeDomain, bool sendish=false); virtual ~IOProcessor (); @@ -60,18 +60,18 @@ public: virtual ChanCount natural_output_streams() const; virtual ChanCount natural_input_streams () const; - boost::shared_ptr input() { return _input; } - boost::shared_ptr input() const { return _input; } - boost::shared_ptr output() { return _output; } - boost::shared_ptr output() const { return _output; } + std::shared_ptr input() { return _input; } + std::shared_ptr input() const { return _input; } + std::shared_ptr output() { return _output; } + std::shared_ptr output() const { return _output; } - void set_input (boost::shared_ptr); - void set_output (boost::shared_ptr); + void set_input (std::shared_ptr); + void set_output (std::shared_ptr); void silence (samplecnt_t nframes, samplepos_t start_sample); void disconnect (); - virtual bool feeds (boost::shared_ptr other) const; + virtual bool feeds (std::shared_ptr other) const; PBD::Signal2 AutomationPlaybackChanged; PBD::Signal2 AutomationChanged; @@ -84,8 +84,8 @@ public: uint32_t bit_slot() const { return _bitslot; } protected: - boost::shared_ptr _input; - boost::shared_ptr _output; + std::shared_ptr _input; + std::shared_ptr _output; /* used by PortInsert, Send & Return*/ std::string validate_name (std::string const& new_name, std::string const& canonical_name) const; diff --git a/libs/ardour/ardour/io_vector.h b/libs/ardour/ardour/io_vector.h index 6b4fc269df..54e2f64175 100644 --- a/libs/ardour/ardour/io_vector.h +++ b/libs/ardour/ardour/io_vector.h @@ -26,13 +26,13 @@ namespace ARDOUR { -class IOVector : public std::vector > +class IOVector : public std::vector > { public: #if 0 // unused -- for future reference bool connected_to (const IOVector& other) const { for (IOVector::const_iterator i = other.begin(); i != other.end(); ++i) { - boost::shared_ptr io = i->lock(); + std::shared_ptr io = i->lock(); if (!io) continue; if (connected_to (io)) { return true; @@ -41,9 +41,9 @@ public: return false; } - bool connected_to (boost::shared_ptr other) const { + bool connected_to (std::shared_ptr other) const { for (IOVector::const_iterator i = begin(); i != end(); ++i) { - boost::shared_ptr io = i->lock(); + std::shared_ptr io = i->lock(); if (!io) continue; if (io->connected_to (other)) { return true; @@ -53,9 +53,9 @@ public: } #endif - bool fed_by (boost::shared_ptr other) const { + bool fed_by (std::shared_ptr other) const { for (IOVector::const_iterator i = begin(); i != end(); ++i) { - boost::shared_ptr io = i->lock(); + std::shared_ptr io = i->lock(); if (!io) continue; if (other->connected_to (io)) { return true; diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index 049eaa99e4..fe64a09673 100644 --- a/libs/ardour/ardour/ladspa_plugin.h +++ b/libs/ardour/ardour/ladspa_plugin.h @@ -98,7 +98,7 @@ class LIBARDOUR_API LadspaPlugin : public ARDOUR::Plugin bool parameter_is_output(uint32_t) const; bool parameter_is_toggled(uint32_t) const; - boost::shared_ptr + std::shared_ptr get_scale_points(uint32_t port_index) const; int set_state (const XMLNode&, int version); @@ -163,7 +163,7 @@ class LIBARDOUR_API LadspaPluginInfo : public PluginInfo { std::vector get_presets (bool user_only) const; }; -typedef boost::shared_ptr LadspaPluginInfoPtr; +typedef std::shared_ptr LadspaPluginInfoPtr; } // namespace ARDOUR diff --git a/libs/ardour/ardour/legatize.h b/libs/ardour/ardour/legatize.h index fd01e9814a..5bef47cab1 100644 --- a/libs/ardour/ardour/legatize.h +++ b/libs/ardour/ardour/legatize.h @@ -41,7 +41,7 @@ public: typedef Evoral::Sequence::Notes Notes; - Command* operator()(boost::shared_ptr model, + Command* operator()(std::shared_ptr model, Temporal::Beats position, std::vector& seqs); diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 79f70a2a13..f3af8744b8 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -121,8 +121,8 @@ public: Flags flags () const { return _flags; } - boost::shared_ptr scene_change() const { return _scene_change; } - void set_scene_change (boost::shared_ptr); + std::shared_ptr scene_change() const { return _scene_change; } + void set_scene_change (std::shared_ptr); int32_t cue_id() const { assert (is_cue_marker()); return _cue; } void set_cue_id (int32_t); @@ -220,7 +220,7 @@ private: uint32_t _signals_suspended; std::set _postponed_signals; - boost::shared_ptr _scene_change; + std::shared_ptr _scene_change; }; /** A collection of session locations including unique dedicated locations (loop, punch, etc) */ diff --git a/libs/ardour/ardour/lua_api.h b/libs/ardour/ardour/lua_api.h index c44b2fffa9..c8c6becdad 100644 --- a/libs/ardour/ardour/lua_api.h +++ b/libs/ardour/ardour/lua_api.h @@ -61,13 +61,13 @@ namespace ARDOUR { namespace LuaAPI { * @param r Route to add Send to * @param p add send before given processor (or \ref nil_processor to add at the end) */ - boost::shared_ptr new_send (Session* s, boost::shared_ptr r, boost::shared_ptr p); + std::shared_ptr new_send (Session* s, std::shared_ptr r, std::shared_ptr p); /** Create a null processor shared pointer * * This is useful for Track:bounce() to indicate no processing. */ - boost::shared_ptr nil_processor (); + std::shared_ptr nil_processor (); /** create a new Lua Processor (Plugin) * @@ -76,13 +76,13 @@ namespace ARDOUR { namespace LuaAPI { * @param td Time domain (audio or beats) for any automation data * @returns Processor object (may be nil) */ - boost::shared_ptr new_luaproc_with_time_domain (ARDOUR::Session *s, const std::string& p, Temporal::TimeDomain td); + std::shared_ptr new_luaproc_with_time_domain (ARDOUR::Session *s, const std::string& p, Temporal::TimeDomain td); /* As above but uses default time domain for the session/application */ - boost::shared_ptr new_luaproc (ARDOUR::Session *s, const std::string& p); + std::shared_ptr new_luaproc (ARDOUR::Session *s, const std::string& p); /** List all installed plugins */ - std::list > list_plugins (); + std::list > list_plugins (); /** Write a list of untagged plugins to a file, so we can bulk-tag them * @returns path to XML file or empty string on error @@ -95,7 +95,7 @@ namespace ARDOUR { namespace LuaAPI { * @param type Plugin Type * @returns PluginInfo or nil if not found */ - boost::shared_ptr new_plugin_info (const std::string& id, ARDOUR::PluginType type); + std::shared_ptr new_plugin_info (const std::string& id, ARDOUR::PluginType type); /** create a new Plugin Instance * @@ -106,10 +106,10 @@ namespace ARDOUR { namespace LuaAPI { * @param td Time domain for any automation data * @returns Processor or nil */ - boost::shared_ptr new_plugin_with_time_domain (ARDOUR::Session *s, const std::string& id, ARDOUR::PluginType type, Temporal::TimeDomain td, const std::string& preset = ""); + std::shared_ptr new_plugin_with_time_domain (ARDOUR::Session *s, const std::string& id, ARDOUR::PluginType type, Temporal::TimeDomain td, const std::string& preset = ""); /* As above but uses default time domain for the session/application */ - boost::shared_ptr new_plugin (ARDOUR::Session *s, const std::string& id, ARDOUR::PluginType type, const std::string& preset = ""); + std::shared_ptr new_plugin (ARDOUR::Session *s, const std::string& id, ARDOUR::PluginType type, const std::string& preset = ""); /** set a plugin control-input parameter value * @@ -118,7 +118,7 @@ namespace ARDOUR { namespace LuaAPI { * @param value value to set * @returns true on success, false on error or out-of-bounds value */ - bool set_processor_param (boost::shared_ptr proc, uint32_t which, float value); + bool set_processor_param (std::shared_ptr proc, uint32_t which, float value); /** get a plugin control parameter value * @@ -127,7 +127,7 @@ namespace ARDOUR { namespace LuaAPI { * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value. * @returns value */ - float get_processor_param (boost::shared_ptr proc, uint32_t which, bool &ok); + float get_processor_param (std::shared_ptr proc, uint32_t which, bool &ok); /** reset a processor to its default values (only works for plugins ) * @@ -136,7 +136,7 @@ namespace ARDOUR { namespace LuaAPI { * @param proc Plugin-Insert * @returns true on success, false when the processor is not a plugin */ - bool reset_processor_to_default (boost::shared_ptr proc); + bool reset_processor_to_default (std::shared_ptr proc); /** set a plugin control-input parameter value * @@ -147,7 +147,7 @@ namespace ARDOUR { namespace LuaAPI { * @param value value to set * @returns true on success, false on error or out-of-bounds value */ - bool set_plugin_insert_param (boost::shared_ptr pi, uint32_t which, float value); + bool set_plugin_insert_param (std::shared_ptr pi, uint32_t which, float value); /** get a plugin control parameter value * @@ -156,7 +156,7 @@ namespace ARDOUR { namespace LuaAPI { * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value. * @returns value */ - float get_plugin_insert_param (boost::shared_ptr pi, uint32_t which, bool &ok); + float get_plugin_insert_param (std::shared_ptr pi, uint32_t which, bool &ok); /** * A convenience function to get a Automation Lists and ParameterDescriptor @@ -311,7 +311,7 @@ namespace ARDOUR { namespace LuaAPI { * @param fn lua callback function or nil * @return 0 on success */ - int analyze (boost::shared_ptr r, uint32_t channel, luabridge::LuaRef fn); + int analyze (std::shared_ptr r, uint32_t channel, luabridge::LuaRef fn); /** call plugin():reset() and clear initialization flag */ void reset (); @@ -358,15 +358,15 @@ namespace ARDOUR { namespace LuaAPI { }; - class Rubberband : public AudioReadable , public boost::enable_shared_from_this + class Rubberband : public AudioReadable , public std::enable_shared_from_this { public: - Rubberband (boost::shared_ptr, bool percussive); + Rubberband (std::shared_ptr, bool percussive); ~Rubberband (); bool set_strech_and_pitch (double stretch_ratio, double pitch_ratio); bool set_mapping (luabridge::LuaRef tbl); - boost::shared_ptr process (luabridge::LuaRef cb); - boost::shared_ptr readable (); + std::shared_ptr process (luabridge::LuaRef cb); + std::shared_ptr readable (); /* audioreadable API */ samplecnt_t readable_length_samples () const { return _read_len; } @@ -378,16 +378,16 @@ namespace ARDOUR { namespace LuaAPI { bool read_region (bool study); bool retrieve (float**); void cleanup (bool abort); - boost::shared_ptr finalize (); + std::shared_ptr finalize (); - boost::shared_ptr _region; + std::shared_ptr _region; uint32_t _n_channels; samplecnt_t _read_len; samplecnt_t _read_start; samplecnt_t _read_offset; - std::vector > _asrc; + std::vector > _asrc; RubberBand::RubberBandStretcher _rbs; std::map _mapping; @@ -396,15 +396,15 @@ namespace ARDOUR { namespace LuaAPI { double _pitch_ratio; luabridge::LuaRef* _cb; - boost::shared_ptr _self; + std::shared_ptr _self; static const samplecnt_t _bufsize; }; - boost::shared_ptr > + std::shared_ptr > new_noteptr (uint8_t, Temporal::Beats, Temporal::Beats, uint8_t, uint8_t); - std::list > > - note_list (boost::shared_ptr); + std::list > > + note_list (std::shared_ptr); } } /* namespace */ diff --git a/libs/ardour/ardour/luaproc.h b/libs/ardour/ardour/luaproc.h index 402f7c8027..c6efacdb5f 100644 --- a/libs/ardour/ardour/luaproc.h +++ b/libs/ardour/ardour/luaproc.h @@ -95,7 +95,7 @@ public: pframes_t nframes, samplecnt_t offset); std::string describe_parameter (Evoral::Parameter); - boost::shared_ptr get_scale_points(uint32_t port_index) const; + std::shared_ptr get_scale_points(uint32_t port_index) const; bool parameter_is_audio (uint32_t) const { return false; } bool parameter_is_control (uint32_t) const { return true; } @@ -163,7 +163,7 @@ private: LuaTableRef lref; - boost::weak_ptr route () const; + std::weak_ptr route () const; void init (); bool load_script (); @@ -173,7 +173,7 @@ private: std::string presets_file () const; XMLTree* presets_tree () const; - boost::shared_ptr parse_scale_points (luabridge::LuaRef*); + std::shared_ptr parse_scale_points (luabridge::LuaRef*); std::vector > _ctrl_params; std::map _param_desc; @@ -224,7 +224,7 @@ class LIBARDOUR_API LuaPluginInfo : public PluginInfo uint32_t _max_outputs; }; -typedef boost::shared_ptr LuaPluginInfoPtr; +typedef std::shared_ptr LuaPluginInfoPtr; } // namespace ARDOUR diff --git a/libs/ardour/ardour/luascripting.h b/libs/ardour/ardour/luascripting.h index 402a6a360b..1b4101846f 100644 --- a/libs/ardour/ardour/luascripting.h +++ b/libs/ardour/ardour/luascripting.h @@ -100,10 +100,10 @@ struct LIBARDOUR_API LuaScriptParam { }; -typedef boost::shared_ptr LuaScriptInfoPtr; +typedef std::shared_ptr LuaScriptInfoPtr; typedef std::vector LuaScriptList; -typedef boost::shared_ptr LuaScriptParamPtr; +typedef std::shared_ptr LuaScriptParamPtr; typedef std::vector LuaScriptParamList; diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index ad5c98b7a5..088fd8d605 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -105,7 +105,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee const LV2_Feature* const* features () { return _features; } std::set automatable () const; - virtual void set_automation_control (uint32_t, boost::shared_ptr); + virtual void set_automation_control (uint32_t, std::shared_ptr); void activate (); void deactivate (); @@ -131,7 +131,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee uint32_t designated_bypass_port (); - boost::shared_ptr + std::shared_ptr get_scale_points(uint32_t port_index) const; void set_insert_id(PBD::ID id); @@ -144,8 +144,8 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee bool has_editor () const; bool has_message_output () const; - void add_slave (boost::shared_ptr, bool); - void remove_slave (boost::shared_ptr); + void add_slave (std::shared_ptr, bool); + void remove_slave (std::shared_ptr); bool write_from_ui(uint32_t index, uint32_t protocol, @@ -265,15 +265,15 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee , guard (other.guard) { } - AutomationCtrl (boost::shared_ptr c) + AutomationCtrl (std::shared_ptr c) : ac (c) , guard (false) { } - boost::shared_ptr ac; + std::shared_ptr ac; bool guard; }; - typedef boost::shared_ptr AutomationCtrlPtr; + typedef std::shared_ptr AutomationCtrlPtr; typedef std::map AutomationCtrlMap; AutomationCtrlMap _ctrl_map; AutomationCtrlPtr get_automation_control (uint32_t); @@ -303,7 +303,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee Glib::Threads::Mutex _work_mutex; Glib::Threads::Mutex _slave_lock; - std::set> _slaves; + std::set> _slaves; #ifdef LV2_EXTENDED static void queue_draw (LV2_Inline_Display_Handle); @@ -392,7 +392,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee }; -class LIBARDOUR_API LV2PluginInfo : public PluginInfo , public boost::enable_shared_from_this { +class LIBARDOUR_API LV2PluginInfo : public PluginInfo , public std::enable_shared_from_this { public: LV2PluginInfo (const char* plugin_uri); ~LV2PluginInfo (); @@ -414,7 +414,7 @@ private: bool _is_analyzer; }; -typedef boost::shared_ptr LV2PluginInfoPtr; +typedef std::shared_ptr LV2PluginInfoPtr; } // namespace ARDOUR diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h index 580e6e798d..f0894663f1 100644 --- a/libs/ardour/ardour/midi_cursor.h +++ b/libs/ardour/ardour/midi_cursor.h @@ -50,7 +50,7 @@ struct MidiCursor : public boost::noncopyable { } Evoral::Sequence::const_iterator iter; - std::set::WeakNotePtr> active_notes; + Evoral::Sequence::WeakActiveNotes active_notes; timepos_t last_read_end; PBD::ScopedConnectionList connections; }; diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index b8eb9a2e25..324a6c73a8 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -65,7 +65,7 @@ public: class LIBARDOUR_API DiffCommand : public Command { public: - DiffCommand (boost::shared_ptr m, const std::string& name); + DiffCommand (std::shared_ptr m, const std::string& name); const std::string& name () const { return _name; } @@ -75,10 +75,10 @@ public: virtual int set_state (const XMLNode&, int version) = 0; virtual XMLNode & get_state () const = 0; - boost::shared_ptr model() const { return _model; } + std::shared_ptr model() const { return _model; } protected: - boost::shared_ptr _model; + std::shared_ptr _model; const std::string _name; }; @@ -86,8 +86,8 @@ public: class LIBARDOUR_API NoteDiffCommand : public DiffCommand { public: - NoteDiffCommand (boost::shared_ptr m, const std::string& name) : DiffCommand (m, name) {} - NoteDiffCommand (boost::shared_ptr m, const XMLNode& node); + NoteDiffCommand (std::shared_ptr m, const std::string& name) : DiffCommand (m, name) {} + NoteDiffCommand (std::shared_ptr m, const XMLNode& node); enum Property { NoteNumber, @@ -136,7 +136,7 @@ public: }; typedef std::list ChangeList; - typedef std::list< boost::shared_ptr< Evoral::Note > > NoteList; + typedef std::list< std::shared_ptr< Evoral::Note > > NoteList; const ChangeList& changes() const { return _changes; } const NoteList& added_notes() const { return _added_notes; } @@ -159,7 +159,7 @@ public: /* Currently this class only supports changes of sys-ex time, but could be expanded */ class LIBARDOUR_API SysExDiffCommand : public DiffCommand { public: - SysExDiffCommand (boost::shared_ptr m, const XMLNode& node); + SysExDiffCommand (std::shared_ptr m, const XMLNode& node); enum Property { Time, @@ -172,12 +172,12 @@ public: void operator() (); void undo (); - void change (boost::shared_ptr >, TimeType); + void change (std::shared_ptr >, TimeType); private: struct Change { Change () : sysex_id (0) {} - boost::shared_ptr > sysex; + std::shared_ptr > sysex; gint sysex_id; SysExDiffCommand::Property property; TimeType old_time; @@ -195,8 +195,8 @@ public: class LIBARDOUR_API PatchChangeDiffCommand : public DiffCommand { public: - PatchChangeDiffCommand (boost::shared_ptr, const std::string &); - PatchChangeDiffCommand (boost::shared_ptr, const XMLNode &); + PatchChangeDiffCommand (std::shared_ptr, const std::string &); + PatchChangeDiffCommand (std::shared_ptr, const XMLNode &); int set_state (const XMLNode &, int version); XMLNode & get_state () const; @@ -290,10 +290,10 @@ public: bool sync_to_source (const Source::WriterLock& source_lock); - bool write_to(boost::shared_ptr source, + bool write_to(std::shared_ptr source, const Source::WriterLock& source_lock); - bool write_section_to(boost::shared_ptr source, + bool write_section_to(std::shared_ptr source, const Source::WriterLock& source_lock, Temporal::Beats begin = Temporal::Beats(), Temporal::Beats end = std::numeric_limits::max(), @@ -307,15 +307,15 @@ public: PBD::Signal0 ContentsChanged; PBD::Signal1 ContentsShifted; - boost::shared_ptr > find_note (NotePtr); + std::shared_ptr > find_note (NotePtr); PatchChangePtr find_patch_change (Evoral::event_id_t); - boost::shared_ptr > find_note (Evoral::event_id_t); - boost::shared_ptr > find_sysex (Evoral::event_id_t); + std::shared_ptr > find_note (Evoral::event_id_t); + std::shared_ptr > find_sysex (Evoral::event_id_t); InsertMergePolicy insert_merge_policy () const; void set_insert_merge_policy (InsertMergePolicy); - boost::shared_ptr control_factory(const Evoral::Parameter& id); + std::shared_ptr control_factory(const Evoral::Parameter& id); void insert_silence_at_start (TimeType); void transpose (NoteDiffCommand *, const NotePtr, int); diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h index 1cbfd8d3b9..3e1553a3ea 100644 --- a/libs/ardour/ardour/midi_operator.h +++ b/libs/ardour/ardour/midi_operator.h @@ -37,7 +37,7 @@ class LIBARDOUR_API MidiOperator { MidiOperator () {} virtual ~MidiOperator() {} - virtual Command* operator() (boost::shared_ptr, + virtual Command* operator() (std::shared_ptr, Temporal::Beats, std::vector::Notes>&) = 0; virtual std::string name() const = 0; diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index 05b5b34bd6..cc3680235f 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -49,7 +49,7 @@ private: static MidiPatchManager* _manager; public: - typedef std::map > MidiNameDocuments; + typedef std::map > MidiNameDocuments; typedef std::map DeviceNamesByMaker; ~MidiPatchManager(); @@ -72,66 +72,66 @@ public: void remove_search_path (const PBD::Searchpath& search_path); - boost::shared_ptr document_by_model(std::string model_name) const; + std::shared_ptr document_by_model(std::string model_name) const; - boost::shared_ptr master_device_by_model(std::string model_name) + std::shared_ptr master_device_by_model(std::string model_name) { return _master_devices_by_model[model_name]; } - boost::shared_ptr find_channel_name_set( + std::shared_ptr find_channel_name_set( std::string model, std::string custom_device_mode, uint8_t channel) { - boost::shared_ptr master_device = master_device_by_model(model); + std::shared_ptr master_device = master_device_by_model(model); if (master_device != 0 && custom_device_mode != "") { return master_device->channel_name_set_by_channel(custom_device_mode, channel); } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } - boost::shared_ptr find_patch( + std::shared_ptr find_patch( std::string model, std::string custom_device_mode, uint8_t channel, PatchPrimaryKey patch_key) { - boost::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); + std::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); if (channel_name_set) { return channel_name_set->find_patch(patch_key); } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } - boost::shared_ptr previous_patch( + std::shared_ptr previous_patch( std::string model, std::string custom_device_mode, uint8_t channel, PatchPrimaryKey patch_key) { - boost::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); + std::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); if (channel_name_set) { return channel_name_set->previous_patch(patch_key); } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } - boost::shared_ptr next_patch( + std::shared_ptr next_patch( std::string model, std::string custom_device_mode, uint8_t channel, PatchPrimaryKey patch_key) { - boost::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); + std::shared_ptr channel_name_set = find_channel_name_set(model, custom_device_mode, channel); if (channel_name_set) { return channel_name_set->next_patch(patch_key); } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -155,7 +155,7 @@ public: PBD::EventLoop* event_loop); private: bool load_midi_name_document(const std::string& file_path); - bool add_midi_name_document(boost::shared_ptr); + bool add_midi_name_document(std::shared_ptr); bool remove_midi_name_document(const std::string& file_path, bool emit_signal = true); void add_midnam_files_from_directory(const std::string& directory_path); diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index 574ad0c6ff..19e99cf4c6 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -60,10 +60,10 @@ class LIBARDOUR_API MidiPlaylist : public ARDOUR::Playlist public: MidiPlaylist (Session&, const XMLNode&, bool hidden = false); MidiPlaylist (Session&, std::string name, bool hidden = false); - MidiPlaylist (boost::shared_ptr other, std::string name, bool hidden = false); + MidiPlaylist (std::shared_ptr other, std::string name, bool hidden = false); /** This constructor does NOT notify others (session) */ - MidiPlaylist (boost::shared_ptr other, + MidiPlaylist (std::shared_ptr other, timepos_t const & start, timepos_t const & cnt, std::string name, @@ -76,20 +76,20 @@ public: int set_state (const XMLNode&, int version); - bool destroy_region (boost::shared_ptr); + bool destroy_region (std::shared_ptr); - void _split_region (boost::shared_ptr, timepos_t const & position, ThawList& thawlist); + void _split_region (std::shared_ptr, timepos_t const & position, ThawList& thawlist); void set_note_mode (NoteMode m) { _note_mode = m; } std::set contained_automation(); - boost::shared_ptr combine (const RegionList&, boost::shared_ptr); - void uncombine (boost::shared_ptr); + std::shared_ptr combine (const RegionList&, std::shared_ptr); + void uncombine (std::shared_ptr); protected: - void remove_dependents (boost::shared_ptr region); - void region_going_away (boost::weak_ptr region); + void remove_dependents (std::shared_ptr region); + void region_going_away (std::weak_ptr region); private: void dump () const; diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index 695c91f5b0..d3e3e88f3b 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -64,7 +64,7 @@ class LIBARDOUR_API MidiPort : public Port { typedef boost::function MidiFilter; void set_inbound_filter (MidiFilter); int add_shadow_port (std::string const &, MidiFilter); - boost::shared_ptr shadow_port() const { return _shadow_port; } + std::shared_ptr shadow_port() const { return _shadow_port; } void read_and_parse_entire_midi_buffer_with_no_speed_adjustment (pframes_t nframes, MIDI::Parser& parser, samplepos_t now); @@ -78,7 +78,7 @@ private: bool _resolve_required; bool _input_active; MidiFilter _inbound_midi_filter; - boost::shared_ptr _shadow_port; + std::shared_ptr _shadow_port; MidiFilter _shadow_midi_filter; MIDI::Parser* _trace_parser; bool _data_fetched_for_cycle; diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 4c64ac147c..05e2ebc54a 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -59,10 +59,10 @@ class LIBARDOUR_API MidiRegion : public Region public: ~MidiRegion(); - boost::shared_ptr clone (std::string path = std::string()) const; - boost::shared_ptr clone (boost::shared_ptr, ThawList* tl = 0) const; + std::shared_ptr clone (std::string path = std::string()) const; + std::shared_ptr clone (std::shared_ptr, ThawList* tl = 0) const; - boost::shared_ptr midi_source (uint32_t n=0) const; + std::shared_ptr midi_source (uint32_t n=0) const; timecnt_t read_at (Evoral::EventSink& dst, timepos_t const & position, @@ -82,29 +82,29 @@ class LIBARDOUR_API MidiRegion : public Region uint32_t chan_n = 0, NoteMode mode = Sustained) const; - void merge (boost::shared_ptr); + void merge (std::shared_ptr); XMLNode& state () const; int set_state (const XMLNode&, int version); - int separate_by_channel (std::vector< boost::shared_ptr >&) const; + int separate_by_channel (std::vector< std::shared_ptr >&) const; /* automation */ - boost::shared_ptr control(const Evoral::Parameter& id, bool create=false); + std::shared_ptr control(const Evoral::Parameter& id, bool create=false); - virtual boost::shared_ptr control(const Evoral::Parameter& id) const; + virtual std::shared_ptr control(const Evoral::Parameter& id) const; /* export */ bool do_export (std::string const& path) const; - boost::shared_ptr model(); - boost::shared_ptr model() const; + std::shared_ptr model(); + std::shared_ptr model() const; void fix_negative_start (); - void clobber_sources (boost::shared_ptr source); + void clobber_sources (std::shared_ptr source); int render (Evoral::EventSink& dst, uint32_t chan_n, @@ -128,8 +128,8 @@ class LIBARDOUR_API MidiRegion : public Region friend class RegionFactory; MidiRegion (const SourceList&); - MidiRegion (boost::shared_ptr); - MidiRegion (boost::shared_ptr, timecnt_t const & offset); + MidiRegion (std::shared_ptr); + MidiRegion (std::shared_ptr, timecnt_t const & offset); timecnt_t _read_at (const SourceList&, Evoral::EventSink& dst, timepos_t const & position, diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h index 9689cbcf1b..ce30ce1f9e 100644 --- a/libs/ardour/ardour/midi_scene_changer.h +++ b/libs/ardour/ardour/midi_scene_changer.h @@ -36,8 +36,8 @@ class MIDISceneChanger : public SceneChanger ~MIDISceneChanger (); void run (samplepos_t start, samplepos_t end); - void set_input_port (boost::shared_ptr); - void set_output_port (boost::shared_ptr); + void set_input_port (std::shared_ptr); + void set_output_port (std::shared_ptr); uint8_t bank_at (samplepos_t, uint8_t channel); uint8_t program_at (samplepos_t, uint8_t channel); @@ -54,10 +54,10 @@ class MIDISceneChanger : public SceneChanger PBD::Signal0 MIDIOutputActivity; private: - typedef std::multimap > Scenes; + typedef std::multimap > Scenes; - boost::shared_ptr input_port; - boost::shared_ptr output_port; + std::shared_ptr input_port; + std::shared_ptr output_port; Glib::Threads::RWLock scene_lock; Scenes scenes; bool _recording; @@ -70,8 +70,8 @@ class MIDISceneChanger : public SceneChanger void gather (const Locations::LocationList&); bool recording () const; void jump_to (int bank, int program); - void rt_deliver (MidiBuffer&, samplepos_t, boost::shared_ptr); - void non_rt_deliver (boost::shared_ptr); + void rt_deliver (MidiBuffer&, samplepos_t, std::shared_ptr); + void non_rt_deliver (std::shared_ptr); void bank_change_input (MIDI::Parser&, unsigned short, int channel); void program_change_input (MIDI::Parser&, MIDI::byte, int channel); diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 3a0b948a90..2631094473 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -68,7 +68,7 @@ class LIBARDOUR_API MidiSource : virtual public Source * @return zero on success, non-zero if the write failed for any reason. */ int write_to (const ReaderLock& lock, - boost::shared_ptr newsrc, + std::shared_ptr newsrc, Temporal::Beats begin = Temporal::Beats(), Temporal::Beats end = std::numeric_limits::max()); @@ -82,7 +82,7 @@ class LIBARDOUR_API MidiSource : virtual public Source * @return zero on success, non-zero if the write failed for any reason. */ int export_write_to (const ReaderLock& lock, - boost::shared_ptr newsrc, + std::shared_ptr newsrc, Temporal::Beats begin, Temporal::Beats end); @@ -182,18 +182,18 @@ class LIBARDOUR_API MidiSource : virtual public Source void set_note_mode(const WriterLock& lock, NoteMode mode); - boost::shared_ptr model() { return _model; } - void set_model(const WriterLock& lock, boost::shared_ptr); + std::shared_ptr model() { return _model; } + void set_model(const WriterLock& lock, std::shared_ptr); void drop_model(const WriterLock& lock); AutomationList::InterpolationStyle interpolation_of (Evoral::Parameter const&) const; void set_interpolation_of (Evoral::Parameter const&, AutomationList::InterpolationStyle); - void copy_interpolation_from (boost::shared_ptr); + void copy_interpolation_from (std::shared_ptr); void copy_interpolation_from (MidiSource *); AutoState automation_state_of (Evoral::Parameter const&) const; void set_automation_state_of (Evoral::Parameter const&, AutoState); - void copy_automation_state_from (boost::shared_ptr); + void copy_automation_state_from (std::shared_ptr); void copy_automation_state_from (MidiSource *); /** Emitted when a different MidiModel is set */ @@ -226,7 +226,7 @@ class LIBARDOUR_API MidiSource : virtual public Source timepos_t const & position, timecnt_t const & cnt) = 0; - boost::shared_ptr _model; + std::shared_ptr _model; bool _writing; /** The total duration of the current capture. */ diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h index e1d603375b..6a765417ab 100644 --- a/libs/ardour/ardour/midi_stretch.h +++ b/libs/ardour/ardour/midi_stretch.h @@ -30,7 +30,7 @@ class LIBARDOUR_API MidiStretch : public Filter { MidiStretch (ARDOUR::Session&, const TimeFXRequest&); ~MidiStretch (); - int run (boost::shared_ptr, Progress* progress = 0); + int run (std::shared_ptr, Progress* progress = 0); private: const TimeFXRequest& _request; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 77205fb9a3..6f67a3a2b8 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -52,19 +52,19 @@ public: void freeze_me (InterThreadInfo&); void unfreeze (); - bool bounceable (boost::shared_ptr, bool) const { return false; } - boost::shared_ptr bounce (InterThreadInfo&, std::string const&); - boost::shared_ptr bounce_range (samplepos_t start, + bool bounceable (std::shared_ptr, bool) const { return false; } + std::shared_ptr bounce (InterThreadInfo&, std::string const&); + std::shared_ptr bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& iti, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, std::string const& name); int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t end_sample, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, @@ -78,7 +78,7 @@ public: /** A control that will send "immediate" events to a MIDI track when twiddled */ struct MidiControl : public AutomationControl { MidiControl(MidiTrack* route, const Evoral::Parameter& param, - boost::shared_ptr al = boost::shared_ptr()) + std::shared_ptr al = std::shared_ptr()) : AutomationControl (route->session(), param, ParameterDescriptor(param), al) , _route (route) {} @@ -105,7 +105,7 @@ public: PBD::Signal1 StepEditStatusChange; - boost::shared_ptr write_source (uint32_t n = 0); + std::shared_ptr write_source (uint32_t n = 0); /* Configure capture/playback channels (see MidiChannelFilter). */ void set_capture_channel_mode (ChannelMode mode, uint16_t mask); @@ -123,10 +123,10 @@ public: virtual void filter_input (BufferSet& bufs); - boost::shared_ptr midi_playlist (); + std::shared_ptr midi_playlist (); - PBD::Signal1 > DataRecorded; - boost::shared_ptr get_gui_feed_buffer () const; + PBD::Signal1 > DataRecorded; + std::shared_ptr get_gui_feed_buffer () const; MonitorState monitoring_state () const; MonitorState get_input_monitoring_state (bool recording, bool talkback) const; @@ -142,7 +142,7 @@ public: bool restore_pgm_on_load () const; void realtime_handle_transport_stopped (); - void region_edited (boost::shared_ptr); + void region_edited (std::shared_ptr); protected: @@ -175,7 +175,7 @@ private: void track_input_active (IOChange, void*); void map_input_active (bool); - void data_recorded (boost::weak_ptr src); + void data_recorded (std::weak_ptr src); /** Update automation controls to reflect any changes in buffers. */ void update_controls (BufferSet const& bufs); diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 1a487bd187..7b19277e83 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -60,7 +60,7 @@ class LIBARDOUR_API MidiControlUI : public AbstractUI private: ARDOUR::Session& _session; - bool midi_input_handler (Glib::IOCondition, boost::weak_ptr); + bool midi_input_handler (Glib::IOCondition, std::weak_ptr); void reset_ports (); void clear_ports (); diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h index e10958e270..0b433522df 100644 --- a/libs/ardour/ardour/midiport_manager.h +++ b/libs/ardour/ardour/midiport_manager.h @@ -54,45 +54,45 @@ public: * callback. */ - boost::shared_ptr mmc_input_port () const + std::shared_ptr mmc_input_port () const { - return boost::dynamic_pointer_cast (_mmc_in); + return std::dynamic_pointer_cast (_mmc_in); } - boost::shared_ptr mmc_output_port () const + std::shared_ptr mmc_output_port () const { - return boost::dynamic_pointer_cast (_mmc_out); + return std::dynamic_pointer_cast (_mmc_out); } - boost::shared_ptr scene_input_port () const + std::shared_ptr scene_input_port () const { - return boost::dynamic_pointer_cast (_scene_in); + return std::dynamic_pointer_cast (_scene_in); } - boost::shared_ptr scene_output_port () const + std::shared_ptr scene_output_port () const { - return boost::dynamic_pointer_cast (_scene_out); + return std::dynamic_pointer_cast (_scene_out); } /* Ports used to send synchronization. These have their output handled inside the * process callback. */ - boost::shared_ptr mtc_output_port () const + std::shared_ptr mtc_output_port () const { return _mtc_output_port; } - boost::shared_ptr midi_clock_output_port () const + std::shared_ptr midi_clock_output_port () const { return _midi_clock_output_port; } /* Port for arbitrary incoming MIDI that will control triggers */ - boost::shared_ptr trigger_input_port () const + std::shared_ptr trigger_input_port () const { return _trigger_input_port; } /* Virtual MIDI keyboard output */ - boost::shared_ptr vkbd_output_port () const; + std::shared_ptr vkbd_output_port () const; void set_midi_port_states (const XMLNodeList&); std::list get_midi_port_states () const; @@ -101,16 +101,16 @@ public: protected: /* asynchronously handled ports: ARDOUR::AsyncMIDIPort */ - boost::shared_ptr _mmc_in; - boost::shared_ptr _mmc_out; - boost::shared_ptr _scene_in; - boost::shared_ptr _scene_out; - boost::shared_ptr _vkbd_out; + std::shared_ptr _mmc_in; + std::shared_ptr _mmc_out; + std::shared_ptr _scene_in; + std::shared_ptr _scene_out; + std::shared_ptr _vkbd_out; /* synchronously handled ports: ARDOUR::MidiPort */ - boost::shared_ptr _mtc_output_port; - boost::shared_ptr _midi_clock_output_port; - boost::shared_ptr _trigger_input_port; + std::shared_ptr _mtc_output_port; + std::shared_ptr _midi_clock_output_port; + std::shared_ptr _trigger_input_port; void create_ports (); }; diff --git a/libs/ardour/ardour/mixer_scene.h b/libs/ardour/ardour/mixer_scene.h index 5ea48106a9..8a6d866dbc 100644 --- a/libs/ardour/ardour/mixer_scene.h +++ b/libs/ardour/ardour/mixer_scene.h @@ -56,7 +56,7 @@ public: private: typedef std::map ControllableValueMap; - bool recurse_to_master (boost::shared_ptr, std::set &, AutomationTypeSet const&) const; + bool recurse_to_master (std::shared_ptr, std::set &, AutomationTypeSet const&) const; ControllableValueMap _ctrl_map; std::string _name; diff --git a/libs/ardour/ardour/monitor_port.h b/libs/ardour/ardour/monitor_port.h index 51269c5828..f353ea0017 100644 --- a/libs/ardour/ardour/monitor_port.h +++ b/libs/ardour/ardour/monitor_port.h @@ -66,10 +66,10 @@ private: bool remove; }; - void collect (boost::shared_ptr, Sample*, pframes_t, std::string const&); + void collect (std::shared_ptr, Sample*, pframes_t, std::string const&); void finalize (pframes_t); - typedef std::map > MonitorPorts; + typedef std::map > MonitorPorts; SerializedRCUManager _monitor_ports; AudioBuffer* _buffer; diff --git a/libs/ardour/ardour/monitor_processor.h b/libs/ardour/ardour/monitor_processor.h index c6092bff0e..c85b557f6e 100644 --- a/libs/ardour/ardour/monitor_processor.h +++ b/libs/ardour/ardour/monitor_processor.h @@ -158,22 +158,22 @@ public: PBD::Signal0 Changed; - boost::shared_ptr channel_cut_control (uint32_t) const; - boost::shared_ptr channel_dim_control (uint32_t) const; - boost::shared_ptr channel_polarity_control (uint32_t) const; - boost::shared_ptr channel_solo_control (uint32_t) const; + std::shared_ptr channel_cut_control (uint32_t) const; + std::shared_ptr channel_dim_control (uint32_t) const; + std::shared_ptr channel_polarity_control (uint32_t) const; + std::shared_ptr channel_solo_control (uint32_t) const; - boost::shared_ptr dim_control () const { return _dim_all_control; } - boost::shared_ptr cut_control () const { return _cut_all_control; } - boost::shared_ptr mono_control () const { return _mono_control; } - boost::shared_ptr dim_level_control () const { return _dim_level_control; } - boost::shared_ptr solo_boost_control () const { return _solo_boost_level_control; } + std::shared_ptr dim_control () const { return _dim_all_control; } + std::shared_ptr cut_control () const { return _cut_all_control; } + std::shared_ptr mono_control () const { return _mono_control; } + std::shared_ptr dim_level_control () const { return _dim_level_control; } + std::shared_ptr solo_boost_control () const { return _solo_boost_level_control; } private: struct ChannelRecord { gain_t current_gain; - /* pointers - created first, but managed by boost::shared_ptr<> */ + /* pointers - created first, but managed by std::shared_ptr<> */ MPControl* cut_ptr; MPControl* dim_ptr; @@ -182,10 +182,10 @@ private: /* shared ptr access and lifetime management, for external users */ - boost::shared_ptr cut_control; - boost::shared_ptr dim_control; - boost::shared_ptr polarity_control; - boost::shared_ptr soloed_control; + std::shared_ptr cut_control; + std::shared_ptr dim_control; + std::shared_ptr polarity_control; + std::shared_ptr soloed_control; /* typed controllables for internal use */ @@ -204,7 +204,7 @@ private: bool _monitor_active; - /* pointers - created first, but managed by boost::shared_ptr<> */ + /* pointers - created first, but managed by std::shared_ptr<> */ MPControl* _dim_all_ptr; MPControl* _cut_all_ptr; @@ -214,11 +214,11 @@ private: /* shared ptr access and lifetime management, for external users */ - boost::shared_ptr _dim_all_control; - boost::shared_ptr _cut_all_control; - boost::shared_ptr _mono_control; - boost::shared_ptr _dim_level_control; - boost::shared_ptr _solo_boost_level_control; + std::shared_ptr _dim_all_control; + std::shared_ptr _cut_all_control; + std::shared_ptr _mono_control; + std::shared_ptr _dim_level_control; + std::shared_ptr _solo_boost_level_control; /* typed controllables for internal use */ diff --git a/libs/ardour/ardour/mute_control.h b/libs/ardour/ardour/mute_control.h index 37950f08e3..1cd6aad90f 100644 --- a/libs/ardour/ardour/mute_control.h +++ b/libs/ardour/ardour/mute_control.h @@ -71,11 +71,11 @@ public: void automation_run (samplepos_t start, pframes_t nframes); protected: - bool handle_master_change (boost::shared_ptr); + bool handle_master_change (std::shared_ptr); void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override); - void pre_remove_master (boost::shared_ptr); - void post_add_master (boost::shared_ptr); + void pre_remove_master (std::shared_ptr); + void post_add_master (std::shared_ptr); private: Muteable& _muteable; diff --git a/libs/ardour/ardour/muteable.h b/libs/ardour/ardour/muteable.h index ff071cc76d..cb2290d268 100644 --- a/libs/ardour/ardour/muteable.h +++ b/libs/ardour/ardour/muteable.h @@ -37,14 +37,14 @@ public: virtual void act_on_mute () {} virtual bool muted_by_others_soloing () const = 0; - boost::shared_ptr mute_master() const { + std::shared_ptr mute_master() const { return _mute_master; } PBD::Signal0 mute_points_changed; protected: - boost::shared_ptr _mute_master; + std::shared_ptr _mute_master; }; } /* namespace */ diff --git a/libs/ardour/ardour/pan_controllable.h b/libs/ardour/ardour/pan_controllable.h index 75f4ee7736..4b8c244920 100644 --- a/libs/ardour/ardour/pan_controllable.h +++ b/libs/ardour/ardour/pan_controllable.h @@ -40,7 +40,7 @@ class LIBARDOUR_API PanControllable : public AutomationControl : AutomationControl (s, param, ParameterDescriptor(param), - boost::shared_ptr(new AutomationList(param, td)), + std::shared_ptr(new AutomationList(param, td)), name) , owner (o) {} diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h index ee85e0f900..ecae0c3746 100644 --- a/libs/ardour/ardour/pannable.h +++ b/libs/ardour/ardour/pannable.h @@ -41,14 +41,14 @@ public: Pannable (Session& s, Temporal::TimeDomain); ~Pannable (); - boost::shared_ptr pan_azimuth_control; - boost::shared_ptr pan_elevation_control; - boost::shared_ptr pan_width_control; - boost::shared_ptr pan_frontback_control; - boost::shared_ptr pan_lfe_control; + std::shared_ptr pan_azimuth_control; + std::shared_ptr pan_elevation_control; + std::shared_ptr pan_width_control; + std::shared_ptr pan_frontback_control; + std::shared_ptr pan_lfe_control; - boost::shared_ptr panner() const { return _panner.lock(); } - void set_panner(boost::shared_ptr); + std::shared_ptr panner() const { return _panner.lock(); } + void set_panner(std::shared_ptr); const std::set& what_can_be_automated() const; @@ -79,7 +79,7 @@ public: protected: virtual XMLNode& state () const; - boost::weak_ptr _panner; + std::weak_ptr _panner; AutoState _auto_state; bool _has_state; uint32_t _responding_to_control_auto_state_change; diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index fe75192cc7..ec323e8a2d 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -61,10 +61,10 @@ class Speakers; class LIBARDOUR_API Panner : public PBD::Stateful, public PBD::ScopedConnectionList { public: - Panner (boost::shared_ptr); + Panner (std::shared_ptr); ~Panner (); - virtual boost::shared_ptr get_speakers() const { return boost::shared_ptr(); } + virtual std::shared_ptr get_speakers() const { return std::shared_ptr(); } virtual ChanCount in() const = 0; virtual ChanCount out() const = 0; @@ -130,7 +130,7 @@ public: int set_state (const XMLNode&, int version); XMLNode& get_state () const; - boost::shared_ptr pannable() const { return _pannable; } + std::shared_ptr pannable() const { return _pannable; } virtual void freeze (); virtual void thaw (); @@ -139,7 +139,7 @@ public: return _can_automate_list; } - virtual std::string value_as_string (boost::shared_ptr) const = 0; + virtual std::string value_as_string (std::shared_ptr) const = 0; protected: virtual void distribute_one (AudioBuffer&, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which) = 0; @@ -147,7 +147,7 @@ protected: samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) = 0; - boost::shared_ptr _pannable; + std::shared_ptr _pannable; std::set _can_automate_list; int32_t _frozen; @@ -163,7 +163,7 @@ struct LIBARDOUR_API PanPluginDescriptor { int32_t in; int32_t out; uint32_t priority; - ARDOUR::Panner* (*factory)(boost::shared_ptr, boost::shared_ptr); + ARDOUR::Panner* (*factory)(std::shared_ptr, std::shared_ptr); }; } diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h index 4b3df43ee6..c7e67df5fa 100644 --- a/libs/ardour/ardour/panner_shell.h +++ b/libs/ardour/ardour/panner_shell.h @@ -51,7 +51,7 @@ class Pannable; class LIBARDOUR_API PannerShell : public SessionObject { public: - PannerShell (std::string name, Session&, boost::shared_ptr, Temporal::TimeDomain, bool is_send = false); + PannerShell (std::string name, Session&, std::shared_ptr, Temporal::TimeDomain, bool is_send = false); virtual ~PannerShell (); std::string describe_parameter (Evoral::Parameter param); @@ -68,9 +68,9 @@ public: PBD::Signal0 PannableChanged; /* Pannable changed -- l*/ PBD::Signal0 Changed; /* panner and/or outputs count and/or bypass state changed */ - boost::shared_ptr panner() const { return _panner; } - boost::shared_ptr pannable() const { return _panlinked ? _pannable_route : _pannable_internal; } - boost::shared_ptr unlinked_pannable () const { return _pannable_internal; } + std::shared_ptr panner() const { return _panner; } + std::shared_ptr pannable() const { return _panlinked ? _pannable_route : _pannable_internal; } + std::shared_ptr unlinked_pannable () const { return _pannable_internal; } bool bypassed () const; void set_bypassed (bool); @@ -91,10 +91,10 @@ public: void distribute_no_automation (BufferSet& src, BufferSet& dest, pframes_t nframes, gain_t gain_coeff); bool set_user_selected_panner_uri (std::string const uri); - boost::shared_ptr _panner; + std::shared_ptr _panner; - boost::shared_ptr _pannable_internal; - boost::shared_ptr _pannable_route; + std::shared_ptr _pannable_internal; + std::shared_ptr _pannable_route; bool _is_send; bool _panlinked; bool _bypassed; diff --git a/libs/ardour/ardour/parameter_descriptor.h b/libs/ardour/ardour/parameter_descriptor.h index 234a29b0c6..92389ca621 100644 --- a/libs/ardour/ardour/parameter_descriptor.h +++ b/libs/ardour/ardour/parameter_descriptor.h @@ -108,7 +108,7 @@ struct LIBARDOUR_API ParameterDescriptor : public Evoral::ParameterDescriptor std::string label; std::string print_fmt; ///< format string for pretty printing - boost::shared_ptr scale_points; + std::shared_ptr scale_points; uint32_t key; ///< for properties Variant::Type datatype; ///< for properties AutomationType type; diff --git a/libs/ardour/ardour/pitch.h b/libs/ardour/ardour/pitch.h index 383f7226df..21823c76f5 100644 --- a/libs/ardour/ardour/pitch.h +++ b/libs/ardour/ardour/pitch.h @@ -54,7 +54,7 @@ class LIBARDOUR_API Pitch : public Filter { Pitch (ARDOUR::Session&, TimeFXRequest&); ~Pitch () {} - int run (boost::shared_ptr, Progress *); + int run (std::shared_ptr, Progress *); private: TimeFXRequest& tsr; diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 102c8dbd2c..b164e12d90 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -68,14 +68,14 @@ namespace Properties { LIBARDOUR_API extern PBD::PropertyDescriptor regions; } -class LIBARDOUR_API RegionListProperty : public PBD::SequenceProperty > > +class LIBARDOUR_API RegionListProperty : public PBD::SequenceProperty > > { public: RegionListProperty (Playlist&); RegionListProperty* clone () const; - void get_content_as_xml (boost::shared_ptr, XMLNode&) const; - boost::shared_ptr get_content_from_xml (XMLNode const&) const; + void get_content_as_xml (std::shared_ptr, XMLNode&) const; + std::shared_ptr get_content_from_xml (XMLNode const&) const; private: RegionListProperty* create () const; @@ -88,15 +88,15 @@ private: Playlist& _playlist; }; -class LIBARDOUR_API Playlist : public SessionObject, public boost::enable_shared_from_this +class LIBARDOUR_API Playlist : public SessionObject, public std::enable_shared_from_this { public: static void make_property_quarks (); Playlist (Session&, const XMLNode&, DataType type, bool hidden = false); Playlist (Session&, std::string name, DataType type, bool hidden = false); - Playlist (boost::shared_ptr, std::string name, bool hidden = false); - Playlist (boost::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); + Playlist (std::shared_ptr, std::string name, bool hidden = false); + Playlist (std::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); virtual ~Playlist (); @@ -106,7 +106,7 @@ public: void rdiff_and_add_command (Session*); - boost::shared_ptr region_by_id (const PBD::ID&) const; + std::shared_ptr region_by_id (const PBD::ID&) const; uint32_t max_source_level () const; @@ -170,32 +170,32 @@ public: /* Editing operations */ - void add_region (boost::shared_ptr, timepos_t const & position, float times = 1, bool auto_partition = false); - void remove_region (boost::shared_ptr); - void get_equivalent_regions (boost::shared_ptr, std::vector >&); + void add_region (std::shared_ptr, timepos_t const & position, float times = 1, bool auto_partition = false); + void remove_region (std::shared_ptr); + void get_equivalent_regions (std::shared_ptr, std::vector >&); - void get_region_list_equivalent_regions (boost::shared_ptr, std::vector >&); - void get_source_equivalent_regions (boost::shared_ptr, std::vector >&); - void replace_region (boost::shared_ptr old, boost::shared_ptr newr, timepos_t const & pos); - void split_region (boost::shared_ptr, timepos_t const & position); + void get_region_list_equivalent_regions (std::shared_ptr, std::vector >&); + void get_source_equivalent_regions (std::shared_ptr, std::vector >&); + void replace_region (std::shared_ptr old, std::shared_ptr newr, timepos_t const & pos); + void split_region (std::shared_ptr, timepos_t const & position); void split (timepos_t const & at); void shift (timepos_t const & at, timecnt_t const & distance, bool move_intersected, bool ignore_music_glue); void partition (timepos_t const & start, timepos_t const & end, bool cut = false); - void duplicate (boost::shared_ptr, timepos_t & position, float times); - void duplicate (boost::shared_ptr, timepos_t & position, timecnt_t const & gap, float times); - void duplicate_until (boost::shared_ptr, timepos_t & position, timecnt_t const & gap, timepos_t const & end); + void duplicate (std::shared_ptr, timepos_t & position, float times); + void duplicate (std::shared_ptr, timepos_t & position, timecnt_t const & gap, float times); + void duplicate_until (std::shared_ptr, timepos_t & position, timecnt_t const & gap, timepos_t const & end); void duplicate_range (TimelineRange&, float times); void duplicate_ranges (std::list&, float times); void nudge_after (timepos_t const & start, timecnt_t const & distance, bool forwards); - virtual boost::shared_ptr combine (const RegionList&, boost::shared_ptr); - virtual void uncombine (boost::shared_ptr); + virtual std::shared_ptr combine (const RegionList&, std::shared_ptr); + virtual void uncombine (std::shared_ptr); void fade_range (std::list&); void remove_gaps (timecnt_t const & gap_threshold, timecnt_t const & leave_gap, boost::function gap_callback); - void shuffle (boost::shared_ptr, int dir); + void shuffle (std::shared_ptr, int dir); void ripple (timepos_t const & at, timecnt_t const & distance, RegionList *exclude); - void ripple (timepos_t const & at, timecnt_t const & distance, boost::shared_ptr exclude) { + void ripple (timepos_t const & at, timecnt_t const & distance, std::shared_ptr exclude) { RegionList el; if (exclude) { el.push_back (exclude); @@ -205,46 +205,46 @@ public: void update_after_tempo_map_change (); - boost::shared_ptr cut (std::list&, bool result_is_hidden = true); - boost::shared_ptr copy (std::list&, bool result_is_hidden = true); - int paste (boost::shared_ptr, timepos_t const & position, float times); + std::shared_ptr cut (std::list&, bool result_is_hidden = true); + std::shared_ptr copy (std::list&, bool result_is_hidden = true); + int paste (std::shared_ptr, timepos_t const & position, float times); const RegionListProperty& region_list_property () const { return regions; } - boost::shared_ptr region_list (); + std::shared_ptr region_list (); - boost::shared_ptr regions_at (timepos_t const & sample); + std::shared_ptr regions_at (timepos_t const & sample); uint32_t count_regions_at (timepos_t const &) const; /** @param start Range start. * @param end Range end. * @return regions which have some part within this range. */ - boost::shared_ptr regions_touched (timepos_t const & start, timepos_t const & end); - boost::shared_ptr regions_with_start_within (Temporal::TimeRange); - boost::shared_ptr regions_with_end_within (Temporal::TimeRange); - boost::shared_ptr audible_regions_at (timepos_t const &); - uint32_t region_use_count (boost::shared_ptr) const; - boost::shared_ptr find_region (const PBD::ID&) const; - boost::shared_ptr top_region_at (timepos_t const &); - boost::shared_ptr top_unmuted_region_at (timepos_t const &); - boost::shared_ptr find_next_region (timepos_t const &, RegionPoint point, int dir); + std::shared_ptr regions_touched (timepos_t const & start, timepos_t const & end); + std::shared_ptr regions_with_start_within (Temporal::TimeRange); + std::shared_ptr regions_with_end_within (Temporal::TimeRange); + std::shared_ptr audible_regions_at (timepos_t const &); + uint32_t region_use_count (std::shared_ptr) const; + std::shared_ptr find_region (const PBD::ID&) const; + std::shared_ptr top_region_at (timepos_t const &); + std::shared_ptr top_unmuted_region_at (timepos_t const &); + std::shared_ptr find_next_region (timepos_t const &, RegionPoint point, int dir); timepos_t find_next_region_boundary (timepos_t const &, int dir); - bool region_is_shuffle_constrained (boost::shared_ptr); + bool region_is_shuffle_constrained (std::shared_ptr); bool has_region_at (timepos_t const &) const; - bool region_is_audible_at (boost::shared_ptr, timepos_t const&); + bool region_is_audible_at (std::shared_ptr, timepos_t const&); timepos_t find_prev_region_start (timepos_t const & sample); - bool uses_source (boost::shared_ptr src, bool shallow = false) const; - void deep_sources (std::set >&) const; + bool uses_source (std::shared_ptr src, bool shallow = false) const; + void deep_sources (std::set >&) const; samplepos_t find_next_transient (timepos_t const & position, int dir); - void foreach_region (boost::function)>); + void foreach_region (boost::function)>); XMLNode& get_state () const; virtual int set_state (const XMLNode&, int version); @@ -252,8 +252,8 @@ public: PBD::Signal1 InUse; PBD::Signal0 ContentsChanged; - PBD::Signal1 > RegionAdded; - PBD::Signal1 > RegionRemoved; + PBD::Signal1 > RegionAdded; + PBD::Signal1 > RegionRemoved; PBD::Signal0 NameChanged; PBD::Signal0 LayeringChanged; @@ -270,17 +270,17 @@ public: void freeze (); void thaw (bool from_undo = false); - void raise_region (boost::shared_ptr); - void lower_region (boost::shared_ptr); - void raise_region_to_top (boost::shared_ptr); - void lower_region_to_bottom (boost::shared_ptr); + void raise_region (std::shared_ptr); + void lower_region (std::shared_ptr); + void raise_region_to_top (std::shared_ptr); + void lower_region_to_bottom (std::shared_ptr); void set_orig_track_id (const PBD::ID& did); const PBD::ID& get_orig_track_id () const { return _orig_track_id; } /* destructive editing */ - virtual bool destroy_region (boost::shared_ptr) = 0; + virtual bool destroy_region (std::shared_ptr) = 0; void sync_all_regions_with_regions (); @@ -290,15 +290,15 @@ public: void drop_regions (); - virtual boost::shared_ptr find_crossfade (const PBD::ID&) const + virtual std::shared_ptr find_crossfade (const PBD::ID&) const { - return boost::shared_ptr (); + return std::shared_ptr (); } timepos_t find_next_top_layer_position (timepos_t const &) const; uint32_t combine_ops() const { return _combine_ops; } - void set_layer (boost::shared_ptr, double); + void set_layer (std::shared_ptr, double); void set_capture_insertion_in_progress (bool yn); @@ -344,15 +344,15 @@ protected: }; RegionListProperty regions; /* the current list of regions in the playlist */ - std::set > all_regions; /* all regions ever added to this playlist */ + std::set > all_regions; /* all regions ever added to this playlist */ PBD::ScopedConnectionList region_state_changed_connections; PBD::ScopedConnectionList region_drop_references_connections; DataType _type; uint32_t _sort_id; mutable GATOMIC_QUAL gint block_notifications; mutable GATOMIC_QUAL gint ignore_state_changes; - std::set > pending_adds; - std::set > pending_removes; + std::set > pending_adds; + std::set > pending_removes; RegionList pending_bounds; bool pending_contents_change; bool pending_layering; @@ -402,66 +402,66 @@ protected: void _set_sort_id (); - boost::shared_ptr regions_touched_locked (timepos_t const & start, timepos_t const & end); + std::shared_ptr regions_touched_locked (timepos_t const & start, timepos_t const & end); - void notify_region_removed (boost::shared_ptr); - void notify_region_added (boost::shared_ptr); + void notify_region_removed (std::shared_ptr); + void notify_region_added (std::shared_ptr); void notify_layering_changed (); void notify_contents_changed (); void notify_state_changed (const PBD::PropertyChange&); - void notify_region_moved (boost::shared_ptr); - void notify_region_start_trimmed (boost::shared_ptr); - void notify_region_end_trimmed (boost::shared_ptr); + void notify_region_moved (std::shared_ptr); + void notify_region_start_trimmed (std::shared_ptr); + void notify_region_end_trimmed (std::shared_ptr); void mark_session_dirty (); - void region_changed_proxy (const PBD::PropertyChange&, boost::weak_ptr); - virtual bool region_changed (const PBD::PropertyChange&, boost::shared_ptr); + void region_changed_proxy (const PBD::PropertyChange&, std::weak_ptr); + virtual bool region_changed (const PBD::PropertyChange&, std::shared_ptr); - void region_bounds_changed (const PBD::PropertyChange&, boost::shared_ptr); - void region_deleted (boost::shared_ptr); + void region_bounds_changed (const PBD::PropertyChange&, std::shared_ptr); + void region_deleted (std::shared_ptr); void sort_regions (); void ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude); void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist, bool notify = true); - virtual void remove_dependents (boost::shared_ptr /*region*/) {} - virtual void region_going_away (boost::weak_ptr /*region*/) {} + virtual void remove_dependents (std::shared_ptr /*region*/) {} + virtual void region_going_away (std::weak_ptr /*region*/) {} virtual XMLNode& state (bool) const; - bool add_region_internal (boost::shared_ptr, timepos_t const & position, ThawList& thawlist); + bool add_region_internal (std::shared_ptr, timepos_t const & position, ThawList& thawlist); - int remove_region_internal (boost::shared_ptr, ThawList& thawlist); + int remove_region_internal (std::shared_ptr, ThawList& thawlist); void copy_regions (RegionList&) const; void partition_internal (timepos_t const & start, timepos_t const & end, bool cutting, ThawList& thawlist); std::pair _get_extent() const; - boost::shared_ptr cut_copy (boost::shared_ptr (Playlist::*pmf)(timepos_t const &, timecnt_t const &, bool), + std::shared_ptr cut_copy (std::shared_ptr (Playlist::*pmf)(timepos_t const &, timecnt_t const &, bool), std::list& ranges, bool result_is_hidden); - boost::shared_ptr cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden); - boost::shared_ptr copy (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden); + std::shared_ptr cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden); + std::shared_ptr copy (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden); void relayer (); void begin_undo (); void end_undo (); - virtual void _split_region (boost::shared_ptr, timepos_t const & position, ThawList& thawlist); + virtual void _split_region (std::shared_ptr, timepos_t const & position, ThawList& thawlist); - typedef std::pair, boost::shared_ptr > TwoRegions; + typedef std::pair, std::shared_ptr > TwoRegions; /* this is called before we create a new compound region */ - virtual void pre_combine (std::vector >&) {} + virtual void pre_combine (std::vector >&) {} /* this is called before we create a new compound region */ - virtual void post_combine (std::vector >&, boost::shared_ptr) {} + virtual void post_combine (std::vector >&, std::shared_ptr) {} /* this is called before we remove a compound region and replace it * with its constituent regions */ - virtual void pre_uncombine (std::vector >&, boost::shared_ptr) {} + virtual void pre_uncombine (std::vector >&, std::shared_ptr) {} private: friend class RegionReadLock; @@ -473,7 +473,7 @@ private: void freeze_locked (); void setup_layering_indices (RegionList const &); void coalesce_and_check_crossfades (std::list); - boost::shared_ptr find_regions_at (timepos_t const &); + std::shared_ptr find_regions_at (timepos_t const &); mutable boost::optional > _cached_extent; timepos_t _end_space; //this is used when we are pasting a range with extra space at the end diff --git a/libs/ardour/ardour/playlist_factory.h b/libs/ardour/ardour/playlist_factory.h index c9a015cdf2..c369fc9581 100644 --- a/libs/ardour/ardour/playlist_factory.h +++ b/libs/ardour/ardour/playlist_factory.h @@ -32,12 +32,12 @@ class Session; class LIBARDOUR_API PlaylistFactory { public: - static PBD::Signal2, bool> PlaylistCreated; + static PBD::Signal2, bool> PlaylistCreated; - static boost::shared_ptr create (Session&, const XMLNode&, bool hidden = false, bool unused = false); - static boost::shared_ptr create (DataType type, Session&, std::string name, bool hidden = false); - static boost::shared_ptr create (boost::shared_ptr, std::string name, bool hidden = false); - static boost::shared_ptr create (boost::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); + static std::shared_ptr create (Session&, const XMLNode&, bool hidden = false, bool unused = false); + static std::shared_ptr create (DataType type, Session&, std::string name, bool hidden = false); + static std::shared_ptr create (std::shared_ptr, std::string name, bool hidden = false); + static std::shared_ptr create (std::shared_ptr, timepos_t const & start, timepos_t const & cnt, std::string name, bool hidden = false); }; } diff --git a/libs/ardour/ardour/playlist_source.h b/libs/ardour/ardour/playlist_source.h index 5ef48c2b89..f426c84a0e 100644 --- a/libs/ardour/ardour/playlist_source.h +++ b/libs/ardour/ardour/playlist_source.h @@ -34,20 +34,20 @@ public: virtual ~PlaylistSource (); int set_state (const XMLNode&, int version); - boost::shared_ptr playlist() const { return _playlist; } + std::shared_ptr playlist() const { return _playlist; } const PBD::ID& original() const { return _original; } const PBD::ID& owner() const { return _owner; } void set_owner (PBD::ID const & id); protected: - boost::shared_ptr _playlist; + std::shared_ptr _playlist; PBD::ID _original; PBD::ID _owner; timepos_t _playlist_offset; timepos_t _playlist_length; - PlaylistSource (Session&, const PBD::ID&, const std::string& name, boost::shared_ptr, DataType, + PlaylistSource (Session&, const PBD::ID&, const std::string& name, std::shared_ptr, DataType, timepos_t const & begin, timepos_t const & len, Source::Flag flags); PlaylistSource (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/plug_insert_base.h b/libs/ardour/ardour/plug_insert_base.h index af3e8dbae7..229cdfb7d0 100644 --- a/libs/ardour/ardour/plug_insert_base.h +++ b/libs/ardour/ardour/plug_insert_base.h @@ -40,7 +40,7 @@ public: virtual ~PlugInsertBase () {} virtual uint32_t get_count () const = 0; - virtual boost::shared_ptr plugin (uint32_t num = 0) const = 0; + virtual std::shared_ptr plugin (uint32_t num = 0) const = 0; virtual PluginType type () const = 0; enum UIElements : std::uint8_t { @@ -56,7 +56,7 @@ public: virtual bool write_immediate_event (Evoral::EventType event_type, size_t size, const uint8_t* buf) = 0; virtual bool load_preset (Plugin::PresetRecord) = 0; - virtual boost::shared_ptr control_output (uint32_t) const = 0; + virtual std::shared_ptr control_output (uint32_t) const = 0; virtual bool can_reset_all_parameters () = 0; virtual bool reset_parameters_to_default () = 0; @@ -67,7 +67,7 @@ public: protected: bool parse_plugin_type (XMLNode const&, PluginType&, std::string&) const; - boost::shared_ptr find_and_load_plugin (Session&, XMLNode const&, PluginType&, std::string const&, bool& any_vst); + std::shared_ptr find_and_load_plugin (Session&, XMLNode const&, PluginType&, std::string const&, bool& any_vst); void set_control_ids (const XMLNode&, int version); void preset_load_set_value (uint32_t, float); diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 77b38dc9dc..3269136a32 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -58,8 +58,8 @@ class PluginInfo; class AutomationControl; class SessionObject; -typedef boost::shared_ptr PluginPtr; -typedef boost::shared_ptr PluginInfoPtr; +typedef std::shared_ptr PluginPtr; +typedef std::shared_ptr PluginInfoPtr; typedef std::list PluginInfoList; typedef std::set PluginOutputConfiguration; @@ -157,11 +157,11 @@ public: virtual IOPortDescription describe_io_port (DataType dt, bool input, uint32_t id) const; virtual PluginOutputConfiguration possible_output () const; - virtual void set_automation_control (uint32_t /*port_index*/, boost::shared_ptr) {} + virtual void set_automation_control (uint32_t /*port_index*/, std::shared_ptr) {} - virtual boost::shared_ptr get_scale_points (uint32_t /*port_index*/) const + virtual std::shared_ptr get_scale_points (uint32_t /*port_index*/) const { - return boost::shared_ptr (); + return std::shared_ptr (); } samplecnt_t signal_latency () const @@ -189,8 +189,8 @@ public: void realtime_locate (bool); void monitoring_changed (); - virtual void add_slave (boost::shared_ptr, bool realtime) {} - virtual void remove_slave (boost::shared_ptr) {} + virtual void add_slave (std::shared_ptr, bool realtime) {} + virtual void remove_slave (std::shared_ptr) {} typedef struct { unsigned char* data; @@ -453,7 +453,7 @@ struct PluginPreset { } }; -typedef boost::shared_ptr PluginPresetPtr; +typedef std::shared_ptr PluginPresetPtr; typedef std::list PluginPresetList; PluginPtr diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index f3f3f3625c..6ea81094d0 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -56,15 +56,15 @@ class Plugin; /** Plugin inserts: send data through a plugin */ -class LIBARDOUR_API PluginInsert : public Processor, public PlugInsertBase, public boost::enable_shared_from_this +class LIBARDOUR_API PluginInsert : public Processor, public PlugInsertBase, public std::enable_shared_from_this { public: - PluginInsert (Session&, Temporal::TimeDomain td, boost::shared_ptr = boost::shared_ptr()); + PluginInsert (Session&, Temporal::TimeDomain td, std::shared_ptr = std::shared_ptr()); ~PluginInsert (); void drop_references (); - boost::weak_ptr weak_ptr () { + std::weak_ptr weak_ptr () { return shared_from_this(); } @@ -178,7 +178,7 @@ public: bool add_sidechain (uint32_t n_audio = 1, uint32_t n_midi = 0); bool del_sidechain (); void update_sidechain_name (); - boost::shared_ptr sidechain () const { return _sidechain; } + std::shared_ptr sidechain () const { return _sidechain; } // end C++ class slavery! uint32_t get_count () const { return _plugins.size(); } @@ -214,7 +214,7 @@ public: PluginControl (PluginInsert* p, const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr list=boost::shared_ptr()); + std::shared_ptr list=std::shared_ptr()); double get_value (void) const; void catch_up_with_external_value (double val); @@ -232,7 +232,7 @@ public: PluginPropertyControl (PluginInsert* p, const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr list=boost::shared_ptr()); + std::shared_ptr list=std::shared_ptr()); double get_value (void) const; XMLNode& get_state() const; @@ -244,7 +244,7 @@ public: Variant _value; }; - boost::shared_ptr plugin(uint32_t num=0) const { + std::shared_ptr plugin(uint32_t num=0) const { if (num < _plugins.size()) { return _plugins[num]; } else { @@ -258,22 +258,22 @@ public: return _sidechain ? true : false; } - boost::shared_ptr sidechain_input () const { + std::shared_ptr sidechain_input () const { if (_sidechain) { return _sidechain->input (); } - return boost::shared_ptr (); + return std::shared_ptr (); } PluginType type () const; - boost::shared_ptr control_output (uint32_t) const; + std::shared_ptr control_output (uint32_t) const; std::string describe_parameter (Evoral::Parameter param); samplecnt_t signal_latency () const; - boost::shared_ptr get_impulse_analysis_plugin(); + std::shared_ptr get_impulse_analysis_plugin(); void collect_signal_for_analysis (samplecnt_t nframes); @@ -335,15 +335,15 @@ private: float default_parameter_value (const Evoral::Parameter& param); - typedef std::vector > Plugins; + typedef std::vector > Plugins; Plugins _plugins; - boost::shared_ptr _sidechain; + std::shared_ptr _sidechain; uint32_t _sc_playback_latency; uint32_t _sc_capture_latency; uint32_t _plugin_signal_latency; - boost::weak_ptr _impulseAnalysisPlugin; + std::weak_ptr _impulseAnalysisPlugin; samplecnt_t _signal_analysis_collect_nsamples; samplecnt_t _signal_analysis_collect_nsamples_max; @@ -428,9 +428,9 @@ private: bool check_inplace (); void mapping_changed (); - boost::shared_ptr plugin_factory (boost::shared_ptr); - void add_plugin (boost::shared_ptr); - void plugin_removed (boost::weak_ptr); + std::shared_ptr plugin_factory (std::shared_ptr); + void add_plugin (std::shared_ptr); + void plugin_removed (std::weak_ptr); void add_sidechain_from_xml (const XMLNode& node, int version); @@ -442,7 +442,7 @@ private: uint32_t _bypass_port; bool _inverted_bypass_enable; - typedef std::map >CtrlOutMap; + typedef std::map >CtrlOutMap; CtrlOutMap _control_outputs; PBD::TimingStats _timing_stats; diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index b0544886b0..3f6b250b68 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -105,7 +105,7 @@ public: static uint32_t cache_version (); bool cache_valid () const; - void scan_log (std::vector >&) const; + void scan_log (std::vector >&) const; void clear_stale_log (); bool whitelist (ARDOUR::PluginType, std::string const&, bool force); @@ -185,7 +185,7 @@ public: PBD::Signal3 PluginTagChanged; //PluginType t, string id, string tag private: - typedef boost::shared_ptr PSLEPtr; + typedef std::shared_ptr PSLEPtr; struct PSLEPtrSort { bool operator() (PSLEPtr const& a, PSLEPtr const& b) const { diff --git a/libs/ardour/ardour/polarity_processor.h b/libs/ardour/ardour/polarity_processor.h index 4012824e87..110b1aad4b 100644 --- a/libs/ardour/ardour/polarity_processor.h +++ b/libs/ardour/ardour/polarity_processor.h @@ -29,14 +29,14 @@ class PhaseControl; class LIBARDOUR_API PolarityProcessor : public Processor { public: - PolarityProcessor (Session&, boost::shared_ptr); + PolarityProcessor (Session&, std::shared_ptr); bool display_to_user() const { return false; } void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required); bool configure_io (ChanCount in, ChanCount out); bool can_support_io_configuration (const ChanCount& in, ChanCount& out); - boost::shared_ptr phase_control() { + std::shared_ptr phase_control() { return _control; } @@ -44,7 +44,7 @@ protected: XMLNode& state () const; private: - boost::shared_ptr _control; + std::shared_ptr _control; std::vector _current_gain; }; diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 07fbe9f16e..c0e38ce580 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -142,7 +142,7 @@ public: PBD::Signal1 MonitorInputChanged; - PBD::Signal3,boost::shared_ptr, bool > ConnectedOrDisconnected; + PBD::Signal3,std::shared_ptr, bool > ConnectedOrDisconnected; static PBD::Signal0 PortDrop; static PBD::Signal0 PortSignalDrop; @@ -209,7 +209,7 @@ private: static uint32_t _resampler_quality; // 8 <= q <= 96 static uint32_t _resampler_latency; // = _resampler_quality - 1 - void port_connected_or_disconnected (boost::weak_ptr, boost::weak_ptr, bool); + void port_connected_or_disconnected (std::weak_ptr, std::weak_ptr, bool); void signal_drop (); void session_global_drop (); void drop (); diff --git a/libs/ardour/ardour/port_engine.h b/libs/ardour/ardour/port_engine.h index 386de7b746..859158d0ca 100644 --- a/libs/ardour/ardour/port_engine.h +++ b/libs/ardour/ardour/port_engine.h @@ -105,7 +105,7 @@ public: * * We use this to declare return values and members of structures. */ - typedef boost::shared_ptr PortPtr; + typedef std::shared_ptr PortPtr; /* We use this to declare arguments to methods/functions, in order to * avoid copying shared_ptr every time (a practice we use in diff --git a/libs/ardour/ardour/port_engine_shared.h b/libs/ardour/ardour/port_engine_shared.h index 5107c2a247..1ffe7a5e15 100644 --- a/libs/ardour/ardour/port_engine_shared.h +++ b/libs/ardour/ardour/port_engine_shared.h @@ -41,8 +41,8 @@ class PortManager; class BackendPort; -typedef boost::shared_ptr BackendPortPtr; -typedef boost::shared_ptr const & BackendPortHandle; +typedef std::shared_ptr BackendPortPtr; +typedef std::shared_ptr const & BackendPortHandle; class LIBARDOUR_API BackendPort : public ProtoPort { @@ -228,12 +228,12 @@ protected: SerializedRCUManager _portregistry; bool valid_port (BackendPortHandle port) const { - boost::shared_ptr p = _portregistry.reader (); + std::shared_ptr p = _portregistry.reader (); return p->find (port) != p->end (); } BackendPortPtr find_port (const std::string& port_name) const { - boost::shared_ptr p = _portmap.reader (); + std::shared_ptr p = _portmap.reader (); PortMap::const_iterator it = p->find (port_name); if (it == p->end ()) { return BackendPortPtr(); diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index 375c4a04d9..f627dbf3e1 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -51,7 +51,7 @@ class Pannable; class LIBARDOUR_API PortInsert : public IOProcessor { public: - PortInsert (Session&, boost::shared_ptr, boost::shared_ptr mm); + PortInsert (Session&, std::shared_ptr, std::shared_ptr mm); ~PortInsert (); int set_state (const XMLNode&, int version); @@ -86,31 +86,31 @@ public: static std::string name_and_id_new_insert (Session&, uint32_t&); - boost::shared_ptr send_polarity_control () const { + std::shared_ptr send_polarity_control () const { return _out->polarity_control (); } - boost::shared_ptr send_gain_control () const { + std::shared_ptr send_gain_control () const { return _out->gain_control (); } - boost::shared_ptr send_amp() const { + std::shared_ptr send_amp() const { return _out->amp (); } - boost::shared_ptr return_amp() const { + std::shared_ptr return_amp() const { return _amp; } - boost::shared_ptr return_gain_control () const { + std::shared_ptr return_gain_control () const { return _gain_control; } - boost::shared_ptr send_meter() const { + std::shared_ptr send_meter() const { return _send_meter; } - boost::shared_ptr return_meter() const { + std::shared_ptr return_meter() const { return _return_meter; } @@ -131,11 +131,11 @@ private: void io_changed (IOChange change, void*); void latency_changed (); - boost::shared_ptr _out; - boost::shared_ptr _amp; - boost::shared_ptr _gain_control; - boost::shared_ptr _send_meter; - boost::shared_ptr _return_meter; + std::shared_ptr _out; + std::shared_ptr _amp; + std::shared_ptr _gain_control; + std::shared_ptr _send_meter; + std::shared_ptr _return_meter; bool _metering; uint32_t _io_latency; uint32_t _signal_latency; diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index b29a42cd40..ce67f7bf94 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -88,13 +88,13 @@ public: } }; - typedef std::map, SortByPortName> Ports; - typedef std::list > PortList; + typedef std::map, SortByPortName> Ports; + typedef std::list > PortList; - typedef boost::shared_ptr AudioPortScope; - typedef boost::shared_ptr MIDIPortMonitor; - typedef boost::shared_ptr AudioPortMeter; - typedef boost::shared_ptr MIDIPortMeter; + typedef std::shared_ptr AudioPortScope; + typedef std::shared_ptr MIDIPortMonitor; + typedef std::shared_ptr AudioPortMeter; + typedef std::shared_ptr MIDIPortMeter; struct AudioInputPort { AudioInputPort (samplecnt_t); @@ -136,15 +136,15 @@ public: /* Port registration */ - boost::shared_ptr register_input_port (DataType, const std::string& portname, bool async = false, PortFlags extra_flags = PortFlags (0)); - boost::shared_ptr register_output_port (DataType, const std::string& portname, bool async = false, PortFlags extra_flags = PortFlags (0)); - int unregister_port (boost::shared_ptr); + std::shared_ptr register_input_port (DataType, const std::string& portname, bool async = false, PortFlags extra_flags = PortFlags (0)); + std::shared_ptr register_output_port (DataType, const std::string& portname, bool async = false, PortFlags extra_flags = PortFlags (0)); + int unregister_port (std::shared_ptr); /* Port connectivity */ int connect (const std::string& source, const std::string& destination); int disconnect (const std::string& source, const std::string& destination); - int disconnect (boost::shared_ptr); + int disconnect (std::shared_ptr); int disconnect (std::string const&); int reestablish_ports (); int reconnect_ports (); @@ -155,7 +155,7 @@ public: /* Naming */ - boost::shared_ptr get_port_by_name (const std::string&); + std::shared_ptr get_port_by_name (const std::string&); void port_renamed (const std::string&, const std::string&); std::string make_port_name_relative (const std::string& name) const; std::string make_port_name_non_relative (const std::string& name) const; @@ -260,7 +260,7 @@ public: * The std::string parameters are the (long) port names. * The bool parameter is true if ports were connected, or false for disconnected. */ - PBD::Signal5, std::string, boost::weak_ptr, std::string, bool> PortConnectedOrDisconnected; + PBD::Signal5, std::string, std::weak_ptr, std::string, bool> PortConnectedOrDisconnected; PBD::Signal3, bool> PhysInputChanged; @@ -275,18 +275,18 @@ public: } protected: - boost::shared_ptr _backend; + std::shared_ptr _backend; SerializedRCUManager _ports; bool _port_remove_in_progress; PBD::RingBuffer _port_deletions_pending; - boost::shared_ptr register_port (DataType type, const std::string& portname, bool input, bool async = false, PortFlags extra_flags = PortFlags (0)); + std::shared_ptr register_port (DataType type, const std::string& portname, bool input, bool async = false, PortFlags extra_flags = PortFlags (0)); void port_registration_failure (const std::string& portname); /** List of ports to be used between \ref cycle_start() and \ref cycle_end() */ - boost::shared_ptr _cycle_ports; + std::shared_ptr _cycle_ports; void silence (pframes_t nframes, Session* s = 0); void silence_outputs (pframes_t nframes); @@ -324,7 +324,7 @@ private: MonitorPort _monitor_port; struct PortID { - PortID (boost::shared_ptr, DataType, bool, std::string const&); + PortID (std::shared_ptr, DataType, bool, std::string const&); PortID (XMLNode const&, bool old_midi_format = false); std::string backend; diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h index 5fec919800..6ec32cce44 100644 --- a/libs/ardour/ardour/port_set.h +++ b/libs/ardour/ardour/port_set.h @@ -48,25 +48,25 @@ public: size_t num_ports() const; size_t num_ports(DataType type) const { return _ports[type].size(); } - void add (boost::shared_ptr port); - bool remove (boost::shared_ptr port); + void add (std::shared_ptr port); + bool remove (std::shared_ptr port); /** nth port * @param index port index */ - boost::shared_ptr port(size_t index) const; + std::shared_ptr port(size_t index) const; /** nth port of type @a t, or nth port if t = NIL * @param t data type * @param index port index */ - boost::shared_ptr port(DataType t, size_t index) const; + std::shared_ptr port(DataType t, size_t index) const; - boost::shared_ptr nth_audio_port(size_t n) const; + std::shared_ptr nth_audio_port(size_t n) const; - boost::shared_ptr nth_midi_port(size_t n) const; + std::shared_ptr nth_midi_port(size_t n) const; - bool contains (boost::shared_ptr port) const; + bool contains (std::shared_ptr port) const; /** Remove all ports from the PortSet. Ports are not deregistered with * the engine, it's the caller's responsibility to not leak here! @@ -80,8 +80,8 @@ public: template class iterator_base { public: - boost::shared_ptr

operator*() { return _set.port(_type, _index); } - boost::shared_ptr

operator->() { return _set.port(_type, _index); } + std::shared_ptr

operator*() { return _set.port(_type, _index); } + std::shared_ptr

operator->() { return _set.port(_type, _index); } iterator_base& operator++() { ++_index; return *this; } // yes, prefix only bool operator==(const iterator_base& other) { return (_index == other._index); } bool operator!=(const iterator_base& other) { return (_index != other._index); } @@ -120,8 +120,8 @@ public: class audio_iterator { public: - boost::shared_ptr operator*() { return _set.nth_audio_port(_index); } - boost::shared_ptr operator->() { return _set.nth_audio_port(_index); } + std::shared_ptr operator*() { return _set.nth_audio_port(_index); } + std::shared_ptr operator->() { return _set.nth_audio_port(_index); } audio_iterator& operator++() { ++_index; return *this; } // yes, prefix only bool operator==(const audio_iterator& other) { return (_index == other._index); } bool operator!=(const audio_iterator& other) { return (_index != other._index); } @@ -139,7 +139,7 @@ public: audio_iterator audio_end() { return audio_iterator(*this, _count.n_audio()); } private: - typedef std::vector > PortVec; + typedef std::vector > PortVec; // Vector of vectors, indexed by DataType::to_index() std::vector _ports; diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h index 272ed51807..e5546e16eb 100644 --- a/libs/ardour/ardour/quantize.h +++ b/libs/ardour/ardour/quantize.h @@ -33,7 +33,7 @@ public: float strength, float swing, Temporal::Beats const & threshold); ~Quantize (); - Command* operator() (boost::shared_ptr, + Command* operator() (std::shared_ptr, Temporal::Beats position, std::vector::Notes>&); std::string name() const { return std::string ("quantize"); } diff --git a/libs/ardour/ardour/rb_effect.h b/libs/ardour/ardour/rb_effect.h index c4a25d4b2c..f4ed9ef7b0 100644 --- a/libs/ardour/ardour/rb_effect.h +++ b/libs/ardour/ardour/rb_effect.h @@ -32,7 +32,7 @@ class LIBARDOUR_API RBEffect : public Filter { RBEffect (ARDOUR::Session&, TimeFXRequest&); ~RBEffect (); - int run (boost::shared_ptr, Progress* progress = 0); + int run (std::shared_ptr, Progress* progress = 0); private: TimeFXRequest& tsr; diff --git a/libs/ardour/ardour/readable.h b/libs/ardour/ardour/readable.h index 912aff036d..931488dcc4 100644 --- a/libs/ardour/ardour/readable.h +++ b/libs/ardour/ardour/readable.h @@ -31,7 +31,7 @@ class LIBARDOUR_API AudioReadable { public: virtual ~AudioReadable() {} - static std::vector > + static std::vector > load (Session&, std::string const&); virtual samplecnt_t read (Sample*, samplepos_t pos, samplecnt_t cnt, int channel) const = 0; diff --git a/libs/ardour/ardour/readonly_control.h b/libs/ardour/ardour/readonly_control.h index f5151232c6..0e130938af 100644 --- a/libs/ardour/ardour/readonly_control.h +++ b/libs/ardour/ardour/readonly_control.h @@ -33,14 +33,14 @@ class Plugin; class LIBARDOUR_API ReadOnlyControl : public PBD::Destructible { public: - ReadOnlyControl (boost::shared_ptr, const ParameterDescriptor&, uint32_t pnum); + ReadOnlyControl (std::shared_ptr, const ParameterDescriptor&, uint32_t pnum); double get_parameter () const; std::string describe_parameter (); const ParameterDescriptor& desc() const { return _desc; } private: - boost::weak_ptr _plugin; + std::weak_ptr _plugin; const ParameterDescriptor _desc; uint32_t _parameter_num; }; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 8b376015dc..b0d463c1b6 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -89,16 +89,16 @@ enum LIBARDOUR_API RegionEditState { class LIBARDOUR_API Region : public SessionObject - , public boost::enable_shared_from_this + , public std::enable_shared_from_this , public Trimmable , public Movable { public: - typedef std::vector > SourceList; + typedef std::vector > SourceList; static void make_property_quarks (); - static PBD::Signal2, const PBD::PropertyChange&> RegionsPropertyChanged; + static PBD::Signal2, const PBD::PropertyChange&> RegionsPropertyChanged; typedef std::map ChangeMap; @@ -226,15 +226,15 @@ public: return Temporal::coverage_exclusive_ends (position(), nt_last(), start, end); } - bool exact_equivalent (boost::shared_ptr) const; - bool size_equivalent (boost::shared_ptr) const; - bool overlap_equivalent (boost::shared_ptr) const; - bool enclosed_equivalent (boost::shared_ptr) const; - bool layer_and_time_equivalent (boost::shared_ptr) const; - bool source_equivalent (boost::shared_ptr) const; - bool any_source_equivalent (boost::shared_ptr) const; - bool uses_source (boost::shared_ptr, bool shallow = false) const; - void deep_sources (std::set >&) const; + bool exact_equivalent (std::shared_ptr) const; + bool size_equivalent (std::shared_ptr) const; + bool overlap_equivalent (std::shared_ptr) const; + bool enclosed_equivalent (std::shared_ptr) const; + bool layer_and_time_equivalent (std::shared_ptr) const; + bool source_equivalent (std::shared_ptr) const; + bool any_source_equivalent (std::shared_ptr) const; + bool uses_source (std::shared_ptr, bool shallow = false) const; + void deep_sources (std::set >&) const; std::string source_string () const; @@ -315,14 +315,14 @@ public: int apply (Filter &, Progress* progress = 0); - boost::shared_ptr playlist () const { return _playlist.lock(); } - virtual void set_playlist (boost::weak_ptr); + std::shared_ptr playlist () const { return _playlist.lock(); } + virtual void set_playlist (std::weak_ptr); - void source_deleted (boost::weak_ptr); + void source_deleted (std::weak_ptr); bool is_compound () const; - boost::shared_ptr source (uint32_t n=0) const { return _sources[ (n < _sources.size()) ? n : 0 ]; } + std::shared_ptr source (uint32_t n=0) const { return _sources[ (n < _sources.size()) ? n : 0 ]; } SourceList& sources_for_edit () { return _sources; } const SourceList& sources () const { return _sources; } @@ -333,10 +333,10 @@ public: /* automation */ - virtual boost::shared_ptr + virtual std::shared_ptr control (const Evoral::Parameter& id, bool create=false) = 0; - virtual boost::shared_ptr + virtual std::shared_ptr control (const Evoral::Parameter& id) const = 0; /* tags */ @@ -357,13 +357,13 @@ public: virtual bool do_export (std::string const&) const = 0; - virtual boost::shared_ptr get_parent() const; + virtual std::shared_ptr get_parent() const; uint64_t layering_index () const { return _layering_index; } void set_layering_index (uint64_t when) { _layering_index = when; } virtual bool is_dependent() const { return false; } - virtual bool depends_on (boost::shared_ptr /*other*/) const { return false; } + virtual bool depends_on (std::shared_ptr /*other*/) const { return false; } virtual void add_transient (samplepos_t) { // no transients, but its OK @@ -411,7 +411,7 @@ public: bool has_transients () const; - virtual int separate_by_channel (std::vector< boost::shared_ptr >&) const { + virtual int separate_by_channel (std::vector< std::shared_ptr >&) const { return -1; } @@ -437,13 +437,13 @@ protected: Region (const SourceList& srcs); /** Construct a region from another region */ - Region (boost::shared_ptr); + Region (std::shared_ptr); /** Construct a region from another region, at an offset within that region */ - Region (boost::shared_ptr, timecnt_t const & start_offset); + Region (std::shared_ptr, timecnt_t const & start_offset); /** Construct a region as a copy of another region, but with different sources */ - Region (boost::shared_ptr, const SourceList&); + Region (std::shared_ptr, const SourceList&); /** Constructor for derived types only */ Region (Session& s, timepos_t const & start, timecnt_t const & length, const std::string& name, DataType); @@ -484,7 +484,7 @@ protected: /** Used when timefx are applied, so we can always use the original source */ SourceList _master_sources; - boost::weak_ptr _playlist; + std::weak_ptr _playlist; void merge_features (AnalysisFeatureList&, const AnalysisFeatureList&, const sampleoffset_t) const; diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 507f0de786..16bc56b7cd 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -47,11 +47,11 @@ class ThawList; class LIBARDOUR_API RegionFactory { public: - typedef std::map > RegionMap; + typedef std::map > RegionMap; - static boost::shared_ptr wholefile_region_by_name (const std::string& name); - static boost::shared_ptr region_by_id (const PBD::ID&); - static boost::shared_ptr region_by_name (const std::string& name); + static std::shared_ptr wholefile_region_by_name (const std::string& name); + static std::shared_ptr region_by_id (const PBD::ID&); + static std::shared_ptr region_by_name (const std::string& name); static void clear_map (); static const RegionMap all_regions () { @@ -65,39 +65,39 @@ public: * itself, to permit dynamic_cast<> to be used to * infer the type of Region. */ - static PBD::Signal1 > CheckNewRegion; + static PBD::Signal1 > CheckNewRegion; /** create a "pure copy" of Region \p other */ - static boost::shared_ptr create (boost::shared_ptr other, bool announce, bool fork = false, ThawList* tl = 0); + static std::shared_ptr create (std::shared_ptr other, bool announce, bool fork = false, ThawList* tl = 0); /** Lua binding to create a "pure copy" of Region \p other */ - static boost::shared_ptr create (boost::shared_ptr other, bool announce, bool fork) + static std::shared_ptr create (std::shared_ptr other, bool announce, bool fork) { - return create (boost::shared_ptr (other), announce, fork, 0); + return create (std::shared_ptr (other), announce, fork, 0); } /** create a region from a single Source */ - static boost::shared_ptr create (boost::shared_ptr, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); + static std::shared_ptr create (std::shared_ptr, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); /** create a region from a multiple sources */ - static boost::shared_ptr create (const SourceList&, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); + static std::shared_ptr create (const SourceList&, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); /** create a copy of \p other starting at zero within \p other's sources */ - static boost::shared_ptr create (boost::shared_ptr other, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); + static std::shared_ptr create (std::shared_ptr other, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); /** create a copy of \p other starting at \p offset within \p other */ - static boost::shared_ptr create (boost::shared_ptr other, timecnt_t const & offset, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); + static std::shared_ptr create (std::shared_ptr other, timecnt_t const & offset, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); /** create a "copy" of \p other but using a different set of sources \p srcs */ - static boost::shared_ptr create (boost::shared_ptr other, const SourceList& srcs, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); + static std::shared_ptr create (std::shared_ptr other, const SourceList& srcs, const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); /** create a region with no sources, using XML state */ - static boost::shared_ptr create (Session&, XMLNode&, bool); + static std::shared_ptr create (Session&, XMLNode&, bool); /** create a region with specified sources \p srcs and XML state */ - static boost::shared_ptr create (SourceList& srcs, const XMLNode&); + static std::shared_ptr create (SourceList& srcs, const XMLNode&); - static boost::shared_ptr get_whole_region_for_source (boost::shared_ptr); + static std::shared_ptr get_whole_region_for_source (std::shared_ptr); - static void get_regions_using_source (boost::shared_ptr, std::set >&); - static void remove_regions_using_source (boost::shared_ptr); + static void get_regions_using_source (std::shared_ptr, std::set >&); + static void remove_regions_using_source (std::shared_ptr); - static void map_remove (boost::weak_ptr); + static void map_remove (std::weak_ptr); static void delete_all_regions (); static const RegionMap& regions () @@ -107,7 +107,7 @@ public: static uint32_t nregions (); - static void foreach_region (boost::function)> f) + static void foreach_region (boost::function)> f) { Glib::Threads::Mutex::Lock ls (region_map_lock); for (RegionMap::const_iterator i = region_map.begin (); i != region_map.end (); ++i) { @@ -132,29 +132,29 @@ public: * or split sufficiently. */ - typedef std::map, boost::shared_ptr > CompoundAssociations; + typedef std::map, std::shared_ptr > CompoundAssociations; static CompoundAssociations& compound_associations () { return _compound_associations; } - static void add_compound_association (boost::shared_ptr, boost::shared_ptr); + static void add_compound_association (std::shared_ptr, std::shared_ptr); /* exposed because there may be cases where regions are created with * announce=false but they still need to be in the map soon after * creation. */ - static void map_add (boost::shared_ptr); + static void map_add (std::shared_ptr); private: friend class ::RegionNamingTest; - static void region_changed (PBD::PropertyChange const&, boost::weak_ptr); - static void add_to_region_name_maps (boost::shared_ptr); - static void rename_in_region_name_maps (boost::shared_ptr); - static void update_region_name_number_map (boost::shared_ptr); + static void region_changed (PBD::PropertyChange const&, std::weak_ptr); + static void add_to_region_name_maps (std::shared_ptr); + static void rename_in_region_name_maps (std::shared_ptr); + static void update_region_name_number_map (std::shared_ptr); static void remove_from_region_name_map (std::string); static Glib::Threads::Mutex region_map_lock; diff --git a/libs/ardour/ardour/region_sorters.h b/libs/ardour/ardour/region_sorters.h index 24d3e8e007..fc777997ad 100644 --- a/libs/ardour/ardour/region_sorters.h +++ b/libs/ardour/ardour/region_sorters.h @@ -25,13 +25,13 @@ namespace ARDOUR { struct LIBARDOUR_API RegionSortByPosition { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { return a->position() < b->position(); } }; struct LIBARDOUR_API RegionSortByLayer { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { return a->layer() < b->layer(); } }; @@ -42,7 +42,7 @@ struct LIBARDOUR_API RegionSortByLayer { * stable_sort by RegionSortByLayer(); */ struct LIBARDOUR_API RegionSortByLayerAndPosition { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { return (a->layer() < b->layer() && a->position() < b->position()) || (a->layer() == b->layer() && a->position() < b->position()); diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h index 4bfba75624..110069d50e 100644 --- a/libs/ardour/ardour/resampled_source.h +++ b/libs/ardour/ardour/resampled_source.h @@ -33,7 +33,7 @@ namespace ARDOUR { class LIBARDOUR_API ResampledImportableSource : public ImportableSource { public: - ResampledImportableSource (boost::shared_ptr, samplecnt_t rate, SrcQuality); + ResampledImportableSource (std::shared_ptr, samplecnt_t rate, SrcQuality); ~ResampledImportableSource (); @@ -53,7 +53,7 @@ class LIBARDOUR_API ResampledImportableSource : public ImportableSource static const uint32_t blocksize; private: - boost::shared_ptr source; + std::shared_ptr source; float* _input; int _src_type; SRC_STATE* _src_state; diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h index 8e1cb65939..fdb8fcff24 100644 --- a/libs/ardour/ardour/return.h +++ b/libs/ardour/ardour/return.h @@ -43,9 +43,9 @@ public: void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool); - boost::shared_ptr amp() const { return _amp; } - boost::shared_ptr meter() const { return _meter; } - boost::shared_ptr gain_control() const { return _gain_control; } + std::shared_ptr amp() const { return _amp; } + std::shared_ptr meter() const { return _meter; } + std::shared_ptr gain_control() const { return _gain_control; } bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } @@ -64,9 +64,9 @@ protected: XMLNode& state() const; bool _metering; - boost::shared_ptr _gain_control; - boost::shared_ptr _amp; - boost::shared_ptr _meter; + std::shared_ptr _gain_control; + std::shared_ptr _amp; + std::shared_ptr _meter; private: /* disallow copy construction */ diff --git a/libs/ardour/ardour/reverse.h b/libs/ardour/ardour/reverse.h index 4b530e2d46..02b8753f8d 100644 --- a/libs/ardour/ardour/reverse.h +++ b/libs/ardour/ardour/reverse.h @@ -29,7 +29,7 @@ class LIBARDOUR_API Reverse : public Filter { Reverse (ARDOUR::Session&); ~Reverse (); - int run (boost::shared_ptr, Progress *); + int run (std::shared_ptr, Progress *); }; } /* namespace */ diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 1db5480261..573bc32f55 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -104,7 +104,7 @@ class LIBARDOUR_API Route : public Stripable, { public: - typedef std::list > ProcessorList; + typedef std::list > ProcessorList; Route (Session&, std::string name, PresentationInfo::Flag flags = PresentationInfo::Flag(0), DataType default_type = DataType::AUDIO); virtual ~Route(); @@ -118,8 +118,8 @@ public: return _default_type; } - boost::shared_ptr input() const { return _input; } - boost::shared_ptr output() const { return _output; } + std::shared_ptr input() const { return _input; } + std::shared_ptr output() const { return _output; } IOVector all_inputs () const; IOVector all_outputs () const; @@ -137,7 +137,7 @@ public: bool set_name (const std::string& str); static void set_name_in_state (XMLNode &, const std::string &); - boost::shared_ptr monitoring_control() const { return _monitoring_control; } + std::shared_ptr monitoring_control() const { return _monitoring_control; } MonitorState monitoring_state () const; virtual MonitorState get_input_monitoring_state (bool recording, bool talkback) const { return MonitoringSilence; } @@ -211,38 +211,38 @@ public: /* Processors */ - boost::shared_ptr amp() const { return _amp; } - boost::shared_ptr trim() const { return _trim; } - boost::shared_ptr polarity() const { return _polarity; } - boost::shared_ptr peak_meter() { return _meter; } - boost::shared_ptr peak_meter() const { return _meter; } - boost::shared_ptr shared_peak_meter() const { return _meter; } - boost::shared_ptr triggerbox() const { return _triggerbox; } + std::shared_ptr amp() const { return _amp; } + std::shared_ptr trim() const { return _trim; } + std::shared_ptr polarity() const { return _polarity; } + std::shared_ptr peak_meter() { return _meter; } + std::shared_ptr peak_meter() const { return _meter; } + std::shared_ptr shared_peak_meter() const { return _meter; } + std::shared_ptr triggerbox() const { return _triggerbox; } void flush_processors (); - void foreach_processor (boost::function)> method) const { + void foreach_processor (boost::function)> method) const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - method (boost::weak_ptr (*i)); + method (std::weak_ptr (*i)); } } - boost::shared_ptr nth_processor (uint32_t n) { + std::shared_ptr nth_processor (uint32_t n) { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); ProcessorList::iterator i; for (i = _processors.begin(); i != _processors.end() && n; ++i, --n) {} if (i == _processors.end()) { - return boost::shared_ptr (); + return std::shared_ptr (); } else { return *i; } } - boost::shared_ptr processor_by_id (PBD::ID) const; + std::shared_ptr processor_by_id (PBD::ID) const; - boost::shared_ptr nth_plugin (uint32_t n) const; - boost::shared_ptr nth_send (uint32_t n) const; + std::shared_ptr nth_plugin (uint32_t n) const; + std::shared_ptr nth_send (uint32_t n) const; bool has_io_processor_named (const std::string&); ChanCount max_processor_streams () const { return processor_max_streams; } @@ -255,23 +255,23 @@ public: PatchChangeGridDialog* patch_selector_dialog () const { return _patch_selector_dialog; } void set_patch_selector_dialog (PatchChangeGridDialog* d) { _patch_selector_dialog = d; } - boost::shared_ptr automation_control_recurse (PBD::ID const & id) const; + std::shared_ptr automation_control_recurse (PBD::ID const & id) const; void automatables (PBD::ControllableSet&) const; /* special processors */ - boost::shared_ptr monitor_send() const { return _monitor_send; } + std::shared_ptr monitor_send() const { return _monitor_send; } /** the signal processorat at end of the processing chain which produces output */ - boost::shared_ptr main_outs() const { return _main_outs; } - boost::shared_ptr internal_return() const { return _intreturn; } - boost::shared_ptr monitor_control() const { return _monitor_control; } - boost::shared_ptr internal_send_for (boost::shared_ptr target) const; + std::shared_ptr main_outs() const { return _main_outs; } + std::shared_ptr internal_return() const { return _intreturn; } + std::shared_ptr monitor_control() const { return _monitor_control; } + std::shared_ptr internal_send_for (std::shared_ptr target) const; void add_internal_return (); void add_send_to_internal_return (InternalSend *); void remove_send_from_internal_return (InternalSend *); void listen_position_changed (); - boost::shared_ptr add_export_point(/* Add some argument for placement later */); + std::shared_ptr add_export_point(/* Add some argument for placement later */); /** A record of the stream configuration at some point in the processor list. * Used to return where and why an processor list configuration request failed. @@ -283,12 +283,12 @@ public: ChanCount count; ///< Input requested of processor }; - int add_processor (boost::shared_ptr, Placement placement, ProcessorStreams* err = 0, bool activation_allowed = true); - int add_processor_by_index (boost::shared_ptr, int, ProcessorStreams* err = 0, bool activation_allowed = true); - int add_processor (boost::shared_ptr, boost::shared_ptr, ProcessorStreams* err = 0, bool activation_allowed = true); - int add_processors (const ProcessorList&, boost::shared_ptr, ProcessorStreams* err = 0); - boost::shared_ptr before_processor_for_placement (Placement); - boost::shared_ptr before_processor_for_index (int); + int add_processor (std::shared_ptr, Placement placement, ProcessorStreams* err = 0, bool activation_allowed = true); + int add_processor_by_index (std::shared_ptr, int, ProcessorStreams* err = 0, bool activation_allowed = true); + int add_processor (std::shared_ptr, std::shared_ptr, ProcessorStreams* err = 0, bool activation_allowed = true); + int add_processors (const ProcessorList&, std::shared_ptr, ProcessorStreams* err = 0); + std::shared_ptr before_processor_for_placement (Placement); + std::shared_ptr before_processor_for_index (int); bool processors_reorder_needs_configure (const ProcessorList& new_order); /** remove plugin/processor * @@ -297,7 +297,7 @@ public: * @param need_process_lock if locking is required (set to true, unless called from RT context with lock) * @returns 0 on success */ - int remove_processor (boost::shared_ptr proc, ProcessorStreams* err = 0, bool need_process_lock = true); + int remove_processor (std::shared_ptr proc, ProcessorStreams* err = 0, bool need_process_lock = true); /** replace plugin/processor with another * * @param old processor to remove @@ -305,7 +305,7 @@ public: * @param err error report (index where removal vailed, channel-count why it failed) may be nil * @returns 0 on success */ - int replace_processor (boost::shared_ptr old, boost::shared_ptr sub, ProcessorStreams* err = 0); + int replace_processor (std::shared_ptr old, std::shared_ptr sub, ProcessorStreams* err = 0); int remove_processors (const ProcessorList&, ProcessorStreams* err = 0); int reorder_processors (const ProcessorList& new_order, ProcessorStreams* err = 0); void disable_processors (Placement); @@ -329,7 +329,7 @@ public: * @param proc Processor to reset * @returns true if successful */ - bool reset_plugin_insert (boost::shared_ptr proc); + bool reset_plugin_insert (std::shared_ptr proc); /** enable custom plugin-insert configuration * @param proc Processor to customize * @param count number of plugin instances to use (if zero, reset to default) @@ -337,9 +337,9 @@ public: * @param sinks input pins for variable-I/O plugins * @returns true if successful */ - bool customize_plugin_insert (boost::shared_ptr proc, uint32_t count, ChanCount outs, ChanCount sinks); - bool add_remove_sidechain (boost::shared_ptr proc, bool); - bool plugin_preset_output (boost::shared_ptr proc, ChanCount outs); + bool customize_plugin_insert (std::shared_ptr proc, uint32_t count, ChanCount outs, ChanCount sinks); + bool add_remove_sidechain (std::shared_ptr proc, bool); + bool plugin_preset_output (std::shared_ptr proc, ChanCount outs); /* enable sidechain input for a given processor * @@ -350,12 +350,12 @@ public: * @param proc the processor to add sidechain inputs to * @returns true on success */ - bool add_sidechain (boost::shared_ptr proc) { return add_remove_sidechain (proc, true); } + bool add_sidechain (std::shared_ptr proc) { return add_remove_sidechain (proc, true); } /* remove sidechain input from given processor * @param proc the processor to remove the sidechain input from * @returns true on success */ - bool remove_sidechain (boost::shared_ptr proc) { return add_remove_sidechain (proc, false); } + bool remove_sidechain (std::shared_ptr proc) { return add_remove_sidechain (proc, false); } samplecnt_t update_signal_latency (bool apply_to_delayline = false, bool* delayline_update_needed = NULL); void apply_latency_compensation (); @@ -394,10 +394,10 @@ public: }; /** ask GUI about port-count, fan-out when adding instrument */ - static PBD::Signal3, boost::shared_ptr, PluginSetupOptions > PluginSetup; + static PBD::Signal3, std::shared_ptr, PluginSetupOptions > PluginSetup; /** used to signal the GUI to fan-out (track-creation) */ - static PBD::Signal1 > FanOut; + static PBD::Signal1 > FanOut; /** the processors have changed; the parameter indicates what changed */ PBD::Signal1 processors_changed; @@ -421,14 +421,14 @@ public: void set_processor_state (const XMLNode&, int version); virtual bool set_processor_state (XMLNode const & node, int version, XMLProperty const* prop, ProcessorList& new_order, bool& must_configure); - boost::weak_ptr weakroute (); + std::weak_ptr weakroute (); int save_as_template (const std::string& path, const std::string& name, const std::string& description ); PBD::Signal1 SelectedChanged; - int add_aux_send (boost::shared_ptr, boost::shared_ptr); - int add_foldback_send (boost::shared_ptr, bool post_fader); + int add_aux_send (std::shared_ptr, std::shared_ptr); + int add_foldback_send (std::shared_ptr, bool post_fader); void remove_monitor_send (); /** @@ -436,7 +436,7 @@ public: * either its main outs or a send. This is checked by the actual * connections, rather than by what the graph is currently doing. */ - bool direct_feeds_according_to_reality (boost::shared_ptr, bool* via_send_only = 0); + bool direct_feeds_according_to_reality (std::shared_ptr, bool* via_send_only = 0); std::string graph_node_name () const { return name (); @@ -447,19 +447,19 @@ public: * either its main outs or a send, according to the graph that * is currently being processed. */ - bool direct_feeds_according_to_graph (boost::shared_ptr, bool* via_send_only = 0); + bool direct_feeds_according_to_graph (std::shared_ptr, bool* via_send_only = 0); /** * @return true if this node feeds the first argument via at least one * (arbitrarily long) signal pathway. */ - bool feeds (boost::shared_ptr); + bool feeds (std::shared_ptr); /** * @return a list of all routes that eventually may feed a signal * into this route. */ - std::set> signal_sources (bool via_sends_only = false); + std::set> signal_sources (bool via_sends_only = false); /** Follow output port connections and check if the output *port* * of any downstream routes is connected. @@ -468,13 +468,13 @@ public: /* Controls (not all directly owned by the Route) */ - boost::shared_ptr get_control (const Evoral::Parameter& param); + std::shared_ptr get_control (const Evoral::Parameter& param); - boost::shared_ptr solo_control() const { + std::shared_ptr solo_control() const { return _solo_control; } - boost::shared_ptr mute_control() const { + std::shared_ptr mute_control() const { return _mute_control; } @@ -484,11 +484,11 @@ public: bool muted_by_self () const { return _mute_control->muted_by_self(); } bool muted_by_others_soloing () const; - boost::shared_ptr solo_isolate_control() const { + std::shared_ptr solo_isolate_control() const { return _solo_isolate_control; } - boost::shared_ptr solo_safe_control() const { + std::shared_ptr solo_safe_control() const { return _solo_safe_control; } @@ -497,14 +497,14 @@ public: here. */ - boost::shared_ptr panner() const; /* may return null */ - boost::shared_ptr panner_shell() const; - boost::shared_ptr pannable() const; + std::shared_ptr panner() const; /* may return null */ + std::shared_ptr panner_shell() const; + std::shared_ptr pannable() const; - boost::shared_ptr gain_control() const; - boost::shared_ptr trim_control() const; - boost::shared_ptr volume_control() const; - boost::shared_ptr phase_control() const; + std::shared_ptr gain_control() const; + std::shared_ptr trim_control() const; + std::shared_ptr volume_control() const; + std::shared_ptr phase_control() const; void set_volume_applies_to_output (bool); @@ -519,7 +519,7 @@ public: processors later in the processing chain, but that would be a special case not covered by this utility function. */ - boost::shared_ptr the_instrument() const; + std::shared_ptr the_instrument() const; InstrumentInfo& instrument_info() { return _instrument_info; } bool instrument_fanned_out () const { return _instrument_fanned_out;} @@ -528,77 +528,78 @@ public: * Any or all of these may return NULL. */ - boost::shared_ptr pan_azimuth_control() const; - boost::shared_ptr pan_elevation_control() const; - boost::shared_ptr pan_width_control() const; - boost::shared_ptr pan_frontback_control() const; - boost::shared_ptr pan_lfe_control() const; + std::shared_ptr pan_azimuth_control() const; + std::shared_ptr pan_elevation_control() const; + std::shared_ptr pan_width_control() const; + std::shared_ptr pan_frontback_control() const; + std::shared_ptr pan_lfe_control() const; uint32_t eq_band_cnt () const; std::string eq_band_name (uint32_t) const; - boost::shared_ptr eq_enable_controllable () const; - boost::shared_ptr eq_gain_controllable (uint32_t band) const; - boost::shared_ptr eq_freq_controllable (uint32_t band) const; - boost::shared_ptr eq_q_controllable (uint32_t band) const; - boost::shared_ptr eq_shape_controllable (uint32_t band) const; - boost::shared_ptr filter_freq_controllable (bool hpf) const; - boost::shared_ptr filter_slope_controllable (bool) const; - boost::shared_ptr filter_enable_controllable (bool) const; + std::shared_ptr eq_enable_controllable () const; + std::shared_ptr eq_gain_controllable (uint32_t band) const; + std::shared_ptr eq_freq_controllable (uint32_t band) const; + std::shared_ptr eq_q_controllable (uint32_t band) const; + std::shared_ptr eq_shape_controllable (uint32_t band) const; + + std::shared_ptr filter_freq_controllable (bool hpf) const; + std::shared_ptr filter_slope_controllable (bool) const; + std::shared_ptr filter_enable_controllable (bool) const; std::string tape_mode_name (uint32_t) const; - boost::shared_ptr tape_drive_controllable () const; - boost::shared_ptr tape_drive_mode_controllable () const; - boost::shared_ptr tape_drive_mtr_controllable () const; + std::shared_ptr tape_drive_controllable () const; + std::shared_ptr tape_drive_mode_controllable () const; + std::shared_ptr tape_drive_mtr_controllable () const; - boost::shared_ptr comp_enable_controllable () const; - boost::shared_ptr comp_threshold_controllable () const; - boost::shared_ptr comp_speed_controllable () const; - boost::shared_ptr comp_mode_controllable () const; - boost::shared_ptr comp_makeup_controllable () const; - boost::shared_ptr comp_ratio_controllable () const; - boost::shared_ptr comp_attack_controllable () const; - boost::shared_ptr comp_release_controllable () const; - boost::shared_ptr comp_key_filter_freq_controllable () const; - boost::shared_ptr comp_lookahead_controllable () const; - boost::shared_ptr comp_meter_controllable () const; - boost::shared_ptr comp_redux_controllable () const; + std::shared_ptr comp_enable_controllable () const; + std::shared_ptr comp_threshold_controllable () const; + std::shared_ptr comp_speed_controllable () const; + std::shared_ptr comp_mode_controllable () const; + std::shared_ptr comp_makeup_controllable () const; + std::shared_ptr comp_ratio_controllable () const; + std::shared_ptr comp_attack_controllable () const; + std::shared_ptr comp_release_controllable () const; + std::shared_ptr comp_key_filter_freq_controllable () const; + std::shared_ptr comp_lookahead_controllable () const; + std::shared_ptr comp_meter_controllable () const; + std::shared_ptr comp_redux_controllable () const; std::string gate_mode_name (uint32_t) const; - boost::shared_ptr gate_enable_controllable () const; - boost::shared_ptr gate_mode_controllable () const; - boost::shared_ptr gate_ratio_controllable () const; - boost::shared_ptr gate_knee_controllable () const; - boost::shared_ptr gate_threshold_controllable () const; - boost::shared_ptr gate_depth_controllable () const; - boost::shared_ptr gate_hysteresis_controllable () const; - boost::shared_ptr gate_hold_controllable () const; - boost::shared_ptr gate_attack_controllable () const; - boost::shared_ptr gate_release_controllable () const; - boost::shared_ptr gate_key_listen_controllable () const; - boost::shared_ptr gate_key_filter_enable_controllable () const; - boost::shared_ptr gate_key_filter_freq_controllable () const; - boost::shared_ptr gate_lookahead_controllable () const; - boost::shared_ptr gate_meter_controllable () const; - boost::shared_ptr gate_redux_controllable () const; + std::shared_ptr gate_enable_controllable () const; + std::shared_ptr gate_mode_controllable () const; + std::shared_ptr gate_ratio_controllable () const; + std::shared_ptr gate_knee_controllable () const; + std::shared_ptr gate_threshold_controllable () const; + std::shared_ptr gate_depth_controllable () const; + std::shared_ptr gate_hysteresis_controllable () const; + std::shared_ptr gate_hold_controllable () const; + std::shared_ptr gate_attack_controllable () const; + std::shared_ptr gate_release_controllable () const; + std::shared_ptr gate_key_listen_controllable () const; + std::shared_ptr gate_key_filter_enable_controllable () const; + std::shared_ptr gate_key_filter_freq_controllable () const; + std::shared_ptr gate_lookahead_controllable () const; + std::shared_ptr gate_meter_controllable () const; + std::shared_ptr gate_redux_controllable () const; std::string comp_mode_name (uint32_t mode) const; std::string comp_speed_name (uint32_t mode) const; - boost::shared_ptr send_level_controllable (uint32_t n) const; - boost::shared_ptr send_enable_controllable (uint32_t n) const; - boost::shared_ptr send_pan_azimuth_controllable (uint32_t n) const; - boost::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const; + std::shared_ptr send_level_controllable (uint32_t n) const; + std::shared_ptr send_enable_controllable (uint32_t n) const; + std::shared_ptr send_pan_azimuth_controllable (uint32_t n) const; + std::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const; std::string send_name (uint32_t n) const; - boost::shared_ptr master_send_enable_controllable () const; + std::shared_ptr master_send_enable_controllable () const; - boost::shared_ptr master_correlation_mtr_controllable (bool) const; + std::shared_ptr master_correlation_mtr_controllable (bool) const; - boost::shared_ptr master_limiter_enable_controllable () const; - boost::shared_ptr master_limiter_mtr_controllable () const; - boost::shared_ptr master_k_mtr_controllable () const; + std::shared_ptr master_limiter_enable_controllable () const; + std::shared_ptr master_limiter_mtr_controllable () const; + std::shared_ptr master_k_mtr_controllable () const; void protect_automation (); @@ -609,7 +610,7 @@ public: */ void monitor_run (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes); - bool slaved_to (boost::shared_ptr) const; + bool slaved_to (std::shared_ptr) const; bool slaved () const; virtual void use_captured_sources (SourceList& srcs, CaptureInfos const &) {} @@ -640,13 +641,13 @@ protected: virtual void bounce_process (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, - boost::shared_ptr endpoint, bool include_endpoint, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze); - samplecnt_t bounce_get_latency (boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; - ChanCount bounce_get_output_streams (ChanCount &cc, boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; + samplecnt_t bounce_get_latency (std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; + ChanCount bounce_get_output_streams (ChanCount &cc, std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; - bool can_freeze_processor (boost::shared_ptr, bool allow_routing = false) const; + bool can_freeze_processor (std::shared_ptr, bool allow_routing = false) const; bool _active; samplecnt_t _signal_latency; @@ -655,20 +656,20 @@ protected: ProcessorList _processors; mutable Glib::Threads::RWLock _processor_lock; - boost::shared_ptr _input; - boost::shared_ptr _output; + std::shared_ptr _input; + std::shared_ptr _output; - boost::shared_ptr _main_outs; - boost::shared_ptr _monitor_send; - boost::shared_ptr _intreturn; - boost::shared_ptr _monitor_control; - boost::shared_ptr _pannable; - boost::shared_ptr _disk_reader; - boost::shared_ptr _disk_writer; + std::shared_ptr _main_outs; + std::shared_ptr _monitor_send; + std::shared_ptr _intreturn; + std::shared_ptr _monitor_control; + std::shared_ptr _pannable; + std::shared_ptr _disk_reader; + std::shared_ptr _disk_writer; #ifdef HAVE_BEATBOX - boost::shared_ptr _beatbox; + std::shared_ptr _beatbox; #endif - boost::shared_ptr _monitoring_control; + std::shared_ptr _monitoring_control; DiskIOPoint _disk_io_point; @@ -691,10 +692,10 @@ protected: bool _recordable : 1; - boost::shared_ptr _solo_control; - boost::shared_ptr _mute_control; - boost::shared_ptr _solo_isolate_control; - boost::shared_ptr _solo_safe_control; + std::shared_ptr _solo_control; + std::shared_ptr _mute_control; + std::shared_ptr _solo_isolate_control; + std::shared_ptr _solo_safe_control; std::string _comment; bool _have_internal_generator; @@ -718,24 +719,24 @@ protected: uint32_t pans_required() const; ChanCount n_process_buffers (); - boost::shared_ptr _gain_control; - boost::shared_ptr _trim_control; - boost::shared_ptr _volume_control; - boost::shared_ptr _phase_control; - boost::shared_ptr _amp; - boost::shared_ptr _trim; - boost::shared_ptr _volume; - boost::shared_ptr _meter; - boost::shared_ptr _polarity; - boost::shared_ptr _triggerbox; + std::shared_ptr _gain_control; + std::shared_ptr _trim_control; + std::shared_ptr _volume_control; + std::shared_ptr _phase_control; + std::shared_ptr _amp; + std::shared_ptr _trim; + std::shared_ptr _volume; + std::shared_ptr _meter; + std::shared_ptr _polarity; + std::shared_ptr _triggerbox; bool _volume_applies_to_output; - boost::shared_ptr _delayline; + std::shared_ptr _delayline; - bool is_internal_processor (boost::shared_ptr) const; + bool is_internal_processor (std::shared_ptr) const; - boost::shared_ptr the_instrument_unlocked() const; + std::shared_ptr the_instrument_unlocked() const; SlavableControlList slavables () const; @@ -750,8 +751,8 @@ private: void output_change_handler (IOChange, void *src); void sidechain_change_handler (IOChange, void *src); - void processor_selfdestruct (boost::weak_ptr); - std::vector > selfdestruct_sequence; + void processor_selfdestruct (std::weak_ptr); + std::vector > selfdestruct_sequence; Glib::Threads::Mutex selfdestruct_lock; bool input_port_count_changing (ChanCount); @@ -782,13 +783,13 @@ private: pframes_t latency_preroll (pframes_t nframes, samplepos_t& start_sample, samplepos_t& end_sample); void run_route (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, bool gain_automation_ok, bool run_disk_reader); - void fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr io, pframes_t nframes); + void fill_buffers_with_input (BufferSet& bufs, std::shared_ptr io, pframes_t nframes); void reset_instrument_info (); void solo_control_changed (bool self, PBD::Controllable::GroupControlDisposition); void maybe_note_meter_position (); - void set_plugin_state_dir (boost::weak_ptr, const std::string&); + void set_plugin_state_dir (std::weak_ptr, const std::string&); /** A handy class to keep processor state while we attempt a reconfiguration * that may fail. @@ -817,7 +818,7 @@ private: friend class ProcessorState; - boost::shared_ptr _capturing_processor; + std::shared_ptr _capturing_processor; int64_t _track_number; bool _strict_io; @@ -831,7 +832,7 @@ private: /** the processor that came after the meter when it was last set to a custom position, or 0. */ - boost::weak_ptr _processor_after_last_custom_meter; + std::weak_ptr _processor_after_last_custom_meter; RoutePinWindowProxy* _pinmgr_proxy; PatchChangeGridDialog* _patch_selector_dialog; diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index f1a95ccf9b..f0fa0a4acb 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -89,7 +89,7 @@ public: bool is_color () const { return _color.val(); } bool is_monitoring() const { return _monitoring.val(); } int32_t group_master_number() const { return _group_master_number.val(); } - boost::weak_ptr subgroup_bus() const { return _subgroup_bus; } + std::weak_ptr subgroup_bus() const { return _subgroup_bus; } bool empty() const {return routes->empty();} size_t size() const { return routes->size();} @@ -112,8 +112,8 @@ public: bool enabled_property (PBD::PropertyID); - int add (boost::shared_ptr); - int remove (boost::shared_ptr); + int add (std::shared_ptr); + int remove (std::shared_ptr); template void foreach_route (Function f) { @@ -128,7 +128,7 @@ public: /* fills at_set with all members of the group that are AudioTracks */ - void audio_track_group (std::set >& at_set); + void audio_track_group (std::set >& at_set); void clear () { routes->clear (); @@ -139,19 +139,19 @@ public: void make_subgroup (bool, Placement); void destroy_subgroup (); - boost::shared_ptr route_list() { return routes; } + std::shared_ptr route_list() { return routes; } /** Emitted when a route has been added to this group */ - PBD::Signal2 > RouteAdded; + PBD::Signal2 > RouteAdded; /** Emitted when a route has been removed from this group */ - PBD::Signal2 > RouteRemoved; + PBD::Signal2 > RouteRemoved; XMLNode& get_state () const; int set_state (const XMLNode&, int version); - void assign_master (boost::shared_ptr); - void unassign_master (boost::shared_ptr); + void assign_master (std::shared_ptr); + void unassign_master (std::shared_ptr); bool has_control_master() const; bool slaved () const; @@ -165,9 +165,9 @@ public: void migrate_rgba (uint32_t color) { _rgba = color; } private: - boost::shared_ptr routes; - boost::shared_ptr _subgroup_bus; - boost::weak_ptr group_master; + std::shared_ptr routes; + std::shared_ptr _subgroup_bus; + std::weak_ptr group_master; PBD::Property _relative; PBD::Property _active; @@ -182,13 +182,13 @@ private: PBD::Property _monitoring; PBD::Property _group_master_number; - boost::shared_ptr _solo_group; - boost::shared_ptr _mute_group; - boost::shared_ptr _rec_enable_group; - boost::shared_ptr _gain_group; - boost::shared_ptr _monitoring_group; + std::shared_ptr _solo_group; + std::shared_ptr _mute_group; + std::shared_ptr _rec_enable_group; + std::shared_ptr _gain_group; + std::shared_ptr _monitoring_group; - void remove_when_going_away (boost::weak_ptr); + void remove_when_going_away (std::weak_ptr); void unset_subgroup_bus (); int set_state_2X (const XMLNode&, int); diff --git a/libs/ardour/ardour/route_group_specialized.h b/libs/ardour/ardour/route_group_specialized.h index ba43d640ac..ad21a6c3f3 100644 --- a/libs/ardour/ardour/route_group_specialized.h +++ b/libs/ardour/ardour/route_group_specialized.h @@ -30,9 +30,9 @@ template void RouteGroup::apply (void (Track::*func)(T, PBD::Controllable::GroupControlDisposition), T val, PBD::Controllable::GroupControlDisposition group_override) { for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) { - boost::shared_ptr at; + std::shared_ptr at; - if ((at = boost::dynamic_pointer_cast(*i)) != 0) { + if ((at = std::dynamic_pointer_cast(*i)) != 0) { (at.get()->*func)(val, group_override); } } diff --git a/libs/ardour/ardour/rt_tasklist.h b/libs/ardour/ardour/rt_tasklist.h index 6f832e998c..a7bed1d389 100644 --- a/libs/ardour/ardour/rt_tasklist.h +++ b/libs/ardour/ardour/rt_tasklist.h @@ -32,7 +32,7 @@ class Graph; class LIBARDOUR_API RTTaskList { public: - RTTaskList (boost::shared_ptr); + RTTaskList (std::shared_ptr); /** process tasks in list in parallel, wait for them to complete */ void process (); @@ -42,7 +42,7 @@ public: private: std::vector _tasks; - boost::shared_ptr _graph; + std::shared_ptr _graph; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/scene_change.h b/libs/ardour/ardour/scene_change.h index 9ec44133f5..0cd57c5341 100644 --- a/libs/ardour/ardour/scene_change.h +++ b/libs/ardour/ardour/scene_change.h @@ -32,7 +32,7 @@ class SceneChange : public PBD::Stateful SceneChange (); virtual ~SceneChange () {}; - static boost::shared_ptr factory (const XMLNode&, int version); + static std::shared_ptr factory (const XMLNode&, int version); static std::string xml_node_name; uint32_t color() const; diff --git a/libs/ardour/ardour/selection.h b/libs/ardour/ardour/selection.h index 21fc87c9a1..e81137f7c8 100644 --- a/libs/ardour/ardour/selection.h +++ b/libs/ardour/ardour/selection.h @@ -43,30 +43,30 @@ class LIBARDOUR_API CoreSelection : public PBD::Stateful { CoreSelection (Session& s); ~CoreSelection (); - void toggle (boost::shared_ptr, boost::shared_ptr); - void add (boost::shared_ptr, boost::shared_ptr); - void remove (boost::shared_ptr, boost::shared_ptr); - void set (boost::shared_ptr, boost::shared_ptr); + void toggle (std::shared_ptr, std::shared_ptr); + void add (std::shared_ptr, std::shared_ptr); + void remove (std::shared_ptr, std::shared_ptr); + void set (std::shared_ptr, std::shared_ptr); void set (StripableList&); void select_next_stripable (bool mixer_order, bool routes_only); void select_prev_stripable (bool mixer_order, bool routes_only); - bool select_stripable_and_maybe_group (boost::shared_ptr s, bool with_group, bool routes_only, RouteGroup*); + bool select_stripable_and_maybe_group (std::shared_ptr s, bool with_group, bool routes_only, RouteGroup*); void clear_stripables(); - boost::shared_ptr first_selected_stripable () const; + std::shared_ptr first_selected_stripable () const; - bool selected (boost::shared_ptr) const; - bool selected (boost::shared_ptr) const; + bool selected (std::shared_ptr) const; + bool selected (std::shared_ptr) const; uint32_t selected() const; struct StripableAutomationControl { - boost::shared_ptr stripable; - boost::shared_ptr controllable; + std::shared_ptr stripable; + std::shared_ptr controllable; int order; - StripableAutomationControl (boost::shared_ptr s, boost::shared_ptr c, int o) + StripableAutomationControl (std::shared_ptr s, std::shared_ptr c, int o) : stripable (s), controllable (c), order (o) {} }; @@ -94,7 +94,7 @@ class LIBARDOUR_API CoreSelection : public PBD::Stateful { Session& session; struct SelectedStripable { - SelectedStripable (boost::shared_ptr, boost::shared_ptr, int); + SelectedStripable (std::shared_ptr, std::shared_ptr, int); SelectedStripable (PBD::ID const & s, PBD::ID const & c, int o) : stripable (s), controllable (c), order (o) {} @@ -112,7 +112,7 @@ class LIBARDOUR_API CoreSelection : public PBD::Stateful { typedef std::set SelectedStripables; - boost::weak_ptr _first_selected_stripable; + std::weak_ptr _first_selected_stripable; SelectedStripables _stripables; diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index eeaabf9cfd..0af592f94c 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -66,13 +66,13 @@ protected: class LIBARDOUR_API Send : public Delivery, public LatentSend { public: - Send (Session&, boost::shared_ptr pannable, boost::shared_ptr, Delivery::Role r = Delivery::Send, bool ignore_bitslot = false); + Send (Session&, std::shared_ptr pannable, std::shared_ptr, Delivery::Role r = Delivery::Send, bool ignore_bitslot = false); virtual ~Send (); bool display_to_user() const; bool is_foldback () const { return _role == Foldback; } - boost::shared_ptr meter() const { return _meter; } + std::shared_ptr meter() const { return _meter; } bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } @@ -114,9 +114,9 @@ protected: XMLNode& state () const; bool _metering; - boost::shared_ptr _meter; - boost::shared_ptr _send_delay; - boost::shared_ptr _thru_delay; + std::shared_ptr _meter; + std::shared_ptr _send_delay; + std::shared_ptr _thru_delay; private: /* disallow copy construction */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7e0fbb5999..bffc79e9b2 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -322,11 +322,11 @@ public: void refresh_disk_space (); int load_routes (const XMLNode&, int); - boost::shared_ptr get_routes() const { + std::shared_ptr get_routes() const { return routes.reader (); } - boost::shared_ptr rt_tasklist () { return _rt_tasklist; } + std::shared_ptr rt_tasklist () { return _rt_tasklist; } RouteList get_routelist (bool mixer_order = false, PresentationInfo::Flag fl = PresentationInfo::MixerRoutes) const; @@ -341,11 +341,11 @@ public: void get_stripables (StripableList&, PresentationInfo::Flag fl = PresentationInfo::MixerStripables) const; StripableList get_stripables () const; - boost::shared_ptr get_tracks() const; - boost::shared_ptr get_routes_with_internal_returns() const; - boost::shared_ptr get_routes_with_regions_at (timepos_t const &) const; + std::shared_ptr get_tracks() const; + std::shared_ptr get_routes_with_internal_returns() const; + std::shared_ptr get_routes_with_regions_at (timepos_t const &) const; - boost::shared_ptr get_nth_audio_track (uint32_t) const; + std::shared_ptr get_nth_audio_track (uint32_t) const; uint32_t nstripables (bool with_monitor = false) const; uint32_t nroutes() const { return routes.reader()->size(); } @@ -355,14 +355,14 @@ public: bool plot_process_graph (std::string const& file_name) const; - boost::shared_ptr bundles () { + std::shared_ptr bundles () { return _bundles.reader (); } void notify_presentation_info_change (PBD::PropertyChange const&); template void foreach_route (T *obj, void (T::*func)(Route&), bool sort = true); - template void foreach_route (T *obj, void (T::*func)(boost::shared_ptr), bool sort = true); + template void foreach_route (T *obj, void (T::*func)(std::shared_ptr), bool sort = true); template void foreach_route (T *obj, void (T::*func)(Route&, A), A arg, bool sort = true); template void foreach_track (void (Track::*method)(A), A arg); @@ -375,12 +375,12 @@ public: static const std::string session_name_is_legal (const std::string&); bool io_name_is_legal (const std::string&) const; - boost::shared_ptr route_by_name (std::string) const; - boost::shared_ptr route_by_id (PBD::ID) const; - boost::shared_ptr stripable_by_id (PBD::ID) const; - boost::shared_ptr get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const; - boost::shared_ptr get_remote_nth_route (PresentationInfo::order_t n) const; - boost::shared_ptr route_by_selected_count (uint32_t cnt) const; + std::shared_ptr route_by_name (std::string) const; + std::shared_ptr route_by_id (PBD::ID) const; + std::shared_ptr stripable_by_id (PBD::ID) const; + std::shared_ptr get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const; + std::shared_ptr get_remote_nth_route (PresentationInfo::order_t n) const; + std::shared_ptr route_by_selected_count (uint32_t cnt) const; void routes_using_input_from (const std::string& str, RouteList& rl); bool route_name_unique (std::string) const; @@ -454,11 +454,11 @@ public: /** Emitted when a route is added to one of our route groups. * First parameter is the RouteGroup, second is the route. */ - PBD::Signal2 > RouteAddedToRouteGroup; + PBD::Signal2 > RouteAddedToRouteGroup; /** Emitted when a route is removed from one of our route groups. * First parameter is the RouteGroup, second is the route. */ - PBD::Signal2 > RouteRemovedFromRouteGroup; + PBD::Signal2 > RouteRemovedFromRouteGroup; /** Emitted when a foldback send is created or deleted */ @@ -495,7 +495,7 @@ public: void request_transport_speed (double speed, TransportRequestSource origin = TRS_UI); void request_default_play_speed (double speed, TransportRequestSource origin = TRS_UI); void request_transport_speed_nonzero (double, TransportRequestSource origin = TRS_UI); - void request_overwrite_buffer (boost::shared_ptr, OverwriteReason); + void request_overwrite_buffer (std::shared_ptr, OverwriteReason); void adjust_playback_buffering(); void adjust_capture_buffering(); @@ -645,7 +645,7 @@ public: std::vector possible_states() const; static std::vector possible_states (std::string path); - bool export_track_state (boost::shared_ptr rl, const std::string& path); + bool export_track_state (std::shared_ptr rl, const std::string& path); /// The instant xml file is written to the session directory void add_instant_xml (XMLNode&, bool write_to_config = true); @@ -718,7 +718,7 @@ public: /* fundamental operations. duh. */ - std::list > new_audio_track ( + std::list > new_audio_track ( int input_channels, int output_channels, RouteGroup* route_group, @@ -730,9 +730,9 @@ public: bool trigger_visibility = false ); - std::list > new_midi_track ( + std::list > new_midi_track ( const ChanCount& input, const ChanCount& output, bool strict_io, - boost::shared_ptr instrument, + std::shared_ptr instrument, Plugin::PresetRecord* pset, RouteGroup* route_group, uint32_t how_many, std::string name_template, PresentationInfo::order_t, @@ -742,10 +742,10 @@ public: ); RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, std::string name_template, PresentationInfo::Flag, PresentationInfo::order_t); - RouteList new_midi_route (RouteGroup* route_group, uint32_t how_many, std::string name_template, bool strict_io, boost::shared_ptr instrument, Plugin::PresetRecord*, PresentationInfo::Flag, PresentationInfo::order_t); + RouteList new_midi_route (RouteGroup* route_group, uint32_t how_many, std::string name_template, bool strict_io, std::shared_ptr instrument, Plugin::PresetRecord*, PresentationInfo::Flag, PresentationInfo::order_t); - void remove_routes (boost::shared_ptr); - void remove_route (boost::shared_ptr); + void remove_routes (std::shared_ptr); + void remove_route (std::shared_ptr); void resort_routes (); @@ -795,7 +795,7 @@ public: static PBD::Signal1 StartTimeChanged; static PBD::Signal1 EndTimeChanged; - void request_sync_source (boost::shared_ptr); + void request_sync_source (std::shared_ptr); bool synced_to_engine() const; double engine_speed() const { return _engine_speed; } @@ -830,13 +830,13 @@ public: /* region info */ - boost::shared_ptr find_whole_file_parent (boost::shared_ptr) const; + std::shared_ptr find_whole_file_parent (std::shared_ptr) const; - boost::shared_ptr XMLRegionFactory (const XMLNode&, bool full); - boost::shared_ptr XMLAudioRegionFactory (const XMLNode&, bool full); - boost::shared_ptr XMLMidiRegionFactory (const XMLNode&, bool full); + std::shared_ptr XMLRegionFactory (const XMLNode&, bool full); + std::shared_ptr XMLAudioRegionFactory (const XMLNode&, bool full); + std::shared_ptr XMLMidiRegionFactory (const XMLNode&, bool full); - void deinterlace_midi_region ( boost::shared_ptr mr ); + void deinterlace_midi_region ( std::shared_ptr mr ); /* source management */ @@ -844,16 +844,16 @@ public: bool sample_rate_convert (ImportStatus&, std::string infile, std::string& outfile); std::string build_tmp_convert_name (std::string file); - boost::shared_ptr get_export_handler (); - boost::shared_ptr get_export_status (); + std::shared_ptr get_export_handler (); + std::shared_ptr get_export_status (); int start_audio_export (samplepos_t position, bool realtime = false, bool region_export = false); PBD::Signal1 ProcessExport; static PBD::Signal4 Exported; - void add_source (boost::shared_ptr); - void remove_source (boost::weak_ptr); + void add_source (std::shared_ptr); + void remove_source (std::weak_ptr); void cleanup_regions(); bool can_cleanup_peakfiles () const; @@ -861,16 +861,16 @@ public: int cleanup_sources (CleanupReport&); int cleanup_trash_sources (CleanupReport&); - int destroy_sources (std::list > const&); + int destroy_sources (std::list > const&); int remove_last_capture (); - void get_last_capture_sources (std::list >&); + void get_last_capture_sources (std::list >&); /** handlers should return -1 for "stop cleanup", 0 for "yes, delete this playlist", 1 for "no, don't delete this playlist". */ - static PBD::Signal1 > AskAboutPlaylistDeletion; + static PBD::Signal1 > AskAboutPlaylistDeletion; /** handlers should return 0 for "ignore the rate mismatch", !0 for "do not use this session" @@ -891,27 +891,27 @@ public: static PBD::Signal0 AfterConnect; - boost::shared_ptr create_audio_source_for_session ( + std::shared_ptr create_audio_source_for_session ( size_t, std::string const &, uint32_t); - boost::shared_ptr create_midi_source_for_session (std::string const &); - boost::shared_ptr create_midi_source_by_stealing_name (boost::shared_ptr); + std::shared_ptr create_midi_source_for_session (std::string const &); + std::shared_ptr create_midi_source_by_stealing_name (std::shared_ptr); - boost::shared_ptr source_by_id (const PBD::ID&); - boost::shared_ptr audio_source_by_path_and_channel (const std::string&, uint16_t) const; - boost::shared_ptr midi_source_by_path (const std::string&, bool need_source_lock) const; + std::shared_ptr source_by_id (const PBD::ID&); + std::shared_ptr audio_source_by_path_and_channel (const std::string&, uint16_t) const; + std::shared_ptr midi_source_by_path (const std::string&, bool need_source_lock) const; uint32_t count_sources_by_origin (const std::string&); - void add_playlist (boost::shared_ptr, bool unused = false); + void add_playlist (std::shared_ptr, bool unused = false); /* Curves and AutomationLists (TODO when they go away) */ void add_automation_list(AutomationList*); /* auditioning */ - boost::shared_ptr the_auditioner() { return auditioner; } + std::shared_ptr the_auditioner() { return auditioner; } void audition_playlist (); - void audition_region (boost::shared_ptr); + void audition_region (std::shared_ptr); void cancel_audition (); bool is_auditioning () const; @@ -929,33 +929,33 @@ public: /* I/O Plugin */ PBD::Signal0 IOPluginsChanged; - void load_io_plugin (boost::shared_ptr); - bool unload_io_plugin (boost::shared_ptr); + void load_io_plugin (std::shared_ptr); + bool unload_io_plugin (std::shared_ptr); - boost::shared_ptr nth_io_plug (uint32_t n) { - boost::shared_ptr iop (_io_plugins.reader ()); + std::shared_ptr nth_io_plug (uint32_t n) { + std::shared_ptr iop (_io_plugins.reader ()); if (n < iop->size ()) { return (*iop)[n]; } - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr io_plugs () const { + std::shared_ptr io_plugs () const { return _io_plugins.reader (); } /* flattening stuff */ - boost::shared_ptr write_one_track (Track&, samplepos_t start, samplepos_t end, - bool overwrite, std::vector >&, InterThreadInfo& wot, - boost::shared_ptr endpoint, + std::shared_ptr write_one_track (Track&, samplepos_t start, samplepos_t end, + bool overwrite, std::vector >&, InterThreadInfo& wot, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, std::string const& name); int freeze_all (InterThreadInfo&); /* session-wide solo/mute/rec-enable */ bool muted () const; - std::vector > cancel_all_mute (); + std::vector > cancel_all_mute (); bool soloing () const { return _non_soloed_outs_muted; } bool listening () const; @@ -965,17 +965,17 @@ public: bool solo_selection_active (); void solo_selection (StripableList&, bool); - void clear_all_solo_state (boost::shared_ptr); - void prepare_momentary_solo (SoloMuteRelease* smr = NULL, bool exclusive = false, boost::shared_ptr route = boost::shared_ptr ()); + void clear_all_solo_state (std::shared_ptr); + void prepare_momentary_solo (SoloMuteRelease* smr = NULL, bool exclusive = false, std::shared_ptr route = std::shared_ptr ()); static const SessionEvent::RTeventCallback rt_cleanup; /* Control-based methods */ - void set_controls (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); - void set_control (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); + void set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); + void set_control (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); - void set_exclusive_input_active (boost::shared_ptr rt, bool onoff, bool flip_others = false); + void set_exclusive_input_active (std::shared_ptr rt, bool onoff, bool flip_others = false); PBD::Signal1 SoloActive; PBD::Signal0 SoloChanged; @@ -992,20 +992,20 @@ public: void reset_monitor_section (); bool monitor_active() const { return (_monitor_out && _monitor_out->monitor_control () && _monitor_out->monitor_control ()->monitor_active()); } - boost::shared_ptr monitor_out() const { return _monitor_out; } - boost::shared_ptr master_out() const { return _master_out; } - boost::shared_ptr master_volume () const; + std::shared_ptr monitor_out() const { return _monitor_out; } + std::shared_ptr master_out() const { return _master_out; } + std::shared_ptr master_volume () const; PresentationInfo::order_t master_order_key () const { return _master_out ? _master_out->presentation_info ().order () : -1; } bool ensure_stripable_sort_order (); - void globally_add_internal_sends (boost::shared_ptr dest, Placement p, bool); - void globally_set_send_gains_from_track (boost::shared_ptr dest); - void globally_set_send_gains_to_zero (boost::shared_ptr dest); - void globally_set_send_gains_to_unity (boost::shared_ptr dest); - void add_internal_sends (boost::shared_ptr dest, Placement p, boost::shared_ptr senders); - void add_internal_send (boost::shared_ptr, int, boost::shared_ptr); - void add_internal_send (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); + void globally_add_internal_sends (std::shared_ptr dest, Placement p, bool); + void globally_set_send_gains_from_track (std::shared_ptr dest); + void globally_set_send_gains_to_zero (std::shared_ptr dest); + void globally_set_send_gains_to_unity (std::shared_ptr dest); + void add_internal_sends (std::shared_ptr dest, Placement p, std::shared_ptr senders); + void add_internal_send (std::shared_ptr, int, std::shared_ptr); + void add_internal_send (std::shared_ptr, std::shared_ptr, std::shared_ptr); static void set_disable_all_loaded_plugins (bool yn) { _disable_all_loaded_plugins = yn; @@ -1039,9 +1039,9 @@ public: /* I/O bundles */ - void add_bundle (boost::shared_ptr, bool emit_signal = true); - void remove_bundle (boost::shared_ptr); - boost::shared_ptr bundle_by_name (std::string) const; + void add_bundle (std::shared_ptr, bool emit_signal = true); + void remove_bundle (std::shared_ptr); + std::shared_ptr bundle_by_name (std::string) const; PBD::Signal0 BundleAddedOrRemoved; @@ -1095,7 +1095,7 @@ public: * @param sfd the object to diff * @returns the allocated StatefulDiffCommand (already added via add_command) */ - PBD::StatefulDiffCommand* add_stateful_diff_command (boost::shared_ptr sfd); + PBD::StatefulDiffCommand* add_stateful_diff_command (std::shared_ptr sfd); /** @return The list of operations that are currently in progress */ std::list const & current_operations () { @@ -1137,8 +1137,8 @@ public: /* clicking */ - boost::shared_ptr click_io() { return _click_io; } - boost::shared_ptr click_gain() { return _click_gain; } + std::shared_ptr click_io() { return _click_io; } + std::shared_ptr click_gain() { return _click_gain; } /* disk, buffer loads */ @@ -1200,21 +1200,21 @@ public: /* Speakers */ - boost::shared_ptr get_speakers (); + std::shared_ptr get_speakers (); /* Controllables */ - boost::shared_ptr trigger_by_id (PBD::ID) const; + std::shared_ptr trigger_by_id (PBD::ID) const; - boost::shared_ptr processor_by_id (PBD::ID) const; + std::shared_ptr processor_by_id (PBD::ID) const; - boost::shared_ptr controllable_by_id (const PBD::ID&); - boost::shared_ptr automation_control_by_id (const PBD::ID&); + std::shared_ptr controllable_by_id (const PBD::ID&); + std::shared_ptr automation_control_by_id (const PBD::ID&); - void add_controllable (boost::shared_ptr); + void add_controllable (std::shared_ptr); - boost::shared_ptr solo_cut_control() const; - boost::shared_ptr recently_touched_controllable () const; + std::shared_ptr solo_cut_control() const; + std::shared_ptr recently_touched_controllable () const; bool apply_nth_mixer_scene (size_t); bool apply_nth_mixer_scene (size_t, RouteList const&); @@ -1222,8 +1222,8 @@ public: bool nth_mixer_scene_valid (size_t) const; size_t last_touched_mixer_scene_idx () {return _last_touched_mixer_scene_idx;} - boost::shared_ptr nth_mixer_scene (size_t, bool create_if_missing = false); - std::vector> mixer_scenes () const; + std::shared_ptr nth_mixer_scene (size_t, bool create_if_missing = false); + std::vector> mixer_scenes () const; SessionConfiguration config; @@ -1259,7 +1259,7 @@ public: PostTransportLoopChanged = 0x400 }; - boost::shared_ptr playlists () const { return _playlists; } + std::shared_ptr playlists () const { return _playlists; } void send_mmc_locate (samplepos_t); void queue_full_time_code () { _send_timecode_update = true; } @@ -1317,19 +1317,19 @@ public: /* asynchronous MIDI control ports */ - boost::shared_ptr mmc_output_port () const; - boost::shared_ptr mmc_input_port () const; - boost::shared_ptr trigger_input_port () const; - boost::shared_ptr scene_input_port () const; - boost::shared_ptr scene_output_port () const; + std::shared_ptr mmc_output_port () const; + std::shared_ptr mmc_input_port () const; + std::shared_ptr trigger_input_port () const; + std::shared_ptr scene_input_port () const; + std::shared_ptr scene_output_port () const; - boost::shared_ptr vkbd_output_port () const; + std::shared_ptr vkbd_output_port () const; /* synchronous MIDI ports used for synchronization */ - boost::shared_ptr midi_clock_output_port () const; - boost::shared_ptr mtc_output_port () const; - boost::shared_ptr ltc_output_port() const { return _ltc_output_port; } + std::shared_ptr midi_clock_output_port () const; + std::shared_ptr mtc_output_port () const; + std::shared_ptr ltc_output_port() const { return _ltc_output_port; } MIDI::MachineControl& mmc() { return *_mmc; } @@ -1346,7 +1346,7 @@ public: double compute_speed_from_master (pframes_t nframes); bool transport_master_is_external() const; bool transport_master_no_external_or_using_engine() const; - boost::shared_ptr transport_master() const; + std::shared_ptr transport_master() const; void import_pt_sources (PTFFormat& ptf, ImportStatus& status); void import_pt_rest (PTFFormat& ptf); @@ -1380,7 +1380,7 @@ public: CueEvents const & cue_events() const { return _cue_events; } int num_triggerboxes () const; - boost::shared_ptr triggerbox_at (int32_t route_index) const; + std::shared_ptr triggerbox_at (int32_t route_index) const; TriggerPtr trigger_at (int32_t route_index, int32_t row_index) const; bool bang_trigger_at(int32_t route_index, int32_t row_index); bool unbang_trigger_at(int32_t route_index, int32_t row_index); @@ -1418,7 +1418,7 @@ private: static void init_name_id_counter (guint n); static unsigned int name_id_counter (); - boost::shared_ptr _playlists; + std::shared_ptr _playlists; /* stuff used in process() should be close together to maximise cache hits @@ -1555,8 +1555,8 @@ private: bool _region_export; samplepos_t _export_preroll; - boost::shared_ptr export_handler; - boost::shared_ptr export_status; + std::shared_ptr export_handler; + std::shared_ptr export_status; int pre_export (); int stop_audio_export (); @@ -1640,7 +1640,7 @@ private: SerializedRCUManager _io_plugins; - std::vector> _mixer_scenes; + std::vector> _mixer_scenes; mutable Glib::Threads::RWLock _mixer_scenes_lock; Butler* _butler; @@ -1740,13 +1740,13 @@ private: struct AutoConnectRequest { public: - AutoConnectRequest (boost::shared_ptr r, + AutoConnectRequest (std::shared_ptr r, bool ci, bool co, const ChanCount& is, const ChanCount& os, const ChanCount& io, const ChanCount& oo) - : route (boost::weak_ptr (r)) + : route (std::weak_ptr (r)) , connect_inputs (ci) , connect_outputs (co) , input_start (is) @@ -1755,7 +1755,7 @@ private: , output_offset (oo) {} - boost::weak_ptr route; + std::weak_ptr route; bool connect_inputs; bool connect_outputs; ChanCount input_start; @@ -1880,7 +1880,7 @@ private: void set_play_loop (bool yn, bool change_transport_state); void unset_play_loop (bool change_transport_state = false); - void overwrite_some_buffers (boost::shared_ptr, OverwriteReason); + void overwrite_some_buffers (std::shared_ptr, OverwriteReason); void flush_all_inserts (); int micro_locate (samplecnt_t distance); @@ -1943,21 +1943,21 @@ private: void load_and_connect_instruments (RouteList&, bool strict_io, - boost::shared_ptr instrument, + std::shared_ptr instrument, Plugin::PresetRecord* pset, ChanCount& existing_outputs ); - boost::shared_ptr XMLRouteFactory (const XMLNode&, int); - boost::shared_ptr XMLRouteFactory_2X (const XMLNode&, int); - boost::shared_ptr XMLRouteFactory_3X (const XMLNode&, int); + std::shared_ptr XMLRouteFactory (const XMLNode&, int); + std::shared_ptr XMLRouteFactory_2X (const XMLNode&, int); + std::shared_ptr XMLRouteFactory_3X (const XMLNode&, int); void route_processors_changed (RouteProcessorChange); bool find_route_name (std::string const &, uint32_t& id, std::string& name, bool); void count_existing_track_channels (ChanCount& in, ChanCount& out); - void auto_connect_route (boost::shared_ptr, bool, bool, const ChanCount&, const ChanCount&, const ChanCount& io = ChanCount(), const ChanCount& oo = ChanCount()); - void midi_output_change_handler (IOChange change, void* /*src*/, boost::weak_ptr midi_track); + void auto_connect_route (std::shared_ptr, bool, bool, const ChanCount&, const ChanCount&, const ChanCount& io = ChanCount(), const ChanCount& oo = ChanCount()); + void midi_output_change_handler (IOChange change, void* /*src*/, std::weak_ptr midi_track); /* track numbering */ @@ -1966,12 +1966,12 @@ private: /* solo/mute/notifications */ - void route_listen_changed (PBD::Controllable::GroupControlDisposition, boost::weak_ptr); + void route_listen_changed (PBD::Controllable::GroupControlDisposition, std::weak_ptr); void route_mute_changed (); - void route_solo_changed (bool self_solo_change, PBD::Controllable::GroupControlDisposition group_override, boost::weak_ptr); - void route_solo_isolated_changed (boost::weak_ptr); + void route_solo_changed (bool self_solo_change, PBD::Controllable::GroupControlDisposition group_override, std::weak_ptr); + void route_solo_isolated_changed (std::weak_ptr); - void update_route_solo_state (boost::shared_ptr r = boost::shared_ptr()); + void update_route_solo_state (std::shared_ptr r = std::shared_ptr()); void listen_position_changed (); void solo_control_mode_changed (); @@ -1983,8 +1983,8 @@ private: int load_regions (const XMLNode& node); int load_compounds (const XMLNode& node); - void route_added_to_route_group (RouteGroup *, boost::weak_ptr); - void route_removed_from_route_group (RouteGroup *, boost::weak_ptr); + void route_added_to_route_group (RouteGroup *, std::weak_ptr); + void route_removed_from_route_group (RouteGroup *, std::weak_ptr); void route_group_property_changed (RouteGroup *); /* SOURCES */ @@ -1994,19 +1994,19 @@ private: public: /* Emited when a new source is added to the session */ - PBD::Signal1< void, boost::weak_ptr > SourceAdded; - PBD::Signal1< void, boost::weak_ptr > SourceRemoved; + PBD::Signal1< void, std::weak_ptr > SourceAdded; + PBD::Signal1< void, std::weak_ptr > SourceRemoved; - typedef std::map > SourceMap; + typedef std::map > SourceMap; - void foreach_source (boost::function )> f) { + void foreach_source (boost::function )> f) { Glib::Threads::Mutex::Lock ls (source_lock); for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { f ( (*i).second ); } } - bool playlist_is_active( boost::shared_ptr); + bool playlist_is_active( std::shared_ptr); ARDOUR::CueMarkers pending_source_markers; // source markers created while recording private: @@ -2016,13 +2016,13 @@ private: int load_sources (const XMLNode& node); XMLNode& get_sources_as_xml (); - boost::shared_ptr XMLSourceFactory (const XMLNode&); + std::shared_ptr XMLSourceFactory (const XMLNode&); /* PLAYLISTS */ - void remove_playlist (boost::weak_ptr); - void track_playlist_changed (boost::weak_ptr); - void playlist_region_added (boost::weak_ptr); + void remove_playlist (std::weak_ptr); + void track_playlist_changed (std::weak_ptr); + void playlist_region_added (std::weak_ptr); void playlist_ranges_moved (std::list const &); void playlist_regions_extended (std::list const &); @@ -2039,10 +2039,10 @@ private: /* AUDITIONING */ - boost::shared_ptr auditioner; - void set_audition (boost::shared_ptr); + std::shared_ptr auditioner; + void set_audition (std::shared_ptr); void non_realtime_set_audition (); - boost::shared_ptr pending_audition_region; + std::shared_ptr pending_audition_region; /* EXPORT */ @@ -2132,17 +2132,17 @@ private: int set_state (const XMLNode& node, int version); // not idempotent XMLNode& get_template (); - bool maybe_copy_midifile (snapshot_t, boost::shared_ptr src, XMLNode*); + bool maybe_copy_midifile (snapshot_t, std::shared_ptr src, XMLNode*); - void collect_sources_of_this_snapshot (std::set>&, bool incl_unused = true) const; + void collect_sources_of_this_snapshot (std::set>&, bool incl_unused = true) const; /* click track */ typedef std::list Clicks; Clicks clicks; bool _clicking; bool _click_rec_only; - boost::shared_ptr _click_io; - boost::shared_ptr _click_gain; + std::shared_ptr _click_io; + std::shared_ptr _click_gain; Sample* click_data; Sample* click_emphasis_data; samplecnt_t click_length; @@ -2188,8 +2188,8 @@ private: /* main outs */ uint32_t main_outs; - boost::shared_ptr _master_out; - boost::shared_ptr _monitor_out; + std::shared_ptr _master_out; + std::shared_ptr _monitor_out; void auto_connect_master_bus (); @@ -2198,14 +2198,14 @@ private: int find_all_sources (std::string path, std::set& result); int find_all_sources_across_snapshots (std::set& result, bool exclude_this_snapshot); - typedef std::set > Controllables; + typedef std::set > Controllables; Glib::Threads::Mutex controllables_lock; Controllables controllables; - boost::shared_ptr _solo_cut_control; + std::shared_ptr _solo_cut_control; - void controllable_touched (boost::weak_ptr); - boost::weak_ptr _recently_touched_controllable; + void controllable_touched (std::weak_ptr); + std::weak_ptr _recently_touched_controllable; void reset_native_file_format(); bool first_file_data_format_reset; @@ -2226,12 +2226,12 @@ private: GATOMIC_QUAL gint _have_rec_enabled_track; GATOMIC_QUAL gint _have_rec_disabled_track; - static int ask_about_playlist_deletion (boost::shared_ptr); + static int ask_about_playlist_deletion (std::shared_ptr); /* realtime "apply to set of routes" operations */ template SessionEvent* - get_rt_event (boost::shared_ptr rl, T targ, SessionEvent::RTeventCallback after, PBD::Controllable::GroupControlDisposition group_override, - void (Session::*method) (boost::shared_ptr, T, PBD::Controllable::GroupControlDisposition)) { + get_rt_event (std::shared_ptr rl, T targ, SessionEvent::RTeventCallback after, PBD::Controllable::GroupControlDisposition group_override, + void (Session::*method) (std::shared_ptr, T, PBD::Controllable::GroupControlDisposition)) { SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->rt_slot = boost::bind (method, this, rl, targ, group_override); ev->rt_return = after; @@ -2242,8 +2242,8 @@ private: /* specialized version realtime "apply to set of routes" operations */ template SessionEvent* - get_rt_event (boost::shared_ptr rl, T1 t1arg, T2 t2arg, SessionEvent::RTeventCallback after, PBD::Controllable::GroupControlDisposition group_override, - void (Session::*method) (boost::shared_ptr, T1, T2, PBD::Controllable::GroupControlDisposition)) { + get_rt_event (std::shared_ptr rl, T1 t1arg, T2 t2arg, SessionEvent::RTeventCallback after, PBD::Controllable::GroupControlDisposition group_override, + void (Session::*method) (std::shared_ptr, T1, T2, PBD::Controllable::GroupControlDisposition)) { SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->rt_slot = boost::bind (method, this, rl, t1arg, t2arg, group_override); ev->rt_return = after; @@ -2253,7 +2253,7 @@ private: } /* specialized version realtime "apply to set of controls" operations */ - SessionEvent* get_rt_event (boost::shared_ptr cl, double arg, PBD::Controllable::GroupControlDisposition group_override) { + SessionEvent* get_rt_event (std::shared_ptr cl, double arg, PBD::Controllable::GroupControlDisposition group_override) { SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->rt_slot = boost::bind (&Session::rt_set_controls, this, cl, arg, group_override); ev->rt_return = Session::rt_cleanup; @@ -2262,8 +2262,8 @@ private: return ev; } - void rt_set_controls (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition group_override); - void rt_clear_all_solo_state (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); + void rt_set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition group_override); + void rt_clear_all_solo_state (std::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); void setup_midi_machine_control (); @@ -2279,7 +2279,7 @@ private: void set_track_monitor_input_status (bool); samplepos_t compute_stop_limit () const; - boost::shared_ptr _speakers; + std::shared_ptr _speakers; void load_nested_sources (const XMLNode& node); /** The directed graph of routes that is currently being used for audio processing @@ -2288,11 +2288,11 @@ private: GraphEdges _current_route_graph; friend class IOPlug; - boost::shared_ptr _process_graph; - boost::shared_ptr _graph_chain; - boost::shared_ptr _io_graph_chain[2]; + std::shared_ptr _process_graph; + std::shared_ptr _graph_chain; + std::shared_ptr _io_graph_chain[2]; - void resort_routes_using (boost::shared_ptr); + void resort_routes_using (std::shared_ptr); void resort_io_plugs (); bool rechain_process_graph (GraphNodeList&); @@ -2306,9 +2306,9 @@ private: MidiClockTicker* midi_clock; - boost::shared_ptr _ltc_output_port; + std::shared_ptr _ltc_output_port; - boost::shared_ptr _rt_tasklist; + std::shared_ptr _rt_tasklist; /* Scene Changing */ SceneChanger* _scene_changer; @@ -2330,15 +2330,15 @@ private: VCAManager* _vca_manager; - boost::shared_ptr get_midi_nth_route_by_id (PresentationInfo::order_t n) const; + std::shared_ptr get_midi_nth_route_by_id (PresentationInfo::order_t n) const; std::string created_with; - void midi_track_presentation_info_changed (PBD::PropertyChange const &, boost::weak_ptr); - void rewire_selected_midi (boost::shared_ptr); + void midi_track_presentation_info_changed (PBD::PropertyChange const &, std::weak_ptr); + void rewire_selected_midi (std::shared_ptr); void rewire_midi_selection_ports (); void disconnect_port_for_rewire (std::string const& port) const; - boost::weak_ptr current_midi_target; + std::weak_ptr current_midi_target; StripableList _soloSelection; //the items that are soloe'd during a solo-selection operation; need to unsolo after the roll @@ -2372,7 +2372,7 @@ private: void clear_active_cue (); int tb_with_filled_slots; - void handle_slots_empty_status (boost::weak_ptr const &); + void handle_slots_empty_status (std::weak_ptr const &); }; diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 271960ffb0..3aa5232d7c 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -94,7 +94,7 @@ public: int32_t scene; }; - boost::weak_ptr track; + std::weak_ptr track; union { bool second_yes_or_no; @@ -110,8 +110,8 @@ public: typedef boost::function RTeventCallback; - boost::shared_ptr controls; /* apply to */ - boost::shared_ptr routes; /* apply to */ + std::shared_ptr controls; /* apply to */ + std::shared_ptr routes; /* apply to */ boost::function rt_slot; /* what to call in RT context */ RTeventCallback rt_return; /* called after rt_slot, with this event as an argument */ PBD::EventLoop* event_loop; @@ -119,12 +119,12 @@ public: std::list audio_range; std::list music_range; - boost::shared_ptr region; - boost::shared_ptr transport_master; + std::shared_ptr region; + std::shared_ptr transport_master; SessionEvent (Type t, Action a, samplepos_t when, samplepos_t where, double spd, bool yn = false, bool yn2 = false, bool yn3 = false); - void set_track (boost::shared_ptr t) { + void set_track (std::shared_ptr t) { track = t; } diff --git a/libs/ardour/ardour/session_playlist.h b/libs/ardour/ardour/session_playlist.h index 1cba09bd6b..d21799154f 100644 --- a/libs/ardour/ardour/session_playlist.h +++ b/libs/ardour/ardour/session_playlist.h @@ -28,7 +28,7 @@ namespace ARDOUR { template void -SessionPlaylists::foreach (T *obj, void (T::*func)(boost::shared_ptr)) +SessionPlaylists::foreach (T *obj, void (T::*func)(std::shared_ptr)) { Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); i++) { diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 46fb6f2380..ccfbae9487 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -52,45 +52,45 @@ class LIBARDOUR_API SessionPlaylists : public PBD::ScopedConnectionList public: ~SessionPlaylists (); - boost::shared_ptr for_pgroup (std::string name, const PBD::ID& for_track); - boost::shared_ptr by_name (std::string name); - boost::shared_ptr by_id (const PBD::ID&); - uint32_t source_use_count (boost::shared_ptr src) const; - uint32_t region_use_count (boost::shared_ptr region) const; - template void foreach (T *obj, void (T::*func)(boost::shared_ptr)); - void foreach (boost::function)> functor, bool incl_unused = true); - void get (std::vector >&) const; - void unassigned (std::list > & list); - void destroy_region (boost::shared_ptr); - boost::shared_ptr find_crossfade (const PBD::ID &); + std::shared_ptr for_pgroup (std::string name, const PBD::ID& for_track); + std::shared_ptr by_name (std::string name); + std::shared_ptr by_id (const PBD::ID&); + uint32_t source_use_count (std::shared_ptr src) const; + uint32_t region_use_count (std::shared_ptr region) const; + template void foreach (T *obj, void (T::*func)(std::shared_ptr)); + void foreach (boost::function)> functor, bool incl_unused = true); + void get (std::vector >&) const; + void unassigned (std::list > & list); + void destroy_region (std::shared_ptr); + std::shared_ptr find_crossfade (const PBD::ID &); void sync_all_regions_with_regions (); - std::vector > playlists_for_pgroup (std::string pgroup); - std::vector > playlists_for_track (boost::shared_ptr) const; - std::vector > get_used () const; - std::vector > get_unused () const; + std::vector > playlists_for_pgroup (std::string pgroup); + std::vector > playlists_for_track (std::shared_ptr) const; + std::vector > get_used () const; + std::vector > get_unused () const; uint32_t n_playlists() const; private: friend class Session; - bool add (boost::shared_ptr); - void remove (boost::shared_ptr); - void remove_weak (boost::weak_ptr); - void track (bool, boost::weak_ptr); + bool add (std::shared_ptr); + void remove (std::shared_ptr); + void remove_weak (std::weak_ptr); + void track (bool, std::weak_ptr); void update_tracking (); void update_orig_2X (PBD::ID, PBD::ID); - void find_equivalent_playlist_regions (boost::shared_ptr, std::vector >& result); + void find_equivalent_playlist_regions (std::shared_ptr, std::vector >& result); void update_after_tempo_map_change (); void add_state (XMLNode*, bool save_template, bool include_unused) const; - bool maybe_delete_unused (boost::function)>); + bool maybe_delete_unused (boost::function)>); int load (Session &, const XMLNode&); int load_unused (Session &, const XMLNode&); - boost::shared_ptr XMLPlaylistFactory (Session &, const XMLNode&); + std::shared_ptr XMLPlaylistFactory (Session &, const XMLNode&); mutable Glib::Threads::Mutex lock; - typedef std::set > List; + typedef std::set > List; List playlists; List unused_playlists; }; diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h index 6c038cf5e1..d1dd4efadd 100644 --- a/libs/ardour/ardour/session_route.h +++ b/libs/ardour/ardour/session_route.h @@ -34,7 +34,7 @@ namespace ARDOUR { template void Session::foreach_route (T *obj, void (T::*func)(Route&), bool sort) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); RouteList public_order (*r); if (sort) { @@ -47,9 +47,9 @@ Session::foreach_route (T *obj, void (T::*func)(Route&), bool sort) } template void -Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr), bool sort) +Session::foreach_route (T *obj, void (T::*func)(std::shared_ptr), bool sort) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); RouteList public_order (*r); if (sort) { @@ -64,7 +64,7 @@ Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr), bool template void Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1, bool sort) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); RouteList public_order (*r); if (sort) { @@ -80,10 +80,10 @@ Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1, bool sort) template void Session::foreach_track (void (Track::*method)(A), A arg) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); for (RouteList::iterator i = r->begin(); i != r->end(); i++) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { (tr.get()->*method) (arg); } @@ -93,10 +93,10 @@ Session::foreach_track (void (Track::*method)(A), A arg) template void Session::foreach_track (void (Track::*method)(A1, A2), A1 arg1, A2 arg2) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); for (RouteList::iterator i = r->begin(); i != r->end(); i++) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { (tr.get()->*method) (arg1, arg2); } @@ -106,7 +106,7 @@ Session::foreach_track (void (Track::*method)(A1, A2), A1 arg1, A2 arg2) template void Session::foreach_route (void (Route::*method)(A), A arg) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); for (RouteList::iterator i = r->begin(); i != r->end(); i++) { ((*i).get()->*method) (arg); @@ -116,7 +116,7 @@ Session::foreach_route (void (Route::*method)(A), A arg) template void Session::foreach_route (void (Route::*method)(A1, A2), A1 arg1, A2 arg2) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); for (RouteList::iterator i = r->begin(); i != r->end(); i++) { ((*i).get()->*method) (arg1, arg2); diff --git a/libs/ardour/ardour/simple_export.h b/libs/ardour/ardour/simple_export.h index 4b8f64ff89..845a18b134 100644 --- a/libs/ardour/ardour/simple_export.h +++ b/libs/ardour/ardour/simple_export.h @@ -53,9 +53,9 @@ public: bool check_outputs () const; protected: - boost::shared_ptr _handler; - boost::shared_ptr _status; - boost::shared_ptr _manager; + std::shared_ptr _handler; + std::shared_ptr _status; + std::shared_ptr _manager; private: std::string _name; diff --git a/libs/ardour/ardour/slavable.h b/libs/ardour/ardour/slavable.h index 1c31b7d7cb..3f613c594d 100644 --- a/libs/ardour/ardour/slavable.h +++ b/libs/ardour/ardour/slavable.h @@ -51,32 +51,32 @@ public: XMLNode& get_state () const; int set_state (XMLNode const&, int); - virtual void assign (boost::shared_ptr); - void unassign (boost::shared_ptr); + virtual void assign (std::shared_ptr); + void unassign (std::shared_ptr); - PBD::Signal2,bool> AssignmentChange; + PBD::Signal2,bool> AssignmentChange; - virtual boost::shared_ptr automation_control (const Evoral::Parameter&) = 0; + virtual std::shared_ptr automation_control (const Evoral::Parameter&) = 0; static std::string xml_node_name; /* signal sent VCAManager once assignment is possible */ static PBD::Signal1 Assign; - std::vector > masters (VCAManager*) const; + std::vector > masters (VCAManager*) const; /** recursively test for master assignment to given VCA */ - bool assigned_to (VCAManager*, boost::shared_ptr) const; + bool assigned_to (VCAManager*, std::shared_ptr) const; protected: virtual SlavableControlList slavables () const = 0; private: - bool assign_controls (boost::shared_ptr); - void unassign_controls (boost::shared_ptr); + bool assign_controls (std::shared_ptr); + void unassign_controls (std::shared_ptr); - bool assign_control (boost::shared_ptr, boost::shared_ptr); - void unassign_control (boost::shared_ptr, boost::shared_ptr); + bool assign_control (std::shared_ptr, std::shared_ptr); + void unassign_control (std::shared_ptr, std::shared_ptr); mutable Glib::Threads::RWLock master_lock; std::set _masters; @@ -84,7 +84,7 @@ private: PBD::ScopedConnectionList unassign_connections; int do_assign (VCAManager* s); - void weak_unassign (boost::weak_ptr); + void weak_unassign (std::weak_ptr); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/slavable_automation_control.h b/libs/ardour/ardour/slavable_automation_control.h index 6576b6ecaf..db5b65855c 100644 --- a/libs/ardour/ardour/slavable_automation_control.h +++ b/libs/ardour/ardour/slavable_automation_control.h @@ -31,7 +31,7 @@ public: SlavableAutomationControl(ARDOUR::Session&, const Evoral::Parameter& parameter, const ParameterDescriptor& desc, - boost::shared_ptr l=boost::shared_ptr(), + std::shared_ptr l=std::shared_ptr(), const std::string& name="", PBD::Controllable::Flag flags=PBD::Controllable::Flag (0) ); @@ -40,13 +40,13 @@ public: double get_value () const; - void add_master (boost::shared_ptr); - void remove_master (boost::shared_ptr); + void add_master (std::shared_ptr); + void remove_master (std::shared_ptr); void clear_masters (); - bool slaved_to (boost::shared_ptr) const; + bool slaved_to (std::shared_ptr) const; bool slaved () const; - std::set> masters () const; + std::set> masters () const; virtual void automation_run (samplepos_t start, pframes_t nframes); @@ -90,14 +90,14 @@ protected: class MasterRecord { public: - MasterRecord (boost::weak_ptr gc, double vc, double vm) + MasterRecord (std::weak_ptr gc, double vc, double vm) : _master (gc) , _yn (false) , _val_ctrl (vc) , _val_master (vm) {} - boost::shared_ptr master() const { assert(_master.lock()); return _master.lock(); } + std::shared_ptr master() const { assert(_master.lock()); return _master.lock(); } double val_ctrl () const { return _val_ctrl; } double val_master () const { return _val_master; } @@ -119,7 +119,7 @@ protected: PBD::ScopedConnection dropped_connection; private: - boost::weak_ptr _master; + std::weak_ptr _master; /* holds most recently seen master value for boolean/toggle controls */ bool _yn; @@ -132,10 +132,10 @@ protected: typedef std::map Masters; Masters _masters; - void master_going_away (boost::weak_ptr); + void master_going_away (std::weak_ptr); double get_value_locked() const; void actually_set_value (double value, PBD::Controllable::GroupControlDisposition); - void update_boolean_masters_records (boost::shared_ptr); + void update_boolean_masters_records (std::shared_ptr); virtual bool get_masters_curve_locked (samplepos_t, samplepos_t, float*, samplecnt_t) const; bool masters_curve_multiply (timepos_t const &, timepos_t const &, float*, samplecnt_t) const; @@ -143,14 +143,14 @@ protected: virtual double reduce_by_masters_locked (double val, bool) const; virtual double scale_automation_callback (double val, double ratio) const; - virtual bool handle_master_change (boost::shared_ptr); + virtual bool handle_master_change (std::shared_ptr); virtual bool boolean_automation_run_locked (samplepos_t start, pframes_t len); bool boolean_automation_run (samplepos_t start, pframes_t len); - virtual void master_changed (bool from_self, GroupControlDisposition gcd, boost::weak_ptr); + virtual void master_changed (bool from_self, GroupControlDisposition gcd, std::weak_ptr); virtual double get_masters_value_locked () const; - virtual void pre_remove_master (boost::shared_ptr) {} - virtual void post_add_master (boost::shared_ptr) {} + virtual void pre_remove_master (std::shared_ptr) {} + virtual void post_add_master (std::shared_ptr) {} XMLNode* _masters_node; /* used to store master ratios in ::set_state() for later use */ }; diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h index b6d76c8dc7..62b7659977 100644 --- a/libs/ardour/ardour/sndfileimportable.h +++ b/libs/ardour/ardour/sndfileimportable.h @@ -45,7 +45,7 @@ public: protected: SF_INFO sf_info; - boost::shared_ptr in; + std::shared_ptr in; /* these are int64_t so as to be independent of whatever * types Ardour may use for samplepos_t, samplecnt_t etc. diff --git a/libs/ardour/ardour/solo_control.h b/libs/ardour/ardour/solo_control.h index 1896186ac4..41e1df381c 100644 --- a/libs/ardour/ardour/solo_control.h +++ b/libs/ardour/ardour/solo_control.h @@ -97,9 +97,9 @@ class LIBARDOUR_API SoloControl : public SlavableAutomationControl protected: void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override); - void master_changed (bool from_self, GroupControlDisposition, boost::weak_ptr m); - void pre_remove_master (boost::shared_ptr); - void post_add_master (boost::shared_ptr); + void master_changed (bool from_self, GroupControlDisposition, std::weak_ptr m); + void pre_remove_master (std::shared_ptr); + void post_add_master (std::shared_ptr); private: Soloable& _soloable; diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h index c410c8674b..ec9140eb56 100644 --- a/libs/ardour/ardour/solo_isolate_control.h +++ b/libs/ardour/ardour/solo_isolate_control.h @@ -72,7 +72,7 @@ class LIBARDOUR_API SoloIsolateControl : public SlavableAutomationControl XMLNode& get_state () const; protected: - void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::weak_ptr); + void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, std::weak_ptr); void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override); private: diff --git a/libs/ardour/ardour/solo_mute_release.h b/libs/ardour/ardour/solo_mute_release.h index ec54733f78..de042a53aa 100644 --- a/libs/ardour/ardour/solo_mute_release.h +++ b/libs/ardour/ardour/solo_mute_release.h @@ -38,10 +38,10 @@ public: void set_exclusive (bool exclusive = true); - void set (boost::shared_ptr); - void set (boost::shared_ptr); - void set (boost::shared_ptr, boost::shared_ptr); - void set (boost::shared_ptr >); + void set (std::shared_ptr); + void set (std::shared_ptr); + void set (std::shared_ptr, std::shared_ptr); + void set (std::shared_ptr >); void release (Session*, bool mute) const; @@ -49,10 +49,10 @@ private: bool active; bool exclusive; - boost::shared_ptr routes_on; - boost::shared_ptr routes_off; + std::shared_ptr routes_on; + std::shared_ptr routes_off; - boost::shared_ptr > port_monitors; + std::shared_ptr > port_monitors; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index d42d92d6ec..885a4fdc77 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -44,7 +44,7 @@ namespace ARDOUR { class Session; class LIBARDOUR_API Source : public SessionObject, - public boost::enable_shared_from_this + public std::enable_shared_from_this { public: enum Flag { diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 0165a6df4b..0b9aee034a 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -41,14 +41,14 @@ public: static void init (); static void terminate (); - static PBD::Signal1> SourceCreated; + static PBD::Signal1> SourceCreated; - static boost::shared_ptr create (Session&, const XMLNode& node, bool async = false); - static boost::shared_ptr createSilent (Session&, const XMLNode& node, samplecnt_t, float sample_rate); - static boost::shared_ptr createExternal (DataType, Session&, const std::string& path, int chn, Source::Flag, bool announce = true, bool async = false); - static boost::shared_ptr createWritable (DataType, Session&, const std::string& path, samplecnt_t rate, bool announce = true, bool async = false); - static boost::shared_ptr createForRecovery (DataType, Session&, const std::string& path, int chn); - static boost::shared_ptr createFromPlaylist (DataType, Session&, boost::shared_ptr p, const PBD::ID& orig, const std::string& name, uint32_t chn, timepos_t start, timepos_t const& len, bool copy, bool defer_peaks); + static std::shared_ptr create (Session&, const XMLNode& node, bool async = false); + static std::shared_ptr createSilent (Session&, const XMLNode& node, samplecnt_t, float sample_rate); + static std::shared_ptr createExternal (DataType, Session&, const std::string& path, int chn, Source::Flag, bool announce = true, bool async = false); + static std::shared_ptr createWritable (DataType, Session&, const std::string& path, samplecnt_t rate, bool announce = true, bool async = false); + static std::shared_ptr createForRecovery (DataType, Session&, const std::string& path, int chn); + static std::shared_ptr createFromPlaylist (DataType, Session&, std::shared_ptr p, const PBD::ID& orig, const std::string& name, uint32_t chn, timepos_t start, timepos_t const& len, bool copy, bool defer_peaks); static Glib::Threads::Cond PeaksToBuild; static Glib::Threads::Mutex peak_building_lock; @@ -56,10 +56,10 @@ public: static bool peak_thread_run; static std::vector peak_thread_pool; - static std::list> files_with_peaks; + static std::list> files_with_peaks; static int peak_work_queue_length (); - static int setup_peakfile (boost::shared_ptr, bool async); + static int setup_peakfile (std::shared_ptr, bool async); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/srcfilesource.h b/libs/ardour/ardour/srcfilesource.h index dbf6ab1be7..5dd5e49b5a 100644 --- a/libs/ardour/ardour/srcfilesource.h +++ b/libs/ardour/ardour/srcfilesource.h @@ -31,7 +31,7 @@ namespace ARDOUR { class LIBARDOUR_API SrcFileSource : public AudioFileSource { public: - SrcFileSource (Session&, boost::shared_ptr, SrcQuality srcq = SrcQuality(SrcQuick)); + SrcFileSource (Session&, std::shared_ptr, SrcQuality srcq = SrcQuality(SrcQuick)); ~SrcFileSource (); int update_header (samplepos_t /*when*/, struct tm&, time_t) { return 0; } @@ -62,7 +62,7 @@ protected: private: static const uint32_t max_blocksize; - boost::shared_ptr _source; + std::shared_ptr _source; mutable SRC_STATE* _src_state; mutable SRC_DATA _src_data; diff --git a/libs/ardour/ardour/step_sequencer.h b/libs/ardour/ardour/step_sequencer.h index 6975262885..37e9dba275 100644 --- a/libs/ardour/ardour/step_sequencer.h +++ b/libs/ardour/ardour/step_sequencer.h @@ -262,7 +262,7 @@ class StepSequencer : public PBD::Stateful void queue_note_off (Temporal::Beats const &, uint8_t note, uint8_t velocity, uint8_t channel); - boost::shared_ptr write_to_source (Session& s, std::string p = std::string()) const; + std::shared_ptr write_to_source (Session& s, std::string p = std::string()) const; private: mutable Glib::Threads::Mutex _sequence_lock; @@ -346,7 +346,7 @@ class StepSequencer : public PBD::Stateful void check_note_offs (ARDOUR::MidiBuffer&, samplepos_t start_sample, samplepos_t last_sample); void clear_note_offs (); - bool fill_midi_source (boost::shared_ptr src) const; + bool fill_midi_source (std::shared_ptr src) const; }; diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h index baa7ad0a5c..a26cf7dff1 100644 --- a/libs/ardour/ardour/stretch.h +++ b/libs/ardour/ardour/stretch.h @@ -50,7 +50,7 @@ class LIBARDOUR_API STStretch : public Filter { STStretch (ARDOUR::Session&, TimeFXRequest&); ~STStretch (); - int run (boost::shared_ptr, Progress* progress = 0); + int run (std::shared_ptr, Progress* progress = 0); private: TimeFXRequest& tsr; diff --git a/libs/ardour/ardour/strip_silence.h b/libs/ardour/ardour/strip_silence.h index 1bd25248a3..c6dd9f9260 100644 --- a/libs/ardour/ardour/strip_silence.h +++ b/libs/ardour/ardour/strip_silence.h @@ -28,7 +28,7 @@ class LIBARDOUR_API StripSilence : public Filter public: StripSilence (Session &, const AudioIntervalMap&, samplecnt_t fade_length); - int run (boost::shared_ptr, Progress* progress = 0); + int run (std::shared_ptr, Progress* progress = 0); private: const AudioIntervalMap& _smap; diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index ae17499ef6..8617b499dd 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -62,7 +62,7 @@ class RecordSafeControl; class LIBARDOUR_API Stripable : public SessionObject, public Automatable, - public boost::enable_shared_from_this + public std::enable_shared_from_this { public: Stripable (Session& session, std::string const & name, PresentationInfo const &); @@ -95,7 +95,7 @@ class LIBARDOUR_API Stripable : public SessionObject, { bool _mixer_order; // master is last Sorter (bool mixer_order = false) : _mixer_order (mixer_order) {} - bool operator() (boost::shared_ptr a, boost::shared_ptr b); + bool operator() (std::shared_ptr a, std::shared_ptr b); }; /* gui's call this for their own purposes. */ @@ -106,35 +106,35 @@ class LIBARDOUR_API Stripable : public SessionObject, * Pure interface begins here ***************************************************************/ - virtual boost::shared_ptr peak_meter() = 0; - virtual boost::shared_ptr peak_meter() const = 0; + virtual std::shared_ptr peak_meter() = 0; + virtual std::shared_ptr peak_meter() const = 0; - virtual boost::shared_ptr gain_control() const = 0; + virtual std::shared_ptr gain_control() const = 0; - virtual boost::shared_ptr solo_control() const = 0; - virtual boost::shared_ptr solo_isolate_control() const = 0; - virtual boost::shared_ptr solo_safe_control() const = 0; - virtual boost::shared_ptr mute_control() const = 0; + virtual std::shared_ptr solo_control() const = 0; + virtual std::shared_ptr solo_isolate_control() const = 0; + virtual std::shared_ptr solo_safe_control() const = 0; + virtual std::shared_ptr mute_control() const = 0; - virtual boost::shared_ptr phase_control() const = 0; - virtual boost::shared_ptr trim_control() const = 0; + virtual std::shared_ptr phase_control() const = 0; + virtual std::shared_ptr trim_control() const = 0; - virtual boost::shared_ptr monitoring_control() const = 0; + virtual std::shared_ptr monitoring_control() const = 0; - virtual boost::shared_ptr rec_enable_control() const { return boost::shared_ptr(); } - virtual boost::shared_ptr rec_safe_control() const { return boost::shared_ptr(); } + virtual std::shared_ptr rec_enable_control() const { return std::shared_ptr(); } + virtual std::shared_ptr rec_safe_control() const { return std::shared_ptr(); } - virtual bool slaved_to (boost::shared_ptr) const = 0; + virtual bool slaved_to (std::shared_ptr) const = 0; virtual bool slaved () const = 0; /* "well-known" controls for panning. Any or all of these may return * null. */ - virtual boost::shared_ptr pan_azimuth_control() const = 0; - virtual boost::shared_ptr pan_elevation_control() const = 0; - virtual boost::shared_ptr pan_width_control() const = 0; - virtual boost::shared_ptr pan_frontback_control() const = 0; - virtual boost::shared_ptr pan_lfe_control() const = 0; + virtual std::shared_ptr pan_azimuth_control() const = 0; + virtual std::shared_ptr pan_elevation_control() const = 0; + virtual std::shared_ptr pan_width_control() const = 0; + virtual std::shared_ptr pan_frontback_control() const = 0; + virtual std::shared_ptr pan_lfe_control() const = 0; /* "well-known" controls for an EQ in this route. Any or all may * be null. eq_band_cnt() must return 0 if there is no EQ present. @@ -142,55 +142,57 @@ class LIBARDOUR_API Stripable : public SessionObject, * return of a null ptr (or an empty string for eq_band_name()). */ virtual uint32_t eq_band_cnt () const = 0; - virtual boost::shared_ptr eq_enable_controllable () const = 0; + virtual std::shared_ptr eq_enable_controllable () const = 0; virtual std::string eq_band_name (uint32_t) const = 0; - virtual boost::shared_ptr eq_gain_controllable (uint32_t band) const = 0; - virtual boost::shared_ptr eq_freq_controllable (uint32_t band) const = 0; - virtual boost::shared_ptr eq_q_controllable (uint32_t band) const = 0; - virtual boost::shared_ptr eq_shape_controllable (uint32_t band) const = 0; + virtual std::shared_ptr eq_gain_controllable (uint32_t band) const = 0; + virtual std::shared_ptr eq_freq_controllable (uint32_t band) const = 0; + virtual std::shared_ptr eq_q_controllable (uint32_t band) const = 0; + virtual std::shared_ptr eq_shape_controllable (uint32_t band) const = 0; + + virtual std::shared_ptr filter_freq_controllable (bool hp /* false for LPF*/) const = 0; + virtual std::shared_ptr filter_slope_controllable (bool hp) const = 0; + virtual std::shared_ptr filter_enable_controllable (bool hp) const = 0; - virtual boost::shared_ptr filter_freq_controllable (bool hp /* false for LPF*/) const = 0; - virtual boost::shared_ptr filter_slope_controllable (bool hp) const = 0; - virtual boost::shared_ptr filter_enable_controllable (bool hp) const = 0; virtual std::string tape_mode_name (uint32_t) const = 0; - virtual boost::shared_ptr tape_drive_controllable () const = 0; - virtual boost::shared_ptr tape_drive_mode_controllable () const = 0; - virtual boost::shared_ptr tape_drive_mtr_controllable () const = 0; + virtual std::shared_ptr tape_drive_controllable () const = 0; + virtual std::shared_ptr tape_drive_mode_controllable () const = 0; + virtual std::shared_ptr tape_drive_mtr_controllable () const = 0; /* "well-known" controls for a compressor in this route. Any or all may * be null. */ - virtual boost::shared_ptr comp_enable_controllable () const = 0; - virtual boost::shared_ptr comp_threshold_controllable () const = 0; - virtual boost::shared_ptr comp_speed_controllable () const = 0; - virtual boost::shared_ptr comp_mode_controllable () const = 0; - virtual boost::shared_ptr comp_makeup_controllable () const = 0; - virtual boost::shared_ptr comp_ratio_controllable () const = 0; - virtual boost::shared_ptr comp_attack_controllable () const = 0; - virtual boost::shared_ptr comp_release_controllable () const = 0; - virtual boost::shared_ptr comp_key_filter_freq_controllable () const = 0; - virtual boost::shared_ptr comp_lookahead_controllable () const = 0; - virtual boost::shared_ptr comp_meter_controllable () const = 0; - virtual boost::shared_ptr comp_redux_controllable () const = 0; + + virtual std::shared_ptr comp_enable_controllable () const = 0; + virtual std::shared_ptr comp_threshold_controllable () const = 0; + virtual std::shared_ptr comp_speed_controllable () const = 0; + virtual std::shared_ptr comp_mode_controllable () const = 0; + virtual std::shared_ptr comp_makeup_controllable () const = 0; + virtual std::shared_ptr comp_ratio_controllable () const = 0; + virtual std::shared_ptr comp_attack_controllable () const = 0; + virtual std::shared_ptr comp_release_controllable () const = 0; + virtual std::shared_ptr comp_key_filter_freq_controllable () const = 0; + virtual std::shared_ptr comp_lookahead_controllable () const = 0; + virtual std::shared_ptr comp_meter_controllable () const = 0; + virtual std::shared_ptr comp_redux_controllable () const = 0; virtual std::string gate_mode_name (uint32_t) const = 0; - virtual boost::shared_ptr gate_enable_controllable () const = 0; - virtual boost::shared_ptr gate_mode_controllable () const = 0; - virtual boost::shared_ptr gate_ratio_controllable () const = 0; - virtual boost::shared_ptr gate_knee_controllable () const = 0; - virtual boost::shared_ptr gate_threshold_controllable () const = 0; - virtual boost::shared_ptr gate_depth_controllable () const = 0; - virtual boost::shared_ptr gate_hysteresis_controllable () const = 0; - virtual boost::shared_ptr gate_hold_controllable () const = 0; - virtual boost::shared_ptr gate_attack_controllable () const = 0; - virtual boost::shared_ptr gate_release_controllable () const = 0; - virtual boost::shared_ptr gate_key_listen_controllable () const = 0; - virtual boost::shared_ptr gate_key_filter_enable_controllable () const = 0; - virtual boost::shared_ptr gate_key_filter_freq_controllable () const = 0; - virtual boost::shared_ptr gate_lookahead_controllable () const = 0; - virtual boost::shared_ptr gate_meter_controllable () const = 0; - virtual boost::shared_ptr gate_redux_controllable () const = 0; + virtual std::shared_ptr gate_enable_controllable () const = 0; + virtual std::shared_ptr gate_mode_controllable () const = 0; + virtual std::shared_ptr gate_ratio_controllable () const = 0; + virtual std::shared_ptr gate_knee_controllable () const = 0; + virtual std::shared_ptr gate_threshold_controllable () const = 0; + virtual std::shared_ptr gate_depth_controllable () const = 0; + virtual std::shared_ptr gate_hysteresis_controllable () const = 0; + virtual std::shared_ptr gate_hold_controllable () const = 0; + virtual std::shared_ptr gate_attack_controllable () const = 0; + virtual std::shared_ptr gate_release_controllable () const = 0; + virtual std::shared_ptr gate_key_listen_controllable () const = 0; + virtual std::shared_ptr gate_key_filter_enable_controllable () const = 0; + virtual std::shared_ptr gate_key_filter_freq_controllable () const = 0; + virtual std::shared_ptr gate_lookahead_controllable () const = 0; + virtual std::shared_ptr gate_meter_controllable () const = 0; + virtual std::shared_ptr gate_redux_controllable () const = 0; /* @param mode must be supplied by the comp_mode_controllable(). All other values * result in undefined behaviour @@ -210,10 +212,10 @@ class LIBARDOUR_API Stripable : public SessionObject, * In Ardour, these are user-created sends that connect to user-created * Aux busses. */ - virtual boost::shared_ptr send_level_controllable (uint32_t n) const = 0; - virtual boost::shared_ptr send_enable_controllable (uint32_t n) const = 0; - virtual boost::shared_ptr send_pan_azimuth_controllable (uint32_t n) const = 0; - virtual boost::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const = 0; + virtual std::shared_ptr send_level_controllable (uint32_t n) const = 0; + virtual std::shared_ptr send_enable_controllable (uint32_t n) const = 0; + virtual std::shared_ptr send_pan_azimuth_controllable (uint32_t n) const = 0; + virtual std::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const = 0; /* for the same value of @p n, this returns the name of the send * associated with the pair of controllables returned by the above two methods. @@ -226,7 +228,7 @@ class LIBARDOUR_API Stripable : public SessionObject, * In Mixbus, it will return a suitable control, or null depending on * the route. */ - virtual boost::shared_ptr master_send_enable_controllable () const = 0; + virtual std::shared_ptr master_send_enable_controllable () const = 0; /* well known control for mixbus's correlation meter. * @@ -234,7 +236,7 @@ class LIBARDOUR_API Stripable : public SessionObject, * In Mixbus, it will return a suitable control, or null depending on the route. * @param mm min/max of the correlation range, true for upper value */ - virtual boost::shared_ptr master_correlation_mtr_controllable (bool mm) const { return boost::shared_ptr(); } + virtual std::shared_ptr master_correlation_mtr_controllable (bool mm) const { return std::shared_ptr(); } /* well known control for mixbus's limiter. * @@ -242,8 +244,8 @@ class LIBARDOUR_API Stripable : public SessionObject, * In Mixbus, it will return a suitable control, or null depending on * the route. */ - virtual boost::shared_ptr master_limiter_enable_controllable () const { return boost::shared_ptr(); } - virtual boost::shared_ptr master_limiter_mtr_controllable () const { return boost::shared_ptr(); } + virtual std::shared_ptr master_limiter_enable_controllable () const { return std::shared_ptr(); } + virtual std::shared_ptr master_limiter_mtr_controllable () const { return std::shared_ptr(); } /* well known control for mixbus's k-meter. * @@ -251,11 +253,11 @@ class LIBARDOUR_API Stripable : public SessionObject, * In Mixbus, it will return a suitable control, or null depending on * the route. */ - virtual boost::shared_ptr master_k_mtr_controllable () const { return boost::shared_ptr(); } + virtual std::shared_ptr master_k_mtr_controllable () const { return std::shared_ptr(); } virtual bool muted_by_others_soloing () const = 0; - virtual boost::shared_ptr monitor_control() const = 0; + virtual std::shared_ptr monitor_control() const = 0; StripableColorDialog* active_color_picker() const { return _active_color_picker; } void set_active_color_picker (StripableColorDialog* d) { _active_color_picker = d; } diff --git a/libs/ardour/ardour/tempo_map_importer.h b/libs/ardour/ardour/tempo_map_importer.h index 3a2d618184..eba6513b33 100644 --- a/libs/ardour/ardour/tempo_map_importer.h +++ b/libs/ardour/ardour/tempo_map_importer.h @@ -41,7 +41,7 @@ class LIBARDOUR_API TempoMapImportHandler : public ElementImportHandler class LIBARDOUR_API TempoMapImporter : public ElementImporter { private: - typedef boost::shared_ptr XMLNodePtr; + typedef std::shared_ptr XMLNodePtr; public: TempoMapImporter (XMLTree const & source, Session & session, XMLNode const & node); diff --git a/libs/ardour/ardour/thawlist.h b/libs/ardour/ardour/thawlist.h index e103f80e32..419dc77bee 100644 --- a/libs/ardour/ardour/thawlist.h +++ b/libs/ardour/ardour/thawlist.h @@ -28,7 +28,7 @@ class LIBARDOUR_API ThawList : public RegionList { public: ~ThawList (); - void add (boost::shared_ptr r); + void add (std::shared_ptr r); void release (); }; diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 80f2f585ff..b28a2a368c 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -46,7 +46,7 @@ public: void tick (samplepos_t, samplepos_t, pframes_t, samplecnt_t); private: - boost::shared_ptr _midi_port; + std::shared_ptr _midi_port; void reset (); void resync_latency (bool); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 42279b2244..08e6a4da1f 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -89,14 +89,14 @@ public: * @param include_endpoint include the given processor in the bounced audio. * @return true if the track can be bounced, or false otherwise. */ - virtual bool bounceable (boost::shared_ptr endpoint, bool include_endpoint) const = 0; + virtual bool bounceable (std::shared_ptr endpoint, bool include_endpoint) const = 0; /** bounce track from session start to session end to new region * * @param itt asynchronous progress report and cancel * @return a new audio region (or nil in case of error) */ - virtual boost::shared_ptr bounce (InterThreadInfo& itt, std::string const& name) = 0; + virtual std::shared_ptr bounce (InterThreadInfo& itt, std::string const& name) = 0; /** Bounce the given range to a new audio region. * @param start start time (in samples) @@ -106,19 +106,19 @@ public: * @param include_endpoint include the given processor in the bounced audio. * @return a new audio region (or nil in case of error) */ - virtual boost::shared_ptr bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt, - boost::shared_ptr endpoint, bool include_endpoint, + virtual std::shared_ptr bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt, + std::shared_ptr endpoint, bool include_endpoint, std::string const& name) = 0; virtual int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, - boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, MidiNoteTracker&) = 0; virtual int set_state (const XMLNode&, int version); static void zero_diskstream_id_in_xml (XMLNode&); - boost::shared_ptr rec_enable_control() const { return _record_enable_control; } - boost::shared_ptr rec_safe_control() const { return _record_safe_control; } + std::shared_ptr rec_enable_control() const { return _record_enable_control; } + std::shared_ptr rec_safe_control() const { return _record_safe_control; } int prep_record_enabled (bool); bool can_be_record_enabled (); @@ -131,14 +131,14 @@ public: /* used by DiskReader request_overwrite_buffer(), to create * a SessionEvent with weak_ptr<> reference */ - boost::shared_ptr shared_ptr () { - return boost::dynamic_pointer_cast (shared_from_this()); + std::shared_ptr shared_ptr () { + return std::dynamic_pointer_cast (shared_from_this()); } - boost::shared_ptr playlist (); + std::shared_ptr playlist (); void request_input_monitoring (bool); void ensure_input_monitoring (bool); - std::list > & last_capture_sources (); + std::list > & last_capture_sources (); std::string steal_write_source_name (); void reset_write_sources (bool, bool force = false); float playback_buffer_load () const; @@ -166,7 +166,7 @@ public: void set_align_style (AlignStyle, bool force=false); void set_align_choice (AlignChoice, bool force=false); void playlist_modified (); - int use_playlist (DataType, boost::shared_ptr, bool set_orig = true); + int use_playlist (DataType, std::shared_ptr, bool set_orig = true); int find_and_use_playlist (DataType, PBD::ID const &); int use_copy_playlist (); int use_new_playlist (DataType); @@ -186,18 +186,18 @@ public: protected: XMLNode& state (bool save_template) const; - boost::shared_ptr _playlists[DataType::num_types]; + std::shared_ptr _playlists[DataType::num_types]; MeterPoint _saved_meter_point; TrackMode _mode; //private: (FIXME) struct FreezeRecordProcessorInfo { - FreezeRecordProcessorInfo(XMLNode& st, boost::shared_ptr proc) + FreezeRecordProcessorInfo(XMLNode& st, std::shared_ptr proc) : state (st), processor (proc) {} XMLNode state; - boost::shared_ptr processor; + std::shared_ptr processor; PBD::ID id; }; @@ -208,7 +208,7 @@ protected: ~FreezeRecord(); - boost::shared_ptr playlist; + std::shared_ptr playlist; std::vector processor_info; bool have_mementos; FreezeState state; @@ -219,8 +219,8 @@ protected: FreezeRecord _freeze_record; XMLNode* pending_state; - boost::shared_ptr _record_enable_control; - boost::shared_ptr _record_safe_control; + std::shared_ptr _record_enable_control; + std::shared_ptr _record_safe_control; virtual void record_enable_changed (bool, PBD::Controllable::GroupControlDisposition); virtual void record_safe_changed (bool, PBD::Controllable::GroupControlDisposition); diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h index 57ef291bd1..20c4096ec2 100644 --- a/libs/ardour/ardour/transform.h +++ b/libs/ardour/ardour/transform.h @@ -131,7 +131,7 @@ public: Transform(const Program& prog); - Command* operator()(boost::shared_ptr model, + Command* operator()(std::shared_ptr model, Temporal::Beats position, std::vector& seqs); diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h index 136426ff5e..cdf9979b92 100644 --- a/libs/ardour/ardour/transport_master.h +++ b/libs/ardour/ardour/transport_master.h @@ -151,8 +151,8 @@ public: TransportMaster (SyncSource t, std::string const& name); virtual ~TransportMaster (); - static boost::shared_ptr factory (SyncSource, std::string const&, bool removeable); - static boost::shared_ptr factory (XMLNode const&); + static std::shared_ptr factory (SyncSource, std::string const&, bool removeable); + static std::shared_ptr factory (XMLNode const&); virtual void pre_process (pframes_t nframes, samplepos_t now, boost::optional) = 0; @@ -362,7 +362,7 @@ public: virtual void set_session (Session*); - boost::shared_ptr port () const + std::shared_ptr port () const { return _port; } @@ -433,11 +433,11 @@ protected: double e2; double b, c; - boost::shared_ptr _port; + std::shared_ptr _port; mutable XMLNode port_node; - virtual void connection_handler (boost::weak_ptr, std::string name1, boost::weak_ptr, std::string name2, bool yn); + virtual void connection_handler (std::weak_ptr, std::string name1, std::weak_ptr, std::string name2, bool yn); PBD::ScopedConnection port_connection; PBD::ScopedConnection backend_connection; @@ -456,11 +456,11 @@ public: virtual ~TransportMasterViaMIDI (); MIDI::Parser& transport_parser () { return parser; } - boost::shared_ptr midi_port () const + std::shared_ptr midi_port () const { return _midi_port; } - boost::shared_ptr create_midi_port (std::string const& port_name); + std::shared_ptr create_midi_port (std::string const& port_name); virtual void set_session (Session*); @@ -469,7 +469,7 @@ protected: void resync_latency (bool); MIDI::Parser parser; - boost::shared_ptr _midi_port; + std::shared_ptr _midi_port; virtual void parameter_changed (std::string const& p) {} @@ -576,7 +576,7 @@ private: void parse_timecode_offset (); void parameter_changed (std::string const& p); - void connection_handler (boost::weak_ptr, std::string, boost::weak_ptr, std::string, bool); + void connection_handler (std::weak_ptr, std::string, std::weak_ptr, std::string, bool); }; class LIBARDOUR_API LTC_TransportMaster : public TimecodeTransportMaster @@ -623,7 +623,7 @@ private: void resync_latency (bool); void parse_timecode_offset (); void parameter_changed (std::string const& p); - void connection_handler (boost::weak_ptr, std::string, boost::weak_ptr, std::string, bool); + void connection_handler (std::weak_ptr, std::string, std::weak_ptr, std::string, bool); LTCDecoder* decoder; double samples_per_ltc_frame; @@ -719,7 +719,7 @@ protected: void calculate_filter_coefficients (double qpm); void update_midi_clock (MIDI::Parser& parser, samplepos_t timestamp); - void connection_handler (boost::weak_ptr, std::string, boost::weak_ptr, std::string, bool); + void connection_handler (std::weak_ptr, std::string, std::weak_ptr, std::string, bool); }; class LIBARDOUR_API Engine_TransportMaster : public TransportMaster diff --git a/libs/ardour/ardour/transport_master_manager.h b/libs/ardour/ardour/transport_master_manager.h index 8404aa8c54..8b27adedda 100644 --- a/libs/ardour/ardour/transport_master_manager.h +++ b/libs/ardour/ardour/transport_master_manager.h @@ -48,26 +48,26 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable */ static bool exists() { return _instance != 0; } - typedef std::list > TransportMasters; + typedef std::list > TransportMasters; int add (SyncSource type, std::string const & name, bool removeable = true); int remove (std::string const & name); void clear (); - PBD::Signal1 > Added; - PBD::Signal1 > Removed; // null argument means "clear" + PBD::Signal1 > Added; + PBD::Signal1 > Removed; // null argument means "clear" double pre_process_transport_masters (pframes_t, samplepos_t session_transport_position); double get_current_speed_in_process_context() const { return _master_speed; } samplepos_t get_current_position_in_process_context() const { return _master_position; } - boost::shared_ptr current() const { return _current_master; } - int set_current (boost::shared_ptr); + std::shared_ptr current() const { return _current_master; } + int set_current (std::shared_ptr); int set_current (SyncSource); int set_current (std::string const &); - PBD::Signal2, boost::shared_ptr > CurrentChanged; + PBD::Signal2, std::shared_ptr > CurrentChanged; int set_state (XMLNode const &, int); XMLNode& get_state() const; @@ -77,9 +77,9 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable bool master_invalid_this_cycle() const { return _master_invalid_this_cycle; } - boost::shared_ptr master_by_type (SyncSource src) const; - boost::shared_ptr master_by_name (std::string const &) const; - boost::shared_ptr master_by_port (boost::shared_ptr const &p) const; + std::shared_ptr master_by_type (SyncSource src) const; + std::shared_ptr master_by_name (std::string const &) const; + std::shared_ptr master_by_port (std::shared_ptr const &p) const; TransportMasters const & transport_masters() const { return _transport_masters; } @@ -97,7 +97,7 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable double _master_speed; samplepos_t _master_position; - boost::shared_ptr _current_master; + std::shared_ptr _current_master; Session* _session; bool _master_invalid_this_cycle; @@ -122,9 +122,9 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable void maybe_restore_tc_format (); void maybe_set_tc_format (); - int add_locked (boost::shared_ptr); + int add_locked (std::shared_ptr); double compute_matching_master_speed (pframes_t nframes, samplepos_t, bool& locate_required); - int set_current_locked (boost::shared_ptr); + int set_current_locked (std::shared_ptr); PBD::ScopedConnection config_connection; void parameter_changed (std::string const & what); diff --git a/libs/ardour/ardour/transpose.h b/libs/ardour/ardour/transpose.h index 64b50278c4..c4a8af6c4b 100644 --- a/libs/ardour/ardour/transpose.h +++ b/libs/ardour/ardour/transpose.h @@ -32,7 +32,7 @@ public: Transpose (int semitones); - Command* operator() (boost::shared_ptr model, + Command* operator() (std::shared_ptr model, Temporal::Beats position, std::vector& seqs); diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h index 95981c339d..89f4ca0c23 100644 --- a/libs/ardour/ardour/triggerbox.h +++ b/libs/ardour/ardour/triggerbox.h @@ -79,7 +79,7 @@ LIBARDOUR_API std::string cue_marker_name (int32_t); class Trigger; -typedef boost::shared_ptr TriggerPtr; +typedef std::shared_ptr TriggerPtr; class LIBARDOUR_API Trigger : public PBD::Stateful { public: @@ -315,10 +315,10 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { bool active() const { return _state >= Running; } State state() const { return _state; } - void set_region (boost::shared_ptr, bool use_thread = true); + void set_region (std::shared_ptr, bool use_thread = true); void clear_region (); - virtual int set_region_in_worker_thread (boost::shared_ptr) = 0; - boost::shared_ptr region() const { return _region; } + virtual int set_region_in_worker_thread (std::shared_ptr) = 0; + std::shared_ptr region() const { return _region; } uint32_t index() const { return _index; } @@ -421,7 +421,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { UIRequests() : stop (false) {} }; - boost::shared_ptr _region; + std::shared_ptr _region; samplecnt_t process_index; samplepos_t final_processed_sample; /* where we stop playing, in process time, compare with process_index */ UIState ui_state; @@ -472,7 +472,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { std::atomic last_property_generation; void when_stopped_during_run (BufferSet& bufs, pframes_t dest_offset); - void set_region_internal (boost::shared_ptr); + void set_region_internal (std::shared_ptr); virtual void retrigger(); virtual void _startup (BufferSet&, pframes_t dest_offset, Temporal::BBT_Offset const &); @@ -513,7 +513,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger { void io_change (); bool probably_oneshot () const; - int set_region_in_worker_thread (boost::shared_ptr); + int set_region_in_worker_thread (std::shared_ptr); void jump_start (); void jump_stop (BufferSet& bufs, pframes_t dest_offset); @@ -556,7 +556,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger { virtual void setup_stretcher (); void drop_data (); - int load_data (boost::shared_ptr); + int load_data (std::shared_ptr); void estimate_tempo (); void reset_stretcher (); void _startup (BufferSet&, pframes_t dest_offset, Temporal::BBT_Offset const &); @@ -589,7 +589,7 @@ class LIBARDOUR_API MIDITrigger : public Trigger { void tempo_map_changed(); void estimate_midi_patches (); - int set_region_in_worker_thread (boost::shared_ptr); + int set_region_in_worker_thread (std::shared_ptr); void jump_start (); void shutdown (BufferSet& bufs, pframes_t dest_offset); void jump_stop (BufferSet& bufs, pframes_t dest_offset); @@ -638,11 +638,11 @@ class LIBARDOUR_API MIDITrigger : public Trigger { Temporal::BBT_Offset _start_offset; Temporal::BBT_Offset _legato_offset; - boost::shared_ptr model; + std::shared_ptr model; MidiModel::const_iterator iter; bool map_change; - int load_data (boost::shared_ptr); + int load_data (std::shared_ptr); void compute_and_set_length (); void _startup (BufferSet&, pframes_t dest_offset, Temporal::BBT_Offset const &); }; @@ -655,7 +655,7 @@ class LIBARDOUR_API TriggerBoxThread static void init_request_pool() { Request::init_pool(); } - void set_region (TriggerBox&, uint32_t slot, boost::shared_ptr); + void set_region (TriggerBox&, uint32_t slot, std::shared_ptr); void request_delete_trigger (Trigger* t); void summon(); @@ -680,7 +680,7 @@ class LIBARDOUR_API TriggerBoxThread /* for set region */ TriggerBox* box; uint32_t slot; - boost::shared_ptr region; + std::shared_ptr region; /* for DeleteTrigger */ Trigger* trigger; @@ -756,11 +756,11 @@ class LIBARDOUR_API TriggerBox : public Processor XMLNode& get_state () const; int set_state (const XMLNode&, int version); - void deep_sources (std::set>&); - void used_regions (std::set>&); + void deep_sources (std::set>&); + void used_regions (std::set>&); void set_from_path (uint32_t slot, std::string const & path); - void set_from_selection (uint32_t slot, boost::shared_ptr); + void set_from_selection (uint32_t slot, std::shared_ptr); DataType data_type() const { return _data_type; } @@ -788,13 +788,13 @@ class LIBARDOUR_API TriggerBox : public Processor TriggerPtr peek_next_trigger (); void request_reload (int32_t slot, void*); - void set_region (uint32_t slot, boost::shared_ptr region); + void set_region (uint32_t slot, std::shared_ptr region); void non_realtime_transport_stop (samplepos_t now, bool flush); void non_realtime_locate (samplepos_t now); void realtime_handle_transport_stopped (); - void enqueue_trigger_state_for_region (boost::shared_ptr, boost::shared_ptr); + void enqueue_trigger_state_for_region (std::shared_ptr, std::shared_ptr); void tempo_map_changed (); @@ -938,7 +938,7 @@ class LIBARDOUR_API TriggerBox : public Processor static PBD::ScopedConnection midi_input_connection; static void input_port_check (); static PBD::ScopedConnectionList static_connections; - static boost::shared_ptr current_input; + static std::shared_ptr current_input; static bool _learning; static std::pair learning_for; @@ -958,7 +958,7 @@ public: TriggerReference () : box (0), slot (0) {} TriggerReference (ARDOUR::TriggerBox& b, uint32_t s) : box (&b), slot (s) {} - boost::shared_ptr trigger() const { assert (box); return box->trigger (slot); } + std::shared_ptr trigger() const { assert (box); return box->trigger (slot); } ARDOUR::TriggerBox* box; uint32_t slot; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 3718df4ab8..c6c5a74110 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -98,9 +98,9 @@ static const layer_t max_layer = UINT32_MAX; // a set of (time) intervals: first of pair is the offset of the start within the region, second is the offset of the end typedef std::list > AudioIntervalResult; // associate a set of intervals with regions (e.g. for silence detection) -typedef std::map,AudioIntervalResult> AudioIntervalMap; +typedef std::map,AudioIntervalResult> AudioIntervalMap; -typedef std::list > RegionList; +typedef std::list > RegionList; struct IOChange { @@ -620,7 +620,7 @@ enum ShuttleUnits { Semitones }; -typedef std::vector > SourceList; +typedef std::vector > SourceList; enum SrcQuality { SrcBest, @@ -633,23 +633,23 @@ enum SrcQuality { typedef std::list AnalysisFeatureList; typedef std::vector XrunPositions; -typedef std::list > RouteList; -typedef std::list > GraphNodeList; -typedef std::list > StripableList; -typedef std::list > WeakRouteList; -typedef std::list > WeakStripableList; -typedef std::list > ControlList; -typedef std::list > WeakControlList; -typedef std::list > SlavableControlList; +typedef std::list > RouteList; +typedef std::list > GraphNodeList; +typedef std::list > StripableList; +typedef std::list > WeakRouteList; +typedef std::list > WeakStripableList; +typedef std::list > ControlList; +typedef std::list > WeakControlList; +typedef std::list > SlavableControlList; typedef std::set AutomationTypeSet; -typedef std::list > VCAList; +typedef std::list > VCAList; class Bundle; -typedef std::vector > BundleList; +typedef std::vector > BundleList; class IOPlug; -typedef std::vector > IOPlugList; +typedef std::vector > IOPlugList; enum RegionEquivalence { Exact, diff --git a/libs/ardour/ardour/unknown_processor.h b/libs/ardour/ardour/unknown_processor.h index 7239c25aa3..56dd4080ce 100644 --- a/libs/ardour/ardour/unknown_processor.h +++ b/libs/ardour/ardour/unknown_processor.h @@ -62,7 +62,7 @@ private: ChanCount* saved_output; void add_sidechain_from_xml (const XMLNode& node, int version); - boost::shared_ptr _sidechain; + std::shared_ptr _sidechain; }; } diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index d729d6a736..c044975a4e 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -112,11 +112,11 @@ LIBARDOUR_API uint32_t how_many_dsp_threads (); LIBARDOUR_API std::string compute_sha1_of_file (std::string path); -template boost::shared_ptr route_list_to_control_list (boost::shared_ptr rl, boost::shared_ptr (Stripable::*get_control)() const) { - boost::shared_ptr cl (new ControlList); +template std::shared_ptr route_list_to_control_list (std::shared_ptr rl, std::shared_ptr (Stripable::*get_control)() const) { + std::shared_ptr cl (new ControlList); if (!rl) { return cl; } for (RouteList::const_iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr ac = ((*r).get()->*get_control)(); + std::shared_ptr ac = ((*r).get()->*get_control)(); if (ac) { cl->push_back (ac); } @@ -124,10 +124,10 @@ template boost::shared_ptr route_list_to_control_list ( return cl; } -template boost::shared_ptr stripable_list_to_control_list (StripableList& sl, boost::shared_ptr (Stripable::*get_control)() const) { - boost::shared_ptr cl (new ControlList); +template std::shared_ptr stripable_list_to_control_list (StripableList& sl, std::shared_ptr (Stripable::*get_control)() const) { + std::shared_ptr cl (new ControlList); for (StripableList::const_iterator s = sl.begin(); s != sl.end(); ++s) { - boost::shared_ptr ac = ((*s).get()->*get_control)(); + std::shared_ptr ac = ((*s).get()->*get_control)(); if (ac) { cl->push_back (ac); } diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 394ac98401..15c05a4bd1 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -65,9 +65,9 @@ class LIBARDOUR_API VCA : public Stripable, /* Slavable API */ - void assign (boost::shared_ptr); + void assign (std::shared_ptr); - bool slaved_to (boost::shared_ptr) const; + bool slaved_to (std::shared_ptr) const; bool slaved () const; /* Soloable API */ @@ -104,83 +104,83 @@ class LIBARDOUR_API VCA : public Stripable, static int32_t get_next_vca_number (); static void set_next_vca_number (int32_t); - boost::shared_ptr gain_control() const { return _gain_control; } - boost::shared_ptr solo_control() const { return _solo_control; } - boost::shared_ptr mute_control() const { return _mute_control; } + std::shared_ptr gain_control() const { return _gain_control; } + std::shared_ptr solo_control() const { return _solo_control; } + std::shared_ptr mute_control() const { return _mute_control; } /* null Stripable API, because VCAs don't have any of this */ - boost::shared_ptr solo_isolate_control() const { return boost::shared_ptr(); } - boost::shared_ptr solo_safe_control() const { return boost::shared_ptr(); } - boost::shared_ptr peak_meter() { return boost::shared_ptr(); } - boost::shared_ptr peak_meter() const { return boost::shared_ptr(); } - boost::shared_ptr phase_control() const { return boost::shared_ptr(); } - boost::shared_ptr trim_control() const { return boost::shared_ptr(); } - boost::shared_ptr pan_azimuth_control() const { return boost::shared_ptr(); } - boost::shared_ptr pan_elevation_control() const { return boost::shared_ptr(); } - boost::shared_ptr pan_width_control() const { return boost::shared_ptr(); } - boost::shared_ptr pan_frontback_control() const { return boost::shared_ptr(); } - boost::shared_ptr pan_lfe_control() const { return boost::shared_ptr(); } - boost::shared_ptr tape_drive_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr tape_drive_mode_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr tape_drive_mtr_controllable () const { return boost::shared_ptr(); } + std::shared_ptr solo_isolate_control() const { return std::shared_ptr(); } + std::shared_ptr solo_safe_control() const { return std::shared_ptr(); } + std::shared_ptr peak_meter() { return std::shared_ptr(); } + std::shared_ptr peak_meter() const { return std::shared_ptr(); } + std::shared_ptr phase_control() const { return std::shared_ptr(); } + std::shared_ptr trim_control() const { return std::shared_ptr(); } + std::shared_ptr pan_azimuth_control() const { return std::shared_ptr(); } + std::shared_ptr pan_elevation_control() const { return std::shared_ptr(); } + std::shared_ptr pan_width_control() const { return std::shared_ptr(); } + std::shared_ptr pan_frontback_control() const { return std::shared_ptr(); } + std::shared_ptr pan_lfe_control() const { return std::shared_ptr(); } + std::shared_ptr tape_drive_controllable () const { return std::shared_ptr(); } + std::shared_ptr tape_drive_mode_controllable () const { return std::shared_ptr(); } + std::shared_ptr tape_drive_mtr_controllable () const { return std::shared_ptr(); } uint32_t eq_band_cnt () const { return 0; } std::string eq_band_name (uint32_t) const { return std::string(); } - boost::shared_ptr eq_enable_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr eq_gain_controllable (uint32_t) const { return boost::shared_ptr(); } - boost::shared_ptr eq_freq_controllable (uint32_t) const { return boost::shared_ptr(); } - boost::shared_ptr eq_q_controllable (uint32_t) const { return boost::shared_ptr(); } - boost::shared_ptr eq_shape_controllable (uint32_t) const { return boost::shared_ptr(); } - boost::shared_ptr filter_freq_controllable (bool) const { return boost::shared_ptr(); } - boost::shared_ptr filter_slope_controllable (bool) const { return boost::shared_ptr(); } - boost::shared_ptr filter_enable_controllable (bool) const { return boost::shared_ptr(); } - boost::shared_ptr comp_enable_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_threshold_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_speed_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_mode_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_makeup_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_ratio_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_attack_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_release_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_key_filter_freq_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_lookahead_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_meter_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr comp_redux_controllable () const { return boost::shared_ptr(); } + std::shared_ptr eq_enable_controllable () const { return std::shared_ptr(); } + std::shared_ptr eq_gain_controllable (uint32_t) const { return std::shared_ptr(); } + std::shared_ptr eq_freq_controllable (uint32_t) const { return std::shared_ptr(); } + std::shared_ptr eq_q_controllable (uint32_t) const { return std::shared_ptr(); } + std::shared_ptr eq_shape_controllable (uint32_t) const { return std::shared_ptr(); } + std::shared_ptr filter_freq_controllable (bool) const { return std::shared_ptr(); } + std::shared_ptr filter_slope_controllable (bool) const { return std::shared_ptr(); } + std::shared_ptr filter_enable_controllable (bool) const { return std::shared_ptr(); } + std::shared_ptr comp_enable_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_threshold_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_speed_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_mode_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_makeup_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_ratio_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_attack_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_release_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_key_filter_freq_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_lookahead_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_meter_controllable () const { return std::shared_ptr(); } + std::shared_ptr comp_redux_controllable () const { return std::shared_ptr(); } - boost::shared_ptr gate_enable_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_mode_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_ratio_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_knee_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_threshold_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_depth_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_hysteresis_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_hold_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_attack_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_release_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_key_listen_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_key_filter_enable_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_key_filter_freq_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_lookahead_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_meter_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr gate_redux_controllable () const { return boost::shared_ptr(); } + std::shared_ptr gate_enable_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_mode_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_ratio_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_knee_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_threshold_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_depth_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_hysteresis_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_hold_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_attack_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_release_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_key_listen_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_key_filter_enable_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_key_filter_freq_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_lookahead_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_meter_controllable () const { return std::shared_ptr(); } + std::shared_ptr gate_redux_controllable () const { return std::shared_ptr(); } std::string tape_mode_name (uint32_t) const {return std::string("");} std::string gate_mode_name (uint32_t) const {return std::string("");} std::string comp_mode_name (uint32_t mode) const { return std::string(); } std::string comp_speed_name (uint32_t mode) const { return std::string(); } - boost::shared_ptr send_level_controllable (uint32_t n) const { return boost::shared_ptr(); } - boost::shared_ptr send_enable_controllable (uint32_t n) const { return boost::shared_ptr(); } - boost::shared_ptr send_pan_azimuth_controllable (uint32_t n) const { return boost::shared_ptr(); } - boost::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const { return boost::shared_ptr(); } + std::shared_ptr send_level_controllable (uint32_t n) const { return std::shared_ptr(); } + std::shared_ptr send_enable_controllable (uint32_t n) const { return std::shared_ptr(); } + std::shared_ptr send_pan_azimuth_controllable (uint32_t n) const { return std::shared_ptr(); } + std::shared_ptr send_pan_azimuth_enable_controllable (uint32_t n) const { return std::shared_ptr(); } std::string send_name (uint32_t n) const { return std::string(); } - boost::shared_ptr master_send_enable_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr monitor_control() const { return boost::shared_ptr(); } - boost::shared_ptr monitoring_control() const { return boost::shared_ptr(); } + std::shared_ptr master_send_enable_controllable () const { return std::shared_ptr(); } + std::shared_ptr monitor_control() const { return std::shared_ptr(); } + std::shared_ptr monitoring_control() const { return std::shared_ptr(); } //additional filter params (currently 32C only ) - boost::shared_ptr eq_lpf_controllable () const { return boost::shared_ptr(); } - boost::shared_ptr filter_enable_controllable () const { return boost::shared_ptr(); } + std::shared_ptr eq_lpf_controllable () const { return std::shared_ptr(); } + std::shared_ptr filter_enable_controllable () const { return std::shared_ptr(); } protected: SlavableControlList slavables () const; @@ -188,16 +188,16 @@ class LIBARDOUR_API VCA : public Stripable, private: int32_t _number; - boost::shared_ptr _gain_control; - boost::shared_ptr _solo_control; - boost::shared_ptr _mute_control; + std::shared_ptr _gain_control; + std::shared_ptr _solo_control; + std::shared_ptr _mute_control; static int32_t next_number; static Glib::Threads::Mutex number_lock; - void solo_target_going_away (boost::weak_ptr); - void mute_target_going_away (boost::weak_ptr); + void solo_target_going_away (std::weak_ptr); + void mute_target_going_away (std::weak_ptr); bool soloed_locked () const; bool muted_locked () const; }; diff --git a/libs/ardour/ardour/vca_manager.h b/libs/ardour/ardour/vca_manager.h index 41b98b3ab8..58b68981b3 100644 --- a/libs/ardour/ardour/vca_manager.h +++ b/libs/ardour/ardour/vca_manager.h @@ -45,10 +45,10 @@ public: ~VCAManager (); VCAList create_vca (uint32_t how_many, std::string const & name = std::string()); - void remove_vca (boost::shared_ptr); + void remove_vca (std::shared_ptr); - boost::shared_ptr vca_by_number(int32_t) const; - boost::shared_ptr vca_by_name (std::string const&) const; + std::shared_ptr vca_by_number(int32_t) const; + std::shared_ptr vca_by_name (std::string const&) const; VCAList vcas() const; VCAList::size_type n_vcas() const { return _vcas.size(); } diff --git a/libs/ardour/ardour/vst3_host.h b/libs/ardour/ardour/vst3_host.h index 5f58e50933..aa0b7c43d3 100644 --- a/libs/ardour/ardour/vst3_host.h +++ b/libs/ardour/ardour/vst3_host.h @@ -215,7 +215,7 @@ public: protected: char* _messageId; - boost::shared_ptr _attribute_list; + std::shared_ptr _attribute_list; }; class LIBARDOUR_API ConnectionProxy : public Vst::IConnectionPoint, public RefObject @@ -299,7 +299,7 @@ public: tresult PLUGIN_API createInstance (TUID cid, TUID _iid, void** obj) SMTG_OVERRIDE; protected: - boost::shared_ptr _plug_interface_support; + std::shared_ptr _plug_interface_support; }; class LIBARDOUR_LOCAL Vst3ParamValueQueue : public Vst::IParamValueQueue diff --git a/libs/ardour/ardour/vst3_module.h b/libs/ardour/ardour/vst3_module.h index 173d263803..c019a00d35 100644 --- a/libs/ardour/ardour/vst3_module.h +++ b/libs/ardour/ardour/vst3_module.h @@ -32,7 +32,7 @@ namespace ARDOUR { class LIBARDOUR_API VST3PluginModule { public: - static boost::shared_ptr load (std::string const& path); + static std::shared_ptr load (std::string const& path); VST3PluginModule () : _factory (0) {} virtual ~VST3PluginModule () {} diff --git a/libs/ardour/ardour/vst3_plugin.h b/libs/ardour/ardour/vst3_plugin.h index 4d1e457794..aad4694314 100644 --- a/libs/ardour/ardour/vst3_plugin.h +++ b/libs/ardour/ardour/vst3_plugin.h @@ -63,7 +63,7 @@ class LIBARDOUR_API VST3PI , public Presonus::IContextInfoProvider3 { public: - VST3PI (boost::shared_ptr m, std::string unique_id); + VST3PI (std::shared_ptr m, std::string unique_id); virtual ~VST3PI (); /* IComponentHandler */ @@ -132,7 +132,7 @@ public: bool set_program (int p, int32 sample_off); bool subscribe_to_automation_changes () const; - void automation_state_changed (uint32_t, ARDOUR::AutoState, boost::weak_ptr); + void automation_state_changed (uint32_t, ARDOUR::AutoState, std::weak_ptr); ARDOUR::Plugin::IOPortDescription describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const; @@ -243,15 +243,15 @@ private: void stripable_property_changed (PBD::PropertyChange const&); bool setup_psl_info_handler (); - void psl_subscribe_to (boost::shared_ptr, FIDString); + void psl_subscribe_to (std::shared_ptr, FIDString); void psl_stripable_property_changed (PBD::PropertyChange const&); void forward_signal (Presonus::IContextInfoHandler2*, FIDString) const; - boost::shared_ptr _module; + std::shared_ptr _module; - boost::shared_ptr _component_cproxy; - boost::shared_ptr _controller_cproxy; + std::shared_ptr _component_cproxy; + std::shared_ptr _controller_cproxy; FUID _fuid; Vst::IComponent* _component; @@ -371,7 +371,7 @@ public: IOPortDescription describe_io_port (DataType dt, bool input, uint32_t id) const; PluginOutputConfiguration possible_output () const; - void set_automation_control (uint32_t, boost::shared_ptr); + void set_automation_control (uint32_t, std::shared_ptr); std::string state_node_name () const { @@ -399,8 +399,8 @@ public: void set_owner (ARDOUR::SessionObject* o); - void add_slave (boost::shared_ptr, bool); - void remove_slave (boost::shared_ptr); + void add_slave (std::shared_ptr, bool); + void remove_slave (std::shared_ptr); int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, @@ -456,7 +456,7 @@ public: bool is_instrument () const; PBD::Searchpath preset_search_path () const; - boost::shared_ptr m; + std::shared_ptr m; }; #if defined(__clang__) diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index e080d1b8ec..5f1686d39f 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -66,12 +66,12 @@ AudioPlaylist::AudioPlaylist (Session& session, string name, bool hidden) { } -AudioPlaylist::AudioPlaylist (boost::shared_ptr other, string name, bool hidden) +AudioPlaylist::AudioPlaylist (std::shared_ptr other, string name, bool hidden) : Playlist (other, name, hidden) { } -AudioPlaylist::AudioPlaylist (boost::shared_ptr other, timepos_t const & start, timepos_t const & cnt, string name, bool hidden) +AudioPlaylist::AudioPlaylist (std::shared_ptr other, timepos_t const & start, timepos_t const & cnt, string name, bool hidden) : Playlist (other, start, cnt, name, hidden) { RegionReadLock rlock2 (const_cast (other.get())); @@ -88,7 +88,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, time RegionList::iterator ours = regions.begin (); for (auto const & r : other->regions) { - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); assert (region); samplecnt_t fade_in = 64; @@ -137,7 +137,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, time break; } - boost::shared_ptr our_region = boost::dynamic_pointer_cast (*ours); + std::shared_ptr our_region = std::dynamic_pointer_cast (*ours); assert (our_region); our_region->set_fade_in_length (fade_in); @@ -152,7 +152,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, time /** Sort by descending layer and then by ascending position */ struct ReadSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + bool operator() (std::shared_ptr a, std::shared_ptr b) { if (a->layer() != b->layer()) { return a->layer() > b->layer(); } @@ -163,9 +163,9 @@ struct ReadSorter { /** A segment of region that needs to be read */ struct Segment { - Segment (boost::shared_ptr r, Temporal::Range a) : region (r), range (a) {} + Segment (std::shared_ptr r, Temporal::Range a) : region (r), range (a) {} - boost::shared_ptr region; ///< the region + std::shared_ptr region; ///< the region Temporal::Range range; ///< range of the region to read, in session samples }; @@ -204,7 +204,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, ti /* Find all the regions that are involved in the bit we are reading, and sort them by descending layer and ascending position. */ - boost::shared_ptr all = regions_touched_locked (start, start + cnt); + std::shared_ptr all = regions_touched_locked (start, start + cnt); all->sort (ReadSorter ()); /* This will be a list of the bits of our read range that we have @@ -218,7 +218,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, ti /* Now go through the `all' list filling in `to_do' and `done' */ for (RegionList::iterator i = all->begin(); i != all->end(); ++i) { - boost::shared_ptr ar = boost::dynamic_pointer_cast (*i); + std::shared_ptr ar = std::dynamic_pointer_cast (*i); /* muted regions don't figure into it at all */ if (ar->muted()) { @@ -297,7 +297,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, ti void AudioPlaylist::dump () const { - boost::shared_ptrr; + std::shared_ptrr; cerr << "Playlist \"" << _name << "\" " << endl << regions.size() << " regions " @@ -316,9 +316,9 @@ AudioPlaylist::dump () const } bool -AudioPlaylist::destroy_region (boost::shared_ptr region) +AudioPlaylist::destroy_region (std::shared_ptr region) { - boost::shared_ptr r = boost::dynamic_pointer_cast (region); + std::shared_ptr r = std::dynamic_pointer_cast (region); if (!r) { return false; @@ -342,9 +342,9 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) i = tmp; } - for (set >::iterator x = all_regions.begin(); x != all_regions.end(); ) { + for (set >::iterator x = all_regions.begin(); x != all_regions.end(); ) { - set >::iterator xtmp = x; + set >::iterator xtmp = x; ++xtmp; if ((*x) == region) { @@ -355,7 +355,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) x = xtmp; } - region->set_playlist (boost::shared_ptr()); + region->set_playlist (std::shared_ptr()); } if (changed) { @@ -367,7 +367,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr region) } bool -AudioPlaylist::region_changed (const PropertyChange& what_changed, boost::shared_ptr region) +AudioPlaylist::region_changed (const PropertyChange& what_changed, std::shared_ptr region) { if (in_flush || in_set_state) { return false; @@ -399,14 +399,14 @@ AudioPlaylist::region_changed (const PropertyChange& what_changed, boost::shared } void -AudioPlaylist::pre_combine (vector >& copies) +AudioPlaylist::pre_combine (vector >& copies) { RegionSortByPosition cmp; - boost::shared_ptr ar; + std::shared_ptr ar; sort (copies.begin(), copies.end(), cmp); - ar = boost::dynamic_pointer_cast (copies.front()); + ar = std::dynamic_pointer_cast (copies.front()); /* disable fade in of the first region */ @@ -414,7 +414,7 @@ AudioPlaylist::pre_combine (vector >& copies) ar->set_fade_in_active (false); } - ar = boost::dynamic_pointer_cast (copies.back()); + ar = std::dynamic_pointer_cast (copies.back()); /* disable fade out of the last region */ @@ -424,19 +424,19 @@ AudioPlaylist::pre_combine (vector >& copies) } void -AudioPlaylist::post_combine (vector >& originals, boost::shared_ptr compound_region) +AudioPlaylist::post_combine (vector >& originals, std::shared_ptr compound_region) { RegionSortByPosition cmp; - boost::shared_ptr ar; - boost::shared_ptr cr; + std::shared_ptr ar; + std::shared_ptr cr; - if ((cr = boost::dynamic_pointer_cast (compound_region)) == 0) { + if ((cr = std::dynamic_pointer_cast (compound_region)) == 0) { return; } sort (originals.begin(), originals.end(), cmp); - ar = boost::dynamic_pointer_cast (originals.front()); + ar = std::dynamic_pointer_cast (originals.front()); /* copy the fade in of the first into the compound region */ @@ -444,7 +444,7 @@ AudioPlaylist::post_combine (vector >& originals, boos cr->set_fade_in (ar->fade_in()); } - ar = boost::dynamic_pointer_cast (originals.back()); + ar = std::dynamic_pointer_cast (originals.back()); if (ar) { /* copy the fade out of the last into the compound region */ @@ -453,11 +453,11 @@ AudioPlaylist::post_combine (vector >& originals, boos } void -AudioPlaylist::pre_uncombine (vector >& originals, boost::shared_ptr compound_region) +AudioPlaylist::pre_uncombine (vector >& originals, std::shared_ptr compound_region) { RegionSortByPosition cmp; - boost::shared_ptr ar; - boost::shared_ptr cr = boost::dynamic_pointer_cast(compound_region); + std::shared_ptr ar; + std::shared_ptr cr = std::dynamic_pointer_cast(compound_region); if (!cr) { return; @@ -469,9 +469,9 @@ AudioPlaylist::pre_uncombine (vector >& originals, boo * done within Playlist::uncombine () */ - for (vector >::iterator i = originals.begin(); i != originals.end(); ++i) { + for (vector >::iterator i = originals.begin(); i != originals.end(); ++i) { - if ((ar = boost::dynamic_pointer_cast (*i)) == 0) { + if ((ar = std::dynamic_pointer_cast (*i)) == 0) { continue; } @@ -540,7 +540,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) continue; } - boost::shared_ptr in = region_by_id (PBD::ID (p->value ())); + std::shared_ptr in = region_by_id (PBD::ID (p->value ())); if (!in) { warning << string_compose (_("Legacy crossfade involved an incoming region not present in playlist \"%1\" - crossfade discarded"), @@ -549,14 +549,14 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) continue; } - boost::shared_ptr in_a = boost::dynamic_pointer_cast (in); + std::shared_ptr in_a = std::dynamic_pointer_cast (in); assert (in_a); if ((p = (*i)->property (X_("out"))) == 0) { continue; } - boost::shared_ptr out = region_by_id (PBD::ID (p->value ())); + std::shared_ptr out = region_by_id (PBD::ID (p->value ())); if (!out) { warning << string_compose (_("Legacy crossfade involved an outgoing region not present in playlist \"%1\" - crossfade discarded"), @@ -565,7 +565,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) continue; } - boost::shared_ptr out_a = boost::dynamic_pointer_cast (out); + std::shared_ptr out_a = std::dynamic_pointer_cast (out); assert (out_a); /* now decide whether to add a fade in or fade out diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc index 974a6f272a..597f861f9d 100644 --- a/libs/ardour/audio_playlist_importer.cc +++ b/libs/ardour/audio_playlist_importer.cc @@ -88,7 +88,7 @@ void AudioPlaylistImportHandler::playlists_by_diskstream (PBD::ID const & id, PlaylistList & list) const { for (ElementList::const_iterator it = elements.begin(); it != elements.end(); ++it) { - boost::shared_ptr pl = boost::dynamic_pointer_cast (*it); + std::shared_ptr pl = std::dynamic_pointer_cast (*it); if (pl && pl->orig_diskstream() == id) { list.push_back (PlaylistPtr (new AudioPlaylistImporter (*pl))); } @@ -201,7 +201,7 @@ AudioPlaylistImporter::_cancel_move () void AudioPlaylistImporter::_move () { - boost::shared_ptr playlist; + std::shared_ptr playlist; // Update diskstream id xml_playlist.property ("orig-diskstream-id")->set_value (diskstream_id.to_s()); @@ -259,7 +259,7 @@ AudioPlaylistImporter::populate_region_list () ElementImportHandler::ElementList elements; handler.get_regions (orig_node, elements); for (ElementImportHandler::ElementList::iterator it = elements.begin(); it != elements.end(); ++it) { - regions.push_back (boost::dynamic_pointer_cast (*it)); + regions.push_back (std::dynamic_pointer_cast (*it)); } } diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc index 3f6d5f7913..08676a4cf9 100644 --- a/libs/ardour/audio_playlist_source.cc +++ b/libs/ardour/audio_playlist_source.cc @@ -44,7 +44,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr p, +AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std::string& name, std::shared_ptr p, uint32_t chn, timepos_t const & begin, timepos_t const & len, Source::Flag flags) : Source (s, DataType::AUDIO, name) , PlaylistSource (s, orig, name, p, DataType::AUDIO, begin, len, flags) @@ -141,7 +141,7 @@ AudioPlaylistSource::read_unlocked (Sample* dst, samplepos_t start, samplecnt_t boost::scoped_array sbuf(new float[to_read]); boost::scoped_array gbuf(new gain_t[to_read]); - boost::dynamic_pointer_cast(_playlist)->read (dst, sbuf.get(), gbuf.get(), timepos_t (start)+_playlist_offset, timecnt_t (to_read), _playlist_channel); + std::dynamic_pointer_cast(_playlist)->read (dst, sbuf.get(), gbuf.get(), timepos_t (start)+_playlist_offset, timecnt_t (to_read), _playlist_channel); if (to_zero) { memset (dst+to_read, 0, sizeof (Sample) * to_zero); @@ -173,8 +173,8 @@ AudioPlaylistSource::n_channels () const return 1; } - boost::shared_ptr r = _playlist->region_list_property().front (); - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr r = _playlist->region_list_property().front (); + std::shared_ptr ar = std::dynamic_pointer_cast (r); return ar->audio_source()->n_channels (); } @@ -188,8 +188,8 @@ AudioPlaylistSource::sample_rate () const _session.sample_rate (); } - boost::shared_ptr r = _playlist->region_list_property().front (); - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr r = _playlist->region_list_property().front (); + std::shared_ptr ar = std::dynamic_pointer_cast (r); return ar->audio_source()->sample_rate (); } diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index 3fb2bdf189..a850fd7a8e 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -84,12 +84,12 @@ AudioRegionImportHandler::check_source (string const & filename) const } void -AudioRegionImportHandler::add_source (string const & filename, boost::shared_ptr const & source) +AudioRegionImportHandler::add_source (string const & filename, std::shared_ptr const & source) { sources.insert (SourcePair (filename, source)); } -boost::shared_ptr const & +std::shared_ptr const & AudioRegionImportHandler::get_source (string const & filename) const { return (sources.find (filename))->second; @@ -312,7 +312,7 @@ AudioRegionImporter::prepare_region () } // create region and update XML - boost::shared_ptr r = RegionFactory::create (source_list, xml_region); + std::shared_ptr r = RegionFactory::create (source_list, xml_region); if (session.config.get_glue_new_regions_to_bars_and_beats ()) { r->set_position_time_domain (Temporal::BeatTime); } diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 11480eb183..14d775cbe8 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -152,14 +152,14 @@ AudioTrack::set_state_part_two () } _freeze_record.processor_info.clear (); - boost::shared_ptr freeze_pl; + std::shared_ptr freeze_pl; if ((prop = fnode->property (X_("playlist-id"))) != 0) { freeze_pl = _session.playlists()->by_id (prop->value()); } else if ((prop = fnode->property (X_("playlist"))) != 0) { freeze_pl = _session.playlists()->by_name (prop->value()); } if (freeze_pl) { - _freeze_record.playlist = boost::dynamic_pointer_cast (freeze_pl); + _freeze_record.playlist = std::dynamic_pointer_cast (freeze_pl); _freeze_record.playlist->use(); } else { _freeze_record.playlist.reset (); @@ -182,7 +182,7 @@ AudioTrack::set_state_part_two () } FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()), - boost::shared_ptr()); + std::shared_ptr()); frii->id = prop->value (); _freeze_record.processor_info.push_back (frii); } @@ -206,7 +206,7 @@ AudioTrack::get_input_monitoring_state (bool recording, bool talkback) const int AudioTrack::export_stuff (BufferSet& buffers, samplepos_t start, samplecnt_t nframes, - boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, MidiNoteTracker& /* ignored, this is audio */) { boost::scoped_array gain_buffer (new gain_t[nframes]); @@ -214,7 +214,7 @@ AudioTrack::export_stuff (BufferSet& buffers, samplepos_t start, samplecnt_t nfr Glib::Threads::RWLock::ReaderLock rlock (_processor_lock); - boost::shared_ptr apl = boost::dynamic_pointer_cast(playlist()); + std::shared_ptr apl = std::dynamic_pointer_cast(playlist()); assert(apl); assert(buffers.count().n_audio() >= 1); @@ -246,7 +246,7 @@ AudioTrack::export_stuff (BufferSet& buffers, samplepos_t start, samplecnt_t nfr } bool -AudioTrack::bounceable (boost::shared_ptr endpoint, bool include_endpoint) const +AudioTrack::bounceable (std::shared_ptr endpoint, bool include_endpoint) const { if (!endpoint && !include_endpoint) { /* no processing - just read from the playlist and create new @@ -276,7 +276,7 @@ AudioTrack::bounceable (boost::shared_ptr endpoint, bool include_endp continue; } - if (boost::dynamic_pointer_cast(*r)) { + if (std::dynamic_pointer_cast(*r)) { continue; } @@ -306,34 +306,34 @@ AudioTrack::bounceable (boost::shared_ptr endpoint, bool include_endp return true; } -boost::shared_ptr +std::shared_ptr AudioTrack::bounce (InterThreadInfo& itt, std::string const& name) { return bounce_range (_session.current_start_sample(), _session.current_end_sample(), itt, main_outs(), false, name); } -boost::shared_ptr +std::shared_ptr AudioTrack::bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, std::string const& name) { - vector > srcs; + vector > srcs; return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false, false, name); } void AudioTrack::freeze_me (InterThreadInfo& itt) { - vector > srcs; + vector > srcs; string new_playlist_name; - boost::shared_ptr new_playlist; + std::shared_ptr new_playlist; string dir; string region_name; - if ((_freeze_record.playlist = boost::dynamic_pointer_cast(playlist())) == 0) { + if ((_freeze_record.playlist = std::dynamic_pointer_cast(playlist())) == 0) { return; } @@ -361,7 +361,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) return; } - boost::shared_ptr res; + std::shared_ptr res; if ((res = _session.write_one_track (*this, _session.current_start_sample(), _session.current_end_sample(), true, srcs, itt, main_outs(), false, false, true, "")) == 0) { @@ -375,7 +375,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) { - if (boost::dynamic_pointer_cast(*r)) { + if (std::dynamic_pointer_cast(*r)) { continue; } @@ -390,7 +390,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) _freeze_record.processor_info.push_back (frii); /* now deactivate the processor, */ - if (!boost::dynamic_pointer_cast(*r) && *r != _disk_reader && *r != main_outs()) { + if (!std::dynamic_pointer_cast(*r) && *r != _disk_reader && *r != main_outs()) { (*r)->deactivate (); } @@ -413,7 +413,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) plist.add (Properties::name, region_name); plist.add (Properties::whole_file, true); - boost::shared_ptr region (RegionFactory::create (srcs, plist, false)); + std::shared_ptr region (RegionFactory::create (srcs, plist, false)); new_playlist->set_orig_track_id (id()); @@ -429,7 +429,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) new_playlist->set_frozen (true); region->set_locked (true); - use_playlist (DataType::AUDIO, boost::dynamic_pointer_cast(new_playlist)); + use_playlist (DataType::AUDIO, std::dynamic_pointer_cast(new_playlist)); _disk_writer->set_record_enabled (false); _freeze_record.playlist->use(); // prevent deletion @@ -477,7 +477,7 @@ AudioTrack::unfreeze () FreezeChange (); /* EMIT SIGNAL */ } -boost::shared_ptr +std::shared_ptr AudioTrack::write_source (uint32_t n) { assert (_disk_writer); diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc index 2e15cb3cb8..0fcdd59243 100644 --- a/libs/ardour/audio_track_importer.cc +++ b/libs/ardour/audio_track_importer.cc @@ -283,7 +283,7 @@ AudioTrackImporter::_move () #if 0 /* Add diskstream */ - boost::shared_ptr ds_node_list; + std::shared_ptr ds_node_list; string xpath = "/Session/DiskStreams/AudioDiskstream[@id='" + old_ds_id.to_s() + "']"; ds_node_list = source.find (xpath); @@ -292,12 +292,12 @@ AudioTrackImporter::_move () return; } - boost::shared_ptr ds_node = ds_node_list->front(); + std::shared_ptr ds_node = ds_node_list->front(); XMLProperty * p = ds_node->property (X_("id")); assert (p); p->set_value (new_ds_id.to_s()); - boost::shared_ptr new_ds (new DiskReader (session, *ds_node)); + std::shared_ptr new_ds (new DiskReader (session, *ds_node)); new_ds->set_name (name); new_ds->do_refill_with_alloc (true, false); new_ds->set_block_size (session.get_block_size ()); diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index b24af85f8d..4f71c90b37 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -355,7 +355,7 @@ Boolean ComponentAndDescriptionMatch_Loosely(ArdourComponent inComponent, const } -AUPlugin::AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr _comp) +AUPlugin::AUPlugin (AudioEngine& engine, Session& session, std::shared_ptr _comp) : Plugin (engine, session) , comp (_comp) , unit (new CAAudioUnit) @@ -1124,7 +1124,7 @@ AUPlugin::match_variable_io (ChanCount& in, ChanCount& aux_in, ChanCount& out) /* preferred setting (provided by plugin_insert) */ const int32_t preferred_out = out.n_audio (); - AUPluginInfoPtr pinfo = boost::dynamic_pointer_cast(get_info()); + AUPluginInfoPtr pinfo = std::dynamic_pointer_cast(get_info()); vector > io_configs = pinfo->io_configs; #ifndef NDEBUG @@ -2294,7 +2294,7 @@ AUPlugin::find_presets () PluginInfoPtr nfo = get_info(); find_files_matching_filter (preset_files, preset_search_path, au_preset_filter, - boost::dynamic_pointer_cast (nfo).get(), + std::dynamic_pointer_cast (nfo).get(), true, true, true); if (preset_files.empty()) { @@ -2351,7 +2351,7 @@ AUPlugin::has_editor () const /* ****************************************************************************/ -AUPluginInfo::AUPluginInfo (boost::shared_ptr d) +AUPluginInfo::AUPluginInfo (std::shared_ptr d) : version (0) , max_outputs (0) , descriptor (d) @@ -2366,7 +2366,7 @@ AUPluginInfo::load (Session& session) PluginPtr plugin; DEBUG_TRACE (DEBUG::AudioUnitConfig, "load AU as a component\n"); - boost::shared_ptr comp (new CAComponent(*descriptor)); + std::shared_ptr comp (new CAComponent(*descriptor)); if (!comp->IsValid()) { error << ("AudioUnit: not a valid Component") << endmsg; @@ -2378,7 +2378,7 @@ AUPluginInfo::load (Session& session) AUPluginInfo *aup = new AUPluginInfo (*this); DEBUG_TRACE (DEBUG::AudioUnitConfig, string_compose ("plugin info for %1 = %2\n", this, aup)); plugin->set_info (PluginInfoPtr (aup)); - boost::dynamic_pointer_cast (plugin)->set_fixed_size_buffers (aup->creator == "Universal Audio"); + std::dynamic_pointer_cast (plugin)->set_fixed_size_buffers (aup->creator == "Universal Audio"); return plugin; } @@ -2392,10 +2392,10 @@ std::vector AUPluginInfo::get_presets (bool user_only) const { std::vector p; - boost::shared_ptr comp; + std::shared_ptr comp; try { - comp = boost::shared_ptr(new CAComponent(*descriptor)); + comp = std::shared_ptr(new CAComponent(*descriptor)); if (!comp->IsValid()) { throw failed_constructor(); } @@ -2438,7 +2438,7 @@ AUPluginInfo::get_presets (bool user_only) const UInt32 dataSize; Boolean isWritable; - boost::shared_ptr unit (new CAAudioUnit); + std::shared_ptr unit (new CAAudioUnit); if (noErr != CAAudioUnit::Open (*(comp.get()), *unit)) { return p; } @@ -2526,7 +2526,7 @@ AUPlugin::set_info (PluginInfoPtr info) { Plugin::set_info (info); - AUPluginInfoPtr pinfo = boost::dynamic_pointer_cast(get_info()); + AUPluginInfoPtr pinfo = std::dynamic_pointer_cast(get_info()); _has_midi_input = pinfo->needs_midi_input (); _has_midi_output = false; } diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index e1a6659bea..6861087bd8 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -148,7 +148,7 @@ AudioEngine::split_cycle (pframes_t nframes) { /* caller must hold process lock */ - boost::shared_ptr p = _ports.reader(); + std::shared_ptr p = _ports.reader(); /* This is mainly for the benefit of rt-control ports (MTC, MClk) * @@ -997,13 +997,13 @@ AudioEngine::drop_backend () } } -boost::shared_ptr +std::shared_ptr AudioEngine::set_backend (const std::string& name, const std::string& arg1, const std::string& arg2) { BackendMap::iterator b = _backends.find (name); if (b == _backends.end()) { - return boost::shared_ptr(); + return std::shared_ptr(); } drop_backend (); @@ -1017,7 +1017,7 @@ AudioEngine::set_backend (const std::string& name, const std::string& arg1, cons } catch (exception& e) { error << string_compose (_("Could not create backend for %1: %2"), name, e.what()) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } return _backend; diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 35f280d1d2..c2ed5f1594 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -80,18 +80,18 @@ namespace ARDOUR { PBD::PropertyDescriptor fade_in_active; PBD::PropertyDescriptor fade_out_active; PBD::PropertyDescriptor scale_amplitude; - PBD::PropertyDescriptor > fade_in; - PBD::PropertyDescriptor > inverse_fade_in; - PBD::PropertyDescriptor > fade_out; - PBD::PropertyDescriptor > inverse_fade_out; - PBD::PropertyDescriptor > envelope; + PBD::PropertyDescriptor > fade_in; + PBD::PropertyDescriptor > inverse_fade_in; + PBD::PropertyDescriptor > fade_out; + PBD::PropertyDescriptor > inverse_fade_out; + PBD::PropertyDescriptor > envelope; } } /* Curve manipulations */ static void -reverse_curve (boost::shared_ptr dst, boost::shared_ptr src) +reverse_curve (std::shared_ptr dst, std::shared_ptr src) { const timepos_t end = src->when(false); // TODO read-lock of src (!) @@ -104,7 +104,7 @@ reverse_curve (boost::shared_ptr dst, boost::shared_ptr dst, boost::shared_ptr src) +generate_inverse_power_curve (std::shared_ptr dst, std::shared_ptr src) { // calc inverse curve using sum of squares for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); ++it ) { @@ -116,7 +116,7 @@ generate_inverse_power_curve (boost::shared_ptr dst, boost: } static void -generate_db_fade (boost::shared_ptr dst, double len, int num_steps, float dB_drop) +generate_db_fade (std::shared_ptr dst, double len, int num_steps, float dB_drop) { dst->clear (); dst->fast_simple_add (timepos_t (Temporal::AudioTime), 1); @@ -133,9 +133,9 @@ generate_db_fade (boost::shared_ptr dst, double len, int nu } static void -merge_curves (boost::shared_ptr dst, - boost::shared_ptr curve1, - boost::shared_ptr curve2) +merge_curves (std::shared_ptr dst, + std::shared_ptr curve1, + std::shared_ptr curve2) { Evoral::ControlList::EventList::size_type size = curve1->size(); @@ -212,10 +212,10 @@ AudioRegion::register_properties () , _fade_in_active (Properties::fade_in_active, true) \ , _fade_out_active (Properties::fade_out_active, true) \ , _scale_amplitude (Properties::scale_amplitude, 1.0) \ - , _fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) \ - , _inverse_fade_in (Properties::inverse_fade_in, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) \ - , _fade_out (Properties::fade_out, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation), Temporal::AudioTime))) \ - , _inverse_fade_out (Properties::inverse_fade_out, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation), Temporal::AudioTime))) + , _fade_in (Properties::fade_in, std::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) \ + , _inverse_fade_in (Properties::inverse_fade_in, std::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) \ + , _fade_out (Properties::fade_out, std::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation), Temporal::AudioTime))) \ + , _inverse_fade_out (Properties::inverse_fade_out, std::shared_ptr (new AutomationList (Evoral::Parameter (FadeOutAutomation), Temporal::AudioTime))) #define AUDIOREGION_COPY_STATE(other) \ _envelope_active (Properties::envelope_active, other->_envelope_active) \ @@ -224,10 +224,10 @@ AudioRegion::register_properties () , _fade_in_active (Properties::fade_in_active, other->_fade_in_active) \ , _fade_out_active (Properties::fade_out_active, other->_fade_out_active) \ , _scale_amplitude (Properties::scale_amplitude, other->_scale_amplitude) \ - , _fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_fade_in.val()))) \ - , _inverse_fade_in (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_inverse_fade_in.val()))) \ - , _fade_out (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_fade_out.val()))) \ - , _inverse_fade_out (Properties::fade_in, boost::shared_ptr (new AutomationList (*other->_inverse_fade_out.val()))) + , _fade_in (Properties::fade_in, std::shared_ptr (new AutomationList (*other->_fade_in.val()))) \ + , _inverse_fade_in (Properties::fade_in, std::shared_ptr (new AutomationList (*other->_inverse_fade_in.val()))) \ + , _fade_out (Properties::fade_in, std::shared_ptr (new AutomationList (*other->_fade_out.val()))) \ + , _inverse_fade_out (Properties::fade_in, std::shared_ptr (new AutomationList (*other->_inverse_fade_out.val()))) /* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */ void @@ -249,7 +249,7 @@ AudioRegion::init () AudioRegion::AudioRegion (Session& s, timepos_t const & start, timecnt_t const & len, std::string name) : Region (s, start, len, name, DataType::AUDIO) , AUDIOREGION_STATE_DEFAULT - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) , _automatable (s, Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -262,7 +262,7 @@ AudioRegion::AudioRegion (Session& s, timepos_t const & start, timecnt_t const AudioRegion::AudioRegion (const SourceList& srcs) : Region (srcs) , AUDIOREGION_STATE_DEFAULT - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList (Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) , _automatable(srcs[0]->session(), Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -271,13 +271,13 @@ AudioRegion::AudioRegion (const SourceList& srcs) assert (_sources.size() == _master_sources.size()); } -AudioRegion::AudioRegion (boost::shared_ptr other) +AudioRegion::AudioRegion (std::shared_ptr other) : Region (other) , AUDIOREGION_COPY_STATE (other) /* As far as I can see, the _envelope's times are relative to region position, and have nothing * to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val(), timepos_t (Temporal::AudioTime), other->len_as_tpos ()))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList (*other->_envelope.val(), timepos_t (Temporal::AudioTime), other->len_as_tpos ()))) , _automatable (other->session(), Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -293,13 +293,13 @@ AudioRegion::AudioRegion (boost::shared_ptr other) assert (_sources.size() == _master_sources.size()); } -AudioRegion::AudioRegion (boost::shared_ptr other, timecnt_t const & offset) +AudioRegion::AudioRegion (std::shared_ptr other, timecnt_t const & offset) : Region (other, offset) , AUDIOREGION_COPY_STATE (other) /* As far as I can see, the _envelope's times are relative to region position, and have nothing to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val(), timepos_t (offset.samples()), other->len_as_tpos ()))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList (*other->_envelope.val(), timepos_t (offset.samples()), other->len_as_tpos ()))) , _automatable (other->session(), Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -315,10 +315,10 @@ AudioRegion::AudioRegion (boost::shared_ptr other, timecnt_t assert (_sources.size() == _master_sources.size()); } -AudioRegion::AudioRegion (boost::shared_ptr other, const SourceList& srcs) - : Region (boost::static_pointer_cast(other), srcs) +AudioRegion::AudioRegion (std::shared_ptr other, const SourceList& srcs) + : Region (std::static_pointer_cast(other), srcs) , AUDIOREGION_COPY_STATE (other) - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList (*other->_envelope.val()))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList (*other->_envelope.val()))) , _automatable (other->session(), Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -337,7 +337,7 @@ AudioRegion::AudioRegion (boost::shared_ptr other, const Sour AudioRegion::AudioRegion (SourceList& srcs) : Region (srcs) , AUDIOREGION_STATE_DEFAULT - , _envelope (Properties::envelope, boost::shared_ptr (new AutomationList(Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) + , _envelope (Properties::envelope, std::shared_ptr (new AutomationList(Evoral::Parameter(EnvelopeAutomation), Temporal::AudioTime))) , _automatable(srcs[0]->session(), Temporal::AudioTime) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -393,7 +393,7 @@ AudioRegion::connect_to_analysis_changed () void AudioRegion::connect_to_header_position_offset_changed () { - set > unique_srcs; + set > unique_srcs; for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { @@ -402,7 +402,7 @@ AudioRegion::connect_to_header_position_offset_changed () if (unique_srcs.find (*i) == unique_srcs.end ()) { unique_srcs.insert (*i); - boost::shared_ptr afs = boost::dynamic_pointer_cast (*i); + std::shared_ptr afs = std::dynamic_pointer_cast (*i); if (afs) { afs->HeaderPositionOffsetChanged.connect_same_thread (*this, boost::bind (&AudioRegion::source_offset_changed, this)); } @@ -528,7 +528,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, return 0; /* read nothing */ } - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (!pl){ return 0; } @@ -761,7 +761,7 @@ AudioRegion::read_from_sources (SourceList const & srcs, samplecnt_t limit, Samp if (chan_n < n_channels()) { - boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[chan_n]); + std::shared_ptr src = std::dynamic_pointer_cast (srcs[chan_n]); if (src->read (buf, _start.val().samples() + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ @@ -778,7 +778,7 @@ AudioRegion::read_from_sources (SourceList const & srcs, samplecnt_t limit, Samp /* copy an existing channel's data in for this non-existant one */ uint32_t channel = chan_n % n_channels(); - boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[channel]); + std::shared_ptr src = std::dynamic_pointer_cast (srcs[channel]); if (src->read (buf, _start.val().samples() + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ @@ -864,7 +864,7 @@ int AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send) { const XMLNodeList& nlist = node.children(); - boost::shared_ptr the_playlist (_playlist.lock()); + std::shared_ptr the_playlist (_playlist.lock()); suspend_property_changes (); @@ -1023,7 +1023,7 @@ AudioRegion::set_fade_out_shape (FadeShape shape) } void -AudioRegion::set_fade_in (boost::shared_ptr f) +AudioRegion::set_fade_in (std::shared_ptr f) { _fade_in->freeze (); *(_fade_in.val()) = *f; @@ -1037,9 +1037,9 @@ void AudioRegion::set_fade_in (FadeShape shape, samplecnt_t len) { const ARDOUR::ParameterDescriptor desc(FadeInAutomation); - boost::shared_ptr c1 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); - boost::shared_ptr c2 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); - boost::shared_ptr c3 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); + std::shared_ptr c1 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); + std::shared_ptr c2 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); + std::shared_ptr c3 (new Evoral::ControlList (FadeInAutomation, desc, Temporal::AudioTime)); _fade_in->freeze (); _fade_in->clear (); @@ -1106,7 +1106,7 @@ AudioRegion::set_fade_in (FadeShape shape, samplecnt_t len) } void -AudioRegion::set_fade_out (boost::shared_ptr f) +AudioRegion::set_fade_out (std::shared_ptr f) { _fade_out->freeze (); *(_fade_out.val()) = *f; @@ -1120,8 +1120,8 @@ void AudioRegion::set_fade_out (FadeShape shape, samplecnt_t len) { const ARDOUR::ParameterDescriptor desc(FadeOutAutomation); - boost::shared_ptr c1 (new Evoral::ControlList (FadeOutAutomation, desc, Temporal::AudioTime)); - boost::shared_ptr c2 (new Evoral::ControlList (FadeOutAutomation, desc, Temporal::AudioTime)); + std::shared_ptr c1 (new Evoral::ControlList (FadeOutAutomation, desc, Temporal::AudioTime)); + std::shared_ptr c2 (new Evoral::ControlList (FadeOutAutomation, desc, Temporal::AudioTime)); _fade_out->freeze (); _fade_out->clear (); @@ -1362,7 +1362,7 @@ AudioRegion::recompute_at_start () } int -AudioRegion::separate_by_channel (vector >& v) const +AudioRegion::separate_by_channel (vector >& v) const { SourceList srcs; string new_name; @@ -1415,7 +1415,7 @@ AudioRegion::read_raw_internal (Sample* buf, samplepos_t pos, samplecnt_t cnt, i void AudioRegion::set_scale_amplitude (gain_t g) { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); _scale_amplitude = g; @@ -1641,14 +1641,14 @@ AudioRegion::source_offset_changed () return; } - boost::shared_ptr afs = boost::dynamic_pointer_cast(_sources.front()); + std::shared_ptr afs = std::dynamic_pointer_cast(_sources.front()); } -boost::shared_ptr +std::shared_ptr AudioRegion::audio_source (uint32_t n) const { // Guaranteed to succeed (use a static cast for speed?) - return boost::dynamic_pointer_cast(source(n)); + return std::dynamic_pointer_cast(source(n)); } void @@ -1759,7 +1759,7 @@ AudioRegion::build_transients () _transients.clear (); _transient_analysis_start = _transient_analysis_end = 0; - boost::shared_ptr pl = playlist(); + std::shared_ptr pl = playlist(); if (!pl) { return; @@ -1873,7 +1873,7 @@ in this and future transient-detection operations.\n\ void AudioRegion::get_transients (AnalysisFeatureList& results) { - boost::shared_ptr pl = playlist(); + std::shared_ptr pl = playlist(); if (!playlist ()) { return; } @@ -1980,19 +1980,19 @@ AudioRegion::body_range () const return Temporal::Range ((position() + _fade_in->back()->when).increment(), end().earlier (_fade_out->back()->when)); } -boost::shared_ptr +std::shared_ptr AudioRegion::get_single_other_xfade_region (bool start) const { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (!pl) { /* not currently in a playlist - xfade length is unbounded (and irrelevant) */ - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr rl; + std::shared_ptr rl; if (start) { rl = pl->regions_at (position()); @@ -2001,7 +2001,7 @@ AudioRegion::get_single_other_xfade_region (bool start) const } RegionList::iterator i; - boost::shared_ptr other; + std::shared_ptr other; uint32_t n = 0; /* count and find the other region in a single pass through the list */ @@ -2015,7 +2015,7 @@ AudioRegion::get_single_other_xfade_region (bool start) const if (n != 2) { /* zero or multiple regions stacked here - don't care about xfades */ - return boost::shared_ptr (); + return std::shared_ptr (); } return other; @@ -2030,7 +2030,7 @@ AudioRegion::verify_xfade_bounds (samplecnt_t len, bool start) equal to @a len itself. */ - boost::shared_ptr other = get_single_other_xfade_region (start); + std::shared_ptr other = get_single_other_xfade_region (start); samplecnt_t maxlen; if (!other) { @@ -2067,7 +2067,7 @@ AudioRegion::do_export (std::string const& path) const assert (!path.empty ()); assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)); - typedef boost::shared_ptr> FloatWriterPtr; + typedef std::shared_ptr> FloatWriterPtr; FloatWriterPtr sfw; try { sfw.reset (new AudioGrapher::SndfileWriter (path, format, n_chn, audio_source ()->sample_rate (), 0)); diff --git a/libs/ardour/audiorom.cc b/libs/ardour/audiorom.cc index a4f54ea195..81b9811ac4 100644 --- a/libs/ardour/audiorom.cc +++ b/libs/ardour/audiorom.cc @@ -34,10 +34,10 @@ AudioRom::AudioRom (Sample* rom, size_t size) memcpy (_rom, rom, sizeof (Sample) * _size); } -boost::shared_ptr +std::shared_ptr AudioRom::new_rom (Sample* rom, size_t size) { - return boost::shared_ptr (new AudioRom (rom, size)); + return std::shared_ptr (new AudioRom (rom, size)); } AudioRom::~AudioRom () diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index a3a382177a..7bb0cef36e 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -151,9 +151,9 @@ Auditioner::load_synth () unload_synth (true); - boost::shared_ptr p = audition_synth_info->load (_session); + std::shared_ptr p = audition_synth_info->load (_session); if (p) { - asynth = boost::shared_ptr (new PluginInsert (_session, time_domain(), p)); + asynth = std::shared_ptr (new PluginInsert (_session, time_domain(), p)); } if (asynth) { @@ -245,8 +245,8 @@ Auditioner::connect () /* reconnect existing ports */ - boost::shared_ptr oleft (_output->nth (0)); - boost::shared_ptr oright (_output->nth (1)); + std::shared_ptr oleft (_output->nth (0)); + std::shared_ptr oright (_output->nth (1)); if (oleft) { oleft->connect (left); } @@ -313,7 +313,7 @@ Auditioner::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_s } for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*i); + std::shared_ptr d = std::dynamic_pointer_cast (*i); if (d) { d->flush_buffers (nframes); } @@ -363,7 +363,7 @@ Auditioner::update_controls (BufferSet const& bufs) } void -Auditioner::audition_region (boost::shared_ptr region, bool loop) +Auditioner::audition_region (std::shared_ptr region, bool loop) { if (g_atomic_int_get (&_auditioning)) { /* don't go via session for this, because we are going @@ -376,7 +376,7 @@ Auditioner::audition_region (boost::shared_ptr region, bool loop) Glib::Threads::Mutex::Lock lm (lock); - if (boost::dynamic_pointer_cast(region) != 0) { + if (std::dynamic_pointer_cast(region) != 0) { _midi_audition = false; @@ -387,7 +387,7 @@ Auditioner::audition_region (boost::shared_ptr region, bool loop) /* copy it */ - the_region = boost::dynamic_pointer_cast (RegionFactory::create (region, false)); + the_region = std::dynamic_pointer_cast (RegionFactory::create (region, false)); the_region->set_position (timepos_t (Temporal::AudioTime)); _disk_reader->midi_playlist()->drop_regions (); @@ -406,14 +406,14 @@ Auditioner::audition_region (boost::shared_ptr region, bool loop) } } - } else if (boost::dynamic_pointer_cast(region)) { + } else if (std::dynamic_pointer_cast(region)) { _midi_audition = true; the_region.reset(); _import_position = region->position(); /* copy it */ - midi_region = (boost::dynamic_pointer_cast (RegionFactory::create (region, false))); + midi_region = (std::dynamic_pointer_cast (RegionFactory::create (region, false))); midi_region->set_position (_import_position); /* avoid truncated notes: round up the length of midi regions to seconds, at least 2 seconds long */ @@ -619,7 +619,7 @@ Auditioner::idle_synth_update () if (auditioning() || !asynth) { return; } - auto pi = boost::dynamic_pointer_cast (asynth); + auto pi = std::dynamic_pointer_cast (asynth); /* Note: calling thread must have process buffers */ BufferSet bufs; diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index e01732ae94..344a7dbdcb 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -76,7 +76,7 @@ Automatable::Automatable (const Automatable& other) Glib::Threads::Mutex::Lock lm (other._control_lock); for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) { - boost::shared_ptr ac (control_factory (i->first)); + std::shared_ptr ac (control_factory (i->first)); add_control (ac); } } @@ -85,14 +85,14 @@ Automatable::~Automatable () { { RCUWriter writer (_automated_controls); - boost::shared_ptr cl = writer.get_copy (); + std::shared_ptr cl = writer.get_copy (); cl->clear (); } _automated_controls.flush (); Glib::Threads::Mutex::Lock lm (_control_lock); for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { - boost::dynamic_pointer_cast(li->second)->drop_references (); + std::dynamic_pointer_cast(li->second)->drop_references (); } } @@ -145,7 +145,7 @@ Automatable::load_automation (const string& path) Evoral::Parameter param(PluginAutomation, 0, port); /* FIXME: this is legacy and only used for plugin inserts? I think? */ - boost::shared_ptr c = control (param, true); + std::shared_ptr c = control (param, true); c->list()->add (when, value); tosave.insert (param); } @@ -159,13 +159,13 @@ bad: } void -Automatable::add_control(boost::shared_ptr ac) +Automatable::add_control(std::shared_ptr ac) { Evoral::Parameter param = ac->parameter(); - boost::shared_ptr al = boost::dynamic_pointer_cast (ac->list ()); + std::shared_ptr al = std::dynamic_pointer_cast (ac->list ()); - boost::shared_ptr actl (boost::dynamic_pointer_cast (ac)); + std::shared_ptr actl (std::dynamic_pointer_cast (ac)); if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) { al->automation_state_changed.connect_same_thread ( @@ -278,7 +278,7 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le } if (_can_automate_list.find (param) == _can_automate_list.end ()) { - boost::shared_ptr actl = automation_control (param); + std::shared_ptr actl = automation_control (param); if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) { actl->clear_flag (Controllable::NotAutomatable); if (!(actl->flags() & Controllable::HiddenControl) && actl->name() != X_("hidden")) { @@ -292,14 +292,14 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le } - boost::shared_ptr existing = automation_control (param); + std::shared_ptr existing = automation_control (param); if (existing) { existing->alist()->set_state (**niter, Stateful::loading_state_version); } else { - boost::shared_ptr newcontrol = control_factory(param); + std::shared_ptr newcontrol = control_factory(param); add_control (newcontrol); - boost::shared_ptr al (new AutomationList(**niter, param)); + std::shared_ptr al (new AutomationList(**niter, param)); newcontrol->set_list(al); } @@ -322,7 +322,7 @@ Automatable::get_automation_xml_state () const } for (Controls::const_iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr l = boost::dynamic_pointer_cast(li->second->list()); + std::shared_ptr l = std::dynamic_pointer_cast(li->second->list()); if (l) { node->add_child_nocopy (l->get_state ()); } @@ -336,7 +336,7 @@ Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState { Glib::Threads::Mutex::Lock lm (control_lock()); - boost::shared_ptr c = automation_control (param, true); + std::shared_ptr c = automation_control (param, true); if (c && (s != c->automation_state())) { c->set_automation_state (s); @@ -350,7 +350,7 @@ Automatable::get_parameter_automation_state (Evoral::Parameter param) { AutoState result = Off; - boost::shared_ptr c = automation_control(param); + std::shared_ptr c = automation_control(param); if (c) { result = c->automation_state(); @@ -367,8 +367,8 @@ Automatable::protect_automation () for (ParameterSet::const_iterator i = automated_params.begin(); i != automated_params.end(); ++i) { - boost::shared_ptr c = control(*i); - boost::shared_ptr l = boost::dynamic_pointer_cast(c->list()); + std::shared_ptr c = control(*i); + std::shared_ptr l = std::dynamic_pointer_cast(c->list()); switch (l->automation_state()) { case Write: @@ -392,11 +392,11 @@ Automatable::non_realtime_locate (samplepos_t now) for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr c - = boost::dynamic_pointer_cast(li->second); + std::shared_ptr c + = std::dynamic_pointer_cast(li->second); if (c) { - boost::shared_ptr l - = boost::dynamic_pointer_cast(c->list()); + std::shared_ptr l + = std::dynamic_pointer_cast(c->list()); if (!l) { continue; @@ -435,14 +435,14 @@ void Automatable::non_realtime_transport_stop (samplepos_t now, bool /*flush_processors*/) { for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr c = - boost::dynamic_pointer_cast(li->second); + std::shared_ptr c = + std::dynamic_pointer_cast(li->second); if (!c) { continue; } - boost::shared_ptr l = - boost::dynamic_pointer_cast(c->list()); + std::shared_ptr l = + std::dynamic_pointer_cast(c->list()); if (!l) { continue; } @@ -476,7 +476,7 @@ void Automatable::automation_run (samplepos_t start, pframes_t nframes, bool only_active) { if (only_active) { - boost::shared_ptr cl = _automated_controls.reader (); + std::shared_ptr cl = _automated_controls.reader (); for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { (*ci)->automation_run (start, nframes); } @@ -484,8 +484,8 @@ Automatable::automation_run (samplepos_t start, pframes_t nframes, bool only_act } for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr c = - boost::dynamic_pointer_cast(li->second); + std::shared_ptr c = + std::dynamic_pointer_cast(li->second); if (!c) { continue; } @@ -497,11 +497,11 @@ void Automatable::automation_list_automation_state_changed (Evoral::Parameter const& param, AutoState as) { { - boost::shared_ptr c (automation_control(param)); + std::shared_ptr c (automation_control(param)); assert (c && c->list()); RCUWriter writer (_automated_controls); - boost::shared_ptr cl = writer.get_copy (); + std::shared_ptr cl = writer.get_copy (); ControlList::iterator fi = std::find (cl->begin(), cl->end(), c); if (fi != cl->end()) { @@ -522,13 +522,13 @@ Automatable::automation_list_automation_state_changed (Evoral::Parameter const& _automated_controls.flush(); } -boost::shared_ptr +std::shared_ptr Automatable::control_factory(const Evoral::Parameter& param) { Evoral::Control* control = NULL; bool make_list = true; ParameterDescriptor desc(param); - boost::shared_ptr list; + std::shared_ptr list; if (parameter_is_midi (param.type())) { MidiTrack* mt = dynamic_cast(this); @@ -552,7 +552,7 @@ Automatable::control_factory(const Evoral::Parameter& param) if (!Variant::type_is_numeric(desc.datatype)) { make_list = false; // Can't automate non-numeric data yet } else { - list = boost::shared_ptr(new AutomationList(param, desc, Temporal::AudioTime)); + list = std::shared_ptr(new AutomationList(param, desc, Temporal::AudioTime)); } control = new PluginInsert::PluginPropertyControl(pi, param, desc, list); } @@ -600,52 +600,52 @@ Automatable::control_factory(const Evoral::Parameter& param) } if (make_list && !list) { - list = boost::shared_ptr(new AutomationList(param, desc, time_domain())); + list = std::shared_ptr(new AutomationList(param, desc, time_domain())); } if (!control) { control = new AutomationControl(_a_session, param, desc, list); } - return boost::shared_ptr(control); + return std::shared_ptr(control); } void Automatable::automatables (ControllableSet& s) const { for (auto const& i : _controls) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (i.second); + std::shared_ptr ac = std::dynamic_pointer_cast (i.second); if (ac) { s.insert (ac); } } } -boost::shared_ptr +std::shared_ptr Automatable::automation_control (PBD::ID const & id) const { Controls::const_iterator li; for (li = _controls.begin(); li != _controls.end(); ++li) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (li->second); + std::shared_ptr ac = std::dynamic_pointer_cast (li->second); if (ac && (ac->id() == id)) { return ac; } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Automatable::automation_control (const Evoral::Parameter& id, bool create) { - return boost::dynamic_pointer_cast(Evoral::ControlSet::control(id, create)); + return std::dynamic_pointer_cast(Evoral::ControlSet::control(id, create)); } -boost::shared_ptr +std::shared_ptr Automatable::automation_control (const Evoral::Parameter& id) const { - return boost::dynamic_pointer_cast(Evoral::ControlSet::control(id)); + return std::dynamic_pointer_cast(Evoral::ControlSet::control(id)); } void @@ -661,7 +661,7 @@ Automatable::find_next_event (timepos_t const & start, timepos_t const & end, Ev next_event.when = start <= end ? timepos_t::max (start.time_domain()) : timepos_t (start.time_domain()); if (only_active) { - boost::shared_ptr cl = _automated_controls.reader (); + std::shared_ptr cl = _automated_controls.reader (); for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { if ((*ci)->automation_playback()) { if (start <= end) { @@ -673,8 +673,8 @@ Automatable::find_next_event (timepos_t const & start, timepos_t const & end, Ev } } else { for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { - boost::shared_ptr c - = boost::dynamic_pointer_cast(li->second); + std::shared_ptr c + = std::dynamic_pointer_cast(li->second); if (c) { if (start <= end) { find_next_ac_event (c, start, end, next_event); @@ -688,18 +688,18 @@ Automatable::find_next_event (timepos_t const & start, timepos_t const & end, Ev } void -Automatable::find_next_ac_event (boost::shared_ptr c, timepos_t const & start, timepos_t const & end, Evoral::ControlEvent& next_event) const +Automatable::find_next_ac_event (std::shared_ptr c, timepos_t const & start, timepos_t const & end, Evoral::ControlEvent& next_event) const { assert (start <= end); - boost::shared_ptr sc - = boost::dynamic_pointer_cast(c); + std::shared_ptr sc + = std::dynamic_pointer_cast(c); if (sc) { sc->find_next_event (start, end, next_event); } - boost::shared_ptr alist (c->list()); + std::shared_ptr alist (c->list()); Evoral::ControlEvent cp (start, 0.0f); if (!alist) { return; @@ -715,17 +715,17 @@ Automatable::find_next_ac_event (boost::shared_ptr c, timepos } void -Automatable::find_prev_ac_event (boost::shared_ptr c, timepos_t const & start, timepos_t const & end, Evoral::ControlEvent& next_event) const +Automatable::find_prev_ac_event (std::shared_ptr c, timepos_t const & start, timepos_t const & end, Evoral::ControlEvent& next_event) const { assert (start > end); - boost::shared_ptr sc - = boost::dynamic_pointer_cast(c); + std::shared_ptr sc + = std::dynamic_pointer_cast(c); if (sc) { sc->find_next_event (start, end, next_event); } - boost::shared_ptr alist (c->list()); + std::shared_ptr alist (c->list()); if (!alist) { return; } diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index 951557ac3f..446d50b0ac 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -50,7 +50,7 @@ using namespace PBD; AutomationControl::AutomationControl(ARDOUR::Session& session, const Evoral::Parameter& parameter, const ParameterDescriptor& desc, - boost::shared_ptr list, + std::shared_ptr list, const string& name, Controllable::Flag flags) @@ -63,7 +63,7 @@ AutomationControl::AutomationControl(ARDOUR::Session& s if (_desc.toggled) { set_flags (Controllable::Toggle); } - boost::shared_ptr al = alist(); + std::shared_ptr al = alist(); if (al) { al->StateChanged.connect_same_thread (_state_changed_connection, boost::bind (&Session::set_dirty, &_session)); } @@ -88,7 +88,7 @@ AutomationControl::session_going_away () bool AutomationControl::writable() const { - boost::shared_ptr al = alist(); + std::shared_ptr al = alist(); if (al) { return al->automation_state() != Play; } @@ -147,7 +147,7 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi } if (_group && _group->use_me (gcd)) { - _group->set_group_value (boost::dynamic_pointer_cast(shared_from_this()), val); + _group->set_group_value (std::dynamic_pointer_cast(shared_from_this()), val); } else { actually_set_value (val, gcd); } @@ -191,7 +191,7 @@ AutomationControl::automation_run (samplepos_t start, pframes_t nframes) void AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) { - boost::shared_ptr al = alist (); + std::shared_ptr al = alist (); const samplepos_t pos = _session.transport_sample(); bool to_list; @@ -235,7 +235,7 @@ AutomationControl::actually_set_value (double value, PBD::Controllable::GroupCon } void -AutomationControl::set_list (boost::shared_ptr list) +AutomationControl::set_list (std::shared_ptr list) { Control::set_list (list); Changed (true, Controllable::NoGroup); @@ -254,7 +254,7 @@ AutomationControl::set_automation_state (AutoState as) alist()->set_automation_state (as); if (as == Write) { - AutomationWatch::instance().add_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().add_automation_watch (std::dynamic_pointer_cast(shared_from_this())); } else if (as & (Touch | Latch)) { if (alist()->empty()) { if (alist()->time_domain() == Temporal::AudioTime) { @@ -267,17 +267,17 @@ AutomationControl::set_automation_state (AutoState as) Changed (true, Controllable::NoGroup); } if (!touching()) { - AutomationWatch::instance().remove_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().remove_automation_watch (std::dynamic_pointer_cast(shared_from_this())); } else { /* this seems unlikely, but the combination of * a control surface and the mouse could make * it possible to put the control into Touch * mode *while* touching it. */ - AutomationWatch::instance().add_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().add_automation_watch (std::dynamic_pointer_cast(shared_from_this())); } } else { - AutomationWatch::instance().remove_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().remove_automation_watch (std::dynamic_pointer_cast(shared_from_this())); Changed (false, Controllable::NoGroup); } } @@ -290,7 +290,7 @@ AutomationControl::start_touch (timepos_t const & when) return; } - ControlTouched (boost::dynamic_pointer_cast(shared_from_this())); /* EMIT SIGNAL */ + ControlTouched (std::dynamic_pointer_cast(shared_from_this())); /* EMIT SIGNAL */ if (alist()->automation_state() & (Touch | Latch)) { /* subtle. aligns the user value with the playback and @@ -301,7 +301,7 @@ AutomationControl::start_touch (timepos_t const & when) */ AutomationControl::actually_set_value (get_value (), Controllable::NoGroup); alist()->start_touch (when); - AutomationWatch::instance().add_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().add_automation_watch (std::dynamic_pointer_cast(shared_from_this())); set_touching (true); } } @@ -325,7 +325,7 @@ AutomationControl::stop_touch (timepos_t const & when) if (alist()->automation_state() & (Touch | Latch)) { alist()->stop_touch (when); - AutomationWatch::instance().remove_automation_watch (boost::dynamic_pointer_cast(shared_from_this())); + AutomationWatch::instance().remove_automation_watch (std::dynamic_pointer_cast(shared_from_this())); } } @@ -371,7 +371,7 @@ AutomationControl::get_user_string () const } void -AutomationControl::set_group (boost::shared_ptr cg) +AutomationControl::set_group (std::shared_ptr cg) { /* this method can only be called by a ControlGroup. We do not need to ensure consistency by calling ControlGroup::remove_control(), @@ -387,7 +387,7 @@ AutomationControl::check_rt (double val, Controllable::GroupControlDisposition g { if (!_session.loading() && (flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) { /* queue change in RT context */ - _session.set_control (boost::dynamic_pointer_cast(shared_from_this()), val, gcd); + _session.set_control (std::dynamic_pointer_cast(shared_from_this()), val, gcd); return true; } diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 4791d3525a..29ff984eda 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -144,12 +144,12 @@ AutomationList::~AutomationList() delete _before; } -boost::shared_ptr +std::shared_ptr AutomationList::create(const Evoral::Parameter& id, const Evoral::ParameterDescriptor& desc, Temporal::TimeDomain time_domain) { - return boost::shared_ptr(new AutomationList(id, desc, time_domain)); + return std::shared_ptr(new AutomationList(id, desc, time_domain)); } void @@ -560,7 +560,7 @@ AutomationListProperty::clone () const { return new AutomationListProperty ( this->property_id(), - boost::shared_ptr (new AutomationList (*this->_old.get())), - boost::shared_ptr (new AutomationList (*this->_current.get())) + std::shared_ptr (new AutomationList (*this->_old.get())), + std::shared_ptr (new AutomationList (*this->_current.get())) ); } diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc index 4d27e539cf..beea168108 100644 --- a/libs/ardour/automation_watch.cc +++ b/libs/ardour/automation_watch.cc @@ -70,7 +70,7 @@ AutomationWatch::~AutomationWatch () } void -AutomationWatch::add_automation_watch (boost::shared_ptr ac) +AutomationWatch::add_automation_watch (std::shared_ptr ac) { Glib::Threads::Mutex::Lock lm (automation_watch_lock); DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation, astate = %2\n", ac->name(), enum_2_string (ac->automation_state()))); @@ -105,14 +105,14 @@ AutomationWatch::add_automation_watch (boost::shared_ptr ac) * explicit here, but it helps to remind us what is going on. */ - boost::weak_ptr wac (ac); + std::weak_ptr wac (ac); ac->DropReferences.connect_same_thread (automation_connections[ac], boost::bind (&AutomationWatch::remove_weak_automation_watch, this, wac)); } void -AutomationWatch::remove_weak_automation_watch (boost::weak_ptr wac) +AutomationWatch::remove_weak_automation_watch (std::weak_ptr wac) { - boost::shared_ptr ac = wac.lock(); + std::shared_ptr ac = wac.lock(); if (!ac) { return; @@ -122,7 +122,7 @@ AutomationWatch::remove_weak_automation_watch (boost::weak_ptr ac) +AutomationWatch::remove_automation_watch (std::shared_ptr ac) { Glib::Threads::Mutex::Lock lm (automation_watch_lock); DEBUG_TRACE (DEBUG::Automation, string_compose ("remove control %1 from automation watch\n", ac->name())); @@ -173,7 +173,7 @@ AutomationWatch::timer () for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) { if ((*aw)->alist()->automation_write()) { double val = (*aw)->get_double(); - boost::shared_ptr sc = boost::dynamic_pointer_cast (*aw); + std::shared_ptr sc = std::dynamic_pointer_cast (*aw); if (sc) { val = sc->reduce_by_masters (val, true); } diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index b165155e90..03d24b649d 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -57,7 +57,7 @@ Bundle::Bundle (std::string const & n, bool i) } -Bundle::Bundle (boost::shared_ptr other) +Bundle::Bundle (std::shared_ptr other) : _channel (other->_channel), _name (other->_name), _ports_are_inputs (other->_ports_are_inputs), @@ -303,7 +303,7 @@ Bundle::set_channel_name (uint32_t ch, std::string const & n) * and are named " ". */ void -Bundle::add_channels_from_bundle (boost::shared_ptr other) +Bundle::add_channels_from_bundle (std::shared_ptr other) { uint32_t const ch = n_total(); @@ -329,7 +329,7 @@ Bundle::add_channels_from_bundle (boost::shared_ptr other) * or require that the ChanCounts match exactly (default false). */ void -Bundle::connect (boost::shared_ptr other, AudioEngine & engine, +Bundle::connect (std::shared_ptr other, AudioEngine & engine, bool allow_partial) { ChanCount our_count = nchannels(); @@ -362,7 +362,7 @@ Bundle::connect (boost::shared_ptr other, AudioEngine & engine, } void -Bundle::disconnect (boost::shared_ptr other, AudioEngine & engine) +Bundle::disconnect (std::shared_ptr other, AudioEngine & engine) { ChanCount our_count = nchannels(); ChanCount other_count = other->nchannels(); @@ -451,7 +451,7 @@ Bundle::emit_changed (Change c) * @param exclusive: if true, additionally check if the bundle is connected * only to |other|, and return false if not. */ bool -Bundle::connected_to (boost::shared_ptr other, AudioEngine & engine, +Bundle::connected_to (std::shared_ptr other, AudioEngine & engine, DataType type, bool exclusive) { if (_ports_are_inputs == other->_ports_are_inputs) @@ -480,11 +480,11 @@ Bundle::connected_to (boost::shared_ptr other, AudioEngine & engine, for (Bundle::PortList::const_iterator j = our_ports.begin(); j != our_ports.end(); ++j) { - boost::shared_ptr p = engine.get_port_by_name(*j); + std::shared_ptr p = engine.get_port_by_name(*j); for (Bundle::PortList::const_iterator k = other_ports.begin(); k != other_ports.end(); ++k) { - boost::shared_ptr q = engine.get_port_by_name(*k); + std::shared_ptr q = engine.get_port_by_name(*k); if (!p && !q) { return false; @@ -564,7 +564,7 @@ Bundle::set_name (string const & n) * @return true if b has the same number of channels as this bundle, and those channels have corresponding ports. */ bool -Bundle::has_same_ports (boost::shared_ptr b) const +Bundle::has_same_ports (std::shared_ptr b) const { ChanCount our_count = nchannels(); ChanCount other_count = b->nchannels(); diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 3def1e7740..77142a9d36 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -237,14 +237,14 @@ Butler::thread_work () sampleoffset_t audition_seek; if (should_run && _session.is_auditioning () && (audition_seek = _session.the_auditioner ()->seek_sample ()) >= 0) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (_session.the_auditioner ()); + std::shared_ptr tr = std::dynamic_pointer_cast (_session.the_auditioner ()); DEBUG_TRACE (DEBUG::Butler, "seek the auditioner\n"); tr->seek (audition_seek); tr->do_refill (); _session.the_auditioner ()->seek_response (audition_seek); } - boost::shared_ptr rl = _session.get_routes (); + std::shared_ptr rl = _session.get_routes (); RouteList rl_with_auditioner = *rl; rl_with_auditioner.push_back (_session.the_auditioner ()); @@ -252,13 +252,13 @@ Butler::thread_work () DEBUG_TRACE (DEBUG::Butler, string_compose ("butler starts refill loop, twr = %1\n", transport_work_requested ())); for (i = rl_with_auditioner.begin (); !transport_work_requested () && should_run && i != rl_with_auditioner.end (); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; } - boost::shared_ptr io = tr->input (); + std::shared_ptr io = tr->input (); if (io && !io->active ()) { /* don't read inactive tracks */ @@ -334,14 +334,14 @@ Butler::thread_work () } bool -Butler::flush_tracks_to_disk_normal (boost::shared_ptr rl, uint32_t& errors) +Butler::flush_tracks_to_disk_normal (std::shared_ptr rl, uint32_t& errors) { bool disk_work_outstanding = false; for (RouteList::iterator i = rl->begin (); !transport_work_requested () && should_run && i != rl->end (); ++i) { // cerr << "write behind for " << (*i)->name () << endl; - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; diff --git a/libs/ardour/clip_library.cc b/libs/ardour/clip_library.cc index c0ba2dbc99..c036269c6c 100644 --- a/libs/ardour/clip_library.cc +++ b/libs/ardour/clip_library.cc @@ -103,7 +103,7 @@ ARDOUR::clip_library_dir (bool create_if_missing) } bool -ARDOUR::export_to_clip_library (boost::shared_ptr r, void* src) +ARDOUR::export_to_clip_library (std::shared_ptr r, void* src) { std::string const lib = clip_library_dir (true); if (lib.empty () || !r) { diff --git a/libs/ardour/control_group.cc b/libs/ardour/control_group.cc index f3677c1af5..1a743e680d 100644 --- a/libs/ardour/control_group.cc +++ b/libs/ardour/control_group.cc @@ -65,7 +65,7 @@ ControlGroup::clear () * don't deadlock. */ - std::vector > controls; + std::vector > controls; { Glib::Threads::RWLock::WriterLock lm (controls_lock); for (ControlMap::const_iterator i = _controls.begin(); i != _controls.end(); ++i) { @@ -75,8 +75,8 @@ ControlGroup::clear () _controls.clear (); - for (std::vector >::iterator c = controls.begin(); c != controls.end(); ++c) { - (*c)->set_group (boost::shared_ptr()); + for (std::vector >::iterator c = controls.begin(); c != controls.end(); ++c) { + (*c)->set_group (std::shared_ptr()); } } @@ -96,9 +96,9 @@ ControlGroup::controls () const } void -ControlGroup::control_going_away (boost::weak_ptr wac) +ControlGroup::control_going_away (std::weak_ptr wac) { - boost::shared_ptr ac (wac.lock()); + std::shared_ptr ac (wac.lock()); if (!ac) { return; } @@ -107,7 +107,7 @@ ControlGroup::control_going_away (boost::weak_ptr wac) } int -ControlGroup::remove_control (boost::shared_ptr ac) +ControlGroup::remove_control (std::shared_ptr ac) { int erased; @@ -117,7 +117,7 @@ ControlGroup::remove_control (boost::shared_ptr ac) } if (erased) { - ac->set_group (boost::shared_ptr()); + ac->set_group (std::shared_ptr()); } /* return zero if erased, non-zero otherwise */ @@ -125,7 +125,7 @@ ControlGroup::remove_control (boost::shared_ptr ac) } int -ControlGroup::add_control (boost::shared_ptr ac) +ControlGroup::add_control (std::shared_ptr ac) { if (ac->parameter() != _parameter) { if (_parameter.type () != PluginAutomation) { @@ -154,7 +154,7 @@ ControlGroup::add_control (boost::shared_ptr ac) ac->set_group (shared_from_this()); - ac->DropReferences.connect_same_thread (member_connections, boost::bind (&ControlGroup::control_going_away, this, boost::weak_ptr(ac))); + ac->DropReferences.connect_same_thread (member_connections, boost::bind (&ControlGroup::control_going_away, this, std::weak_ptr(ac))); return 0; } @@ -170,7 +170,7 @@ ControlGroup::pre_realtime_queue_stuff (double val) } void -ControlGroup::set_group_value (boost::shared_ptr control, double val) +ControlGroup::set_group_value (std::shared_ptr control, double val) { double old = control->get_value (); @@ -257,7 +257,7 @@ GainControlGroup::get_max_factor (gain_t factor) } void -GainControlGroup::set_group_value (boost::shared_ptr control, double val) +GainControlGroup::set_group_value (std::shared_ptr control, double val) { Glib::Threads::RWLock::ReaderLock lm (controls_lock); @@ -307,7 +307,7 @@ GainControlGroup::set_group_value (boost::shared_ptr control, continue; } - boost::shared_ptr gc = boost::dynamic_pointer_cast (c->second); + std::shared_ptr gc = std::dynamic_pointer_cast (c->second); if (gc) { gc->inc_gain (factor); diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 41a1679128..28971dbc79 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -113,7 +113,7 @@ ControlProtocolManager::set_session (Session* s) StripableNotificationListPtr v (new StripableNotificationList); for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) { if ((*i).stripable) { - v->push_back (boost::weak_ptr ((*i).stripable)); + v->push_back (std::weak_ptr ((*i).stripable)); } } if (!v->empty()) { diff --git a/libs/ardour/convolver.cc b/libs/ardour/convolver.cc index 2e2f18fa43..ee4fff453d 100644 --- a/libs/ardour/convolver.cc +++ b/libs/ardour/convolver.cc @@ -56,7 +56,7 @@ bool Convolution::add_impdata ( uint32_t c_in, uint32_t c_out, - boost::shared_ptr readable, + std::shared_ptr readable, float gain, uint32_t pre_delay, sampleoffset_t offset, @@ -246,7 +246,7 @@ Convolver::Convolver ( { _threaded = true; - std::vector > readables = AudioReadable::load (_session, path); + std::vector > readables = AudioReadable::load (_session, path); if (readables.empty ()) { PBD::error << string_compose (_("Convolver: IR \"%1\" no usable audio-channels sound."), path) << endmsg; @@ -308,7 +308,7 @@ Convolver::Convolver ( io_i = (c / n_outputs ()) % n_inputs (); } - boost::shared_ptr r = readables[ir_c]; + std::shared_ptr r = readables[ir_c]; assert (r->n_channels () == 1); const float chan_gain = _ir_settings.gain * _ir_settings.channel_gain[c]; diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 2946d4937e..9e5cff7b55 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -55,9 +55,9 @@ bool Delivery::panners_legal = false; /* deliver to an existing IO object */ -Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr pannable, - boost::shared_ptr mm, const string& name, Role r) - : IOProcessor(s, boost::shared_ptr(), (role_requires_output_ports (r) ? io : boost::shared_ptr()), name, Temporal::AudioTime, (r == Send || r == Aux || r == Foldback)) +Delivery::Delivery (Session& s, std::shared_ptr io, std::shared_ptr pannable, + std::shared_ptr mm, const string& name, Role r) + : IOProcessor(s, std::shared_ptr(), (role_requires_output_ports (r) ? io : std::shared_ptr()), name, Temporal::AudioTime, (r == Send || r == Aux || r == Foldback)) , _role (r) , _output_buffers (new BufferSet()) , _current_gain (GAIN_COEFF_ZERO) @@ -68,7 +68,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr(new PannerShell (_name, _session, pannable, time_domain(), is_send)); + _panshell = std::shared_ptr(new PannerShell (_name, _session, pannable, time_domain(), is_send)); } _display_to_user = false; @@ -80,7 +80,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr pannable, boost::shared_ptr mm, const string& name, Role r) +Delivery::Delivery (Session& s, std::shared_ptr pannable, std::shared_ptr mm, const string& name, Role r) : IOProcessor(s, false, (role_requires_output_ports (r) ? true : false), name, "", DataType::AUDIO, (r == Send || r == Aux || r == Foldback)) , _role (r) , _output_buffers (new BufferSet()) @@ -92,7 +92,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr pannable, boost::sha if (pannable) { bool is_send = false; if (r & (Delivery::Send|Delivery::Aux|Delivery::Foldback)) is_send = true; - _panshell = boost::shared_ptr(new PannerShell (_name, _session, pannable, time_domain(), is_send)); + _panshell = std::shared_ptr(new PannerShell (_name, _session, pannable, time_domain(), is_send)); } _display_to_user = false; @@ -188,7 +188,7 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out) } void -Delivery::set_gain_control (boost::shared_ptr gc) { +Delivery::set_gain_control (std::shared_ptr gc) { if (gc) { _gain_control = gc; _amp.reset (new Amp (_session, _("Fader"), _gain_control, true)); @@ -680,13 +680,13 @@ Delivery::output_changed (IOChange change, void* /*src*/) } } -boost::shared_ptr +std::shared_ptr Delivery::panner () const { if (_panshell) { return _panshell->panner(); } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc index 809e7ded3f..92ab57e1c7 100644 --- a/libs/ardour/disk_io.cc +++ b/libs/ardour/disk_io.cc @@ -66,7 +66,7 @@ DiskIOProcessor::~DiskIOProcessor () { { RCUWriter writer (channels); - boost::shared_ptr c = writer.get_copy(); + std::shared_ptr c = writer.get_copy(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { delete *chan; @@ -170,7 +170,7 @@ DiskIOProcessor::configure_io (ChanCount in, ChanCount out) { RCUWriter writer (channels); - boost::shared_ptr c = writer.get_copy(); + std::shared_ptr c = writer.get_copy(); uint32_t n_audio = in.n_audio(); @@ -230,13 +230,13 @@ int DiskIOProcessor::add_channel (uint32_t how_many) { RCUWriter writer (channels); - boost::shared_ptr c = writer.get_copy(); + std::shared_ptr c = writer.get_copy(); return add_channel_to (c, how_many); } int -DiskIOProcessor::remove_channel_from (boost::shared_ptr c, uint32_t how_many) +DiskIOProcessor::remove_channel_from (std::shared_ptr c, uint32_t how_many) { while (how_many-- && !c->empty()) { delete c->back(); @@ -250,15 +250,15 @@ int DiskIOProcessor::remove_channel (uint32_t how_many) { RCUWriter writer (channels); - boost::shared_ptr c = writer.get_copy(); + std::shared_ptr c = writer.get_copy(); return remove_channel_from (c, how_many); } void -DiskIOProcessor::playlist_deleted (boost::weak_ptr wpl) +DiskIOProcessor::playlist_deleted (std::weak_ptr wpl) { - boost::shared_ptr pl (wpl.lock()); + std::shared_ptr pl (wpl.lock()); if (!pl) { return; @@ -277,20 +277,20 @@ DiskIOProcessor::playlist_deleted (boost::weak_ptr wpl) } } -boost::shared_ptr +std::shared_ptr DiskIOProcessor::audio_playlist () const { - return boost::dynamic_pointer_cast (_playlists[DataType::AUDIO]); + return std::dynamic_pointer_cast (_playlists[DataType::AUDIO]); } -boost::shared_ptr +std::shared_ptr DiskIOProcessor::midi_playlist () const { - return boost::dynamic_pointer_cast (_playlists[DataType::MIDI]); + return std::dynamic_pointer_cast (_playlists[DataType::MIDI]); } int -DiskIOProcessor::use_playlist (DataType dt, boost::shared_ptr playlist) +DiskIOProcessor::use_playlist (DataType dt, std::shared_ptr playlist) { if (!playlist) { return 0; @@ -314,7 +314,7 @@ DiskIOProcessor::use_playlist (DataType dt, boost::shared_ptr playlist playlist->ContentsChanged.connect_same_thread (playlist_connections, boost::bind (&DiskIOProcessor::playlist_modified, this)); playlist->LayeringChanged.connect_same_thread (playlist_connections, boost::bind (&DiskIOProcessor::playlist_modified, this)); - playlist->DropReferences.connect_same_thread (playlist_connections, boost::bind (&DiskIOProcessor::playlist_deleted, this, boost::weak_ptr(playlist))); + playlist->DropReferences.connect_same_thread (playlist_connections, boost::bind (&DiskIOProcessor::playlist_deleted, this, std::weak_ptr(playlist))); playlist->RangesMoved.connect_same_thread (playlist_connections, boost::bind (&DiskIOProcessor::playlist_ranges_moved, this, _1, _2)); DEBUG_TRACE (DEBUG::DiskIO, string_compose ("%1 now using playlist %1 (%2)\n", name(), playlist->name(), playlist->id())); diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 402dd394be..59bc9ab916 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -109,7 +109,7 @@ DiskReader::ReaderChannelInfo::resize_preloop (samplecnt_t bufsize) } int -DiskReader::add_channel_to (boost::shared_ptr c, uint32_t how_many) +DiskReader::add_channel_to (std::shared_ptr c, uint32_t how_many) { while (how_many--) { c->push_back (new ReaderChannelInfo (_session.butler ()->audio_playback_buffer_size (), loop_fade_length)); @@ -219,7 +219,7 @@ DiskReader::buffer_load () const * are so low compared to audio, just use the audio value here. */ - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); if (c->empty ()) { /* no channels, so no buffers, so completely full and ready to playback, sir! */ @@ -233,7 +233,7 @@ DiskReader::buffer_load () const void DiskReader::adjust_buffering () { - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); for (ChannelList::iterator chan = c->begin (); chan != c->end (); ++chan) { (*chan)->resize (_session.butler ()->audio_playback_buffer_size ()); @@ -247,7 +247,7 @@ DiskReader::playlist_modified () } int -DiskReader::use_playlist (DataType dt, boost::shared_ptr playlist) +DiskReader::use_playlist (DataType dt, std::shared_ptr playlist) { bool prior_playlist = false; @@ -274,7 +274,7 @@ void DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required) { uint32_t n; - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); ChannelList::iterator chan; sampleoffset_t disk_samples_to_consume; MonitorState ms = _track.monitoring_state (); @@ -533,7 +533,7 @@ DiskReader::declick_in_progress () const void DiskReader::configuration_changed () { - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); if (!c->empty ()) { ReaderChannelInfo* chaninfo = dynamic_cast (c->front ()); if (!chaninfo->initialized) { @@ -553,7 +553,7 @@ DiskReader::pending_overwrite () const void DiskReader::set_pending_overwrite (OverwriteReason why) { - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); /* called from audio thread, so we can use the read ptr and playback sample as we wish */ @@ -678,7 +678,7 @@ DiskReader::overwrite_existing_audio () * simply replace the contents of the buffer. */ - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); if (c->empty ()) { return true; @@ -818,7 +818,7 @@ DiskReader::seek (samplepos_t sample, bool complete_refill) const bool read_reversed = !_session.transport_will_roll_forwards (); const bool read_loop = (bool)_loop_location; - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); if (c->empty ()) { return 0; @@ -920,7 +920,7 @@ DiskReader::can_internal_playback_seek (sampleoffset_t distance) /* 1. Audio */ ChannelList::iterator chan; - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); for (chan = c->begin (); chan != c->end (); ++chan) { if (!(*chan)->rbuf->can_seek (distance)) { @@ -943,7 +943,7 @@ DiskReader::internal_playback_seek (sampleoffset_t distance) sampleoffset_t off = distance; ChannelList::iterator chan; - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); for (chan = c->begin (); chan != c->end (); ++chan) { if (distance < 0) { off = 0 - (sampleoffset_t) (*chan)->rbuf->decrement_read_ptr (::llabs (distance)); @@ -1162,7 +1162,7 @@ DiskReader::refill_audio (Sample* sum_buffer, Sample* mixdown_buffer, float* gai samplecnt_t zero_fill; uint32_t chan_n; ChannelList::iterator i; - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); _last_read_reversed = reversed; @@ -1364,15 +1364,15 @@ DiskReader::playlist_ranges_moved (list const& movements, b } /* move panner automation */ - boost::shared_ptr pannable = _track.pannable (); + std::shared_ptr pannable = _track.pannable (); Evoral::ControlSet::Controls& c (pannable->controls ()); for (Evoral::ControlSet::Controls::iterator ci = c.begin (); ci != c.end (); ++ci) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (ci->second); + std::shared_ptr ac = std::dynamic_pointer_cast (ci->second); if (!ac) { continue; } - boost::shared_ptr alist = ac->alist (); + std::shared_ptr alist = ac->alist (); if (!alist->size ()) { continue; } @@ -1388,9 +1388,9 @@ DiskReader::playlist_ranges_moved (list const& movements, b } void -DiskReader::move_processor_automation (boost::weak_ptr p, list const& movements) +DiskReader::move_processor_automation (std::weak_ptr p, list const& movements) { - boost::shared_ptr processor (p.lock ()); + std::shared_ptr processor (p.lock ()); if (!processor) { return; } @@ -1398,7 +1398,7 @@ DiskReader::move_processor_automation (boost::weak_ptr p, list const a = processor->what_can_be_automated (); for (set::const_iterator i = a.begin (); i != a.end (); ++i) { - boost::shared_ptr al = processor->automation_control (*i)->alist (); + std::shared_ptr al = processor->automation_control (*i)->alist (); if (!al->size ()) { continue; } @@ -1880,13 +1880,13 @@ DiskReader::maybe_xfade_loop (Sample* buf, samplepos_t read_start, samplepos_t r RTMidiBuffer* DiskReader::rt_midibuffer () { - boost::shared_ptr pl = _playlists[DataType::MIDI]; + std::shared_ptr pl = _playlists[DataType::MIDI]; if (!pl) { return 0; } - boost::shared_ptr mpl = boost::dynamic_pointer_cast (pl); + std::shared_ptr mpl = std::dynamic_pointer_cast (pl); if (!mpl) { /* error, but whatever ... */ @@ -1935,7 +1935,7 @@ DiskReader::setup_preloop_buffer () return; } - boost::shared_ptr c = channels.reader (); + std::shared_ptr c = channels.reader (); if (c->empty () || !_playlists[DataType::AUDIO]) { return; diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 69a1883457..f98a1f9fd1 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -74,7 +74,7 @@ DiskWriter::~DiskWriter () { DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskWriter %1 @ %2 deleted\n", _name, this)); - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { (*chan)->write_source.reset (); @@ -106,7 +106,7 @@ DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize) } int -DiskWriter::add_channel_to (boost::shared_ptr c, uint32_t how_many) +DiskWriter::add_channel_to (std::shared_ptr c, uint32_t how_many) { while (how_many--) { c->push_back (new WriterChannelInfo (_session.butler()->audio_capture_buffer_size())); @@ -429,7 +429,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp } uint32_t n; - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); ChannelList::iterator chan; samplecnt_t rec_offset = 0; @@ -740,7 +740,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp } void -DiskWriter::finish_capture (boost::shared_ptr c) +DiskWriter::finish_capture (std::shared_ptr c) { _was_recording = false; _xrun_flag = false; @@ -787,10 +787,10 @@ DiskWriter::finish_capture (boost::shared_ptr c) _first_recordable_sample = max_samplepos; } -boost::shared_ptr +std::shared_ptr DiskWriter::get_gui_feed_buffer () const { - boost::shared_ptr b (new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI))); + std::shared_ptr b (new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI))); Glib::Threads::Mutex::Lock lm (_gui_feed_buffer_mutex); b->copy (_gui_feed_buffer); @@ -854,7 +854,7 @@ DiskWriter::prep_record_enable () return false; } - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); capturing_sources.clear (); @@ -877,7 +877,7 @@ DiskWriter::prep_record_disable () float DiskWriter::buffer_load () const { - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); if (c->empty ()) { return 1.0; @@ -892,7 +892,7 @@ DiskWriter::set_note_mode (NoteMode m) { _note_mode = m; - boost::shared_ptr mp = boost::dynamic_pointer_cast (_playlists[DataType::MIDI]); + std::shared_ptr mp = std::dynamic_pointer_cast (_playlists[DataType::MIDI]); if (mp) { mp->set_note_mode (m); @@ -917,7 +917,7 @@ DiskWriter::reset_capture () { uint32_t n; ChannelList::iterator chan; - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) { (*chan)->wbuf->reset (); @@ -942,7 +942,7 @@ DiskWriter::do_flush (RunContext ctxt, bool force_flush) vector.buf[0] = 0; vector.buf[1] = 0; - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { (*chan)->wbuf->get_read_vector (&vector); @@ -1052,7 +1052,7 @@ void DiskWriter::reset_write_sources (bool mark_write_complete, bool /*force*/) { ChannelList::iterator chan; - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); uint32_t n; if (!_session.writable() || !recordable()) { @@ -1111,7 +1111,7 @@ DiskWriter::use_new_write_source (DataType dt, uint32_t n) _midi_write_source.reset(); try { - _midi_write_source = boost::dynamic_pointer_cast( + _midi_write_source = std::dynamic_pointer_cast( _session.create_midi_source_for_session (write_source_name ())); if (!_midi_write_source) { @@ -1125,7 +1125,7 @@ DiskWriter::use_new_write_source (DataType dt, uint32_t n) return -1; } } else { - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); if (n >= c->size()) { error << string_compose (_("AudioDiskstream: channel %1 out of range"), n) << endmsg; @@ -1161,7 +1161,7 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo SourceList audio_srcs; SourceList midi_srcs; ChannelList::iterator chan; - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); uint32_t n = 0; bool mark_write_completed = false; @@ -1219,7 +1219,7 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) { - boost::shared_ptr as = (*chan)->write_source; + std::shared_ptr as = (*chan)->write_source; if (as) { audio_srcs.push_back (as); @@ -1326,7 +1326,7 @@ DiskWriter::loop (samplepos_t transport_sample) _transport_looped = false; if (_was_recording) { // all we need to do is finish this capture, with modified capture length - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); finish_capture (c); @@ -1354,7 +1354,7 @@ DiskWriter::loop (samplepos_t transport_sample) void DiskWriter::adjust_buffering () { - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { (*chan)->resize (_session.butler()->audio_capture_buffer_size()); @@ -1413,7 +1413,7 @@ DiskWriter::configure_io (ChanCount in, ChanCount out) { bool changed = false; { - boost::shared_ptr c = channels.reader(); + std::shared_ptr c = channels.reader(); if (in.n_audio() != c->size()) { changed = true; } @@ -1435,7 +1435,7 @@ DiskWriter::configure_io (ChanCount in, ChanCount out) } int -DiskWriter::use_playlist (DataType dt, boost::shared_ptr playlist) +DiskWriter::use_playlist (DataType dt, std::shared_ptr playlist) { bool reset_ws = _playlists[dt] != playlist; diff --git a/libs/ardour/engine_slave.cc b/libs/ardour/engine_slave.cc index 9c4bf313e8..81052f1102 100644 --- a/libs/ardour/engine_slave.cc +++ b/libs/ardour/engine_slave.cc @@ -90,7 +90,7 @@ Engine_TransportMaster::pre_process (pframes_t, samplepos_t, boost::optional backend = engine.current_backend(); + std::shared_ptr backend = engine.current_backend(); /* 3rd argument (now) doesn't matter here because we're always being * called synchronously with the engine. diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 23cc1c0005..98fd0b13c7 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -56,7 +56,7 @@ PortExportChannel::common_port_playback_latency () const samplecnt_t l = 0; bool first = true; for (PortSet::const_iterator it = ports.begin (); it != ports.end (); ++it) { - boost::shared_ptr p = it->lock (); + std::shared_ptr p = it->lock (); if (!p) { continue; } @@ -80,7 +80,7 @@ PortExportChannel::prepare_export (samplecnt_t max_samples, sampleoffset_t commo _delaylines.clear (); for (PortSet::const_iterator it = ports.begin (); it != ports.end (); ++it) { - boost::shared_ptr p = it->lock (); + std::shared_ptr p = it->lock (); if (!p) { continue; } @@ -90,7 +90,7 @@ PortExportChannel::prepare_export (samplecnt_t max_samples, sampleoffset_t commo Sample zero = 0; rb->write (&zero, 1); } - _delaylines.push_back (boost::shared_ptr> (rb)); + _delaylines.push_back (std::shared_ptr> (rb)); } } @@ -101,7 +101,9 @@ PortExportChannel::operator< (ExportChannel const& other) const if (!(pec = dynamic_cast (&other))) { return this < &other; } - return ports < pec->ports; + + std::owner_less > cmp; + return std::lexicographical_compare (ports.begin(), ports.end(), pec->ports.begin(), pec->ports.end(), cmp); } void @@ -111,7 +113,7 @@ PortExportChannel::read (Buffer const*& buf, samplecnt_t samples) const assert (samples <= _buffer_size); if (ports.size () == 1 && _delaylines.size () == 1 && !ports.begin ()->expired () && _delaylines.front ()->bufsize () == _buffer_size + 1) { - boost::shared_ptr p = ports.begin ()->lock (); + std::shared_ptr p = ports.begin ()->lock (); AudioBuffer& ab (p->get_audio_buffer (samples)); // unsets AudioBuffer::_written ab.set_written (true); buf = &ab; @@ -120,9 +122,9 @@ PortExportChannel::read (Buffer const*& buf, samplecnt_t samples) const memset (_buffer.get (), 0, samples * sizeof (Sample)); - std::list>>::const_iterator di = _delaylines.begin (); + std::list>>::const_iterator di = _delaylines.begin (); for (PortSet::const_iterator it = ports.begin (); it != ports.end (); ++it) { - boost::shared_ptr p = it->lock (); + std::shared_ptr p = it->lock (); if (!p) { continue; } @@ -156,7 +158,7 @@ PortExportChannel::get_state (XMLNode* node) const { XMLNode* port_node; for (PortSet::const_iterator it = ports.begin (); it != ports.end (); ++it) { - boost::shared_ptr p = it->lock (); + std::shared_ptr p = it->lock (); if (p && (port_node = node->add_child ("Port"))) { port_node->set_property ("name", p->name ()); } @@ -170,7 +172,7 @@ PortExportChannel::set_state (XMLNode* node, Session& session) for (XMLNodeList::iterator it = xml_ports.begin (); it != xml_ports.end (); ++it) { std::string name; if ((*it)->get_property ("name", name)) { - boost::shared_ptr port = boost::dynamic_pointer_cast (session.engine ().get_port_by_name (name)); + std::shared_ptr port = std::dynamic_pointer_cast (session.engine ().get_port_by_name (name)); if (port) { ports.insert (port); } else { @@ -192,7 +194,7 @@ PortExportMIDI::~PortExportMIDI () samplecnt_t PortExportMIDI::common_port_playback_latency () const { - boost::shared_ptr p = _port.lock (); + std::shared_ptr p = _port.lock (); if (!p) { return 0; } @@ -202,7 +204,7 @@ PortExportMIDI::common_port_playback_latency () const void PortExportMIDI::prepare_export (samplecnt_t max_samples, sampleoffset_t common_latency) { - boost::shared_ptr p = _port.lock (); + std::shared_ptr p = _port.lock (); if (!p) { return; } @@ -217,13 +219,13 @@ PortExportMIDI::operator< (ExportChannel const& other) const if (!(pem = dynamic_cast (&other))) { return this < &other; } - return _port < pem->_port; + return _port.owner_before (pem->_port); } void PortExportMIDI::read (Buffer const*& buf, samplecnt_t samples) const { - boost::shared_ptr p = _port.lock (); + std::shared_ptr p = _port.lock (); if (!p) { _buf.clear (); buf = &_buf; @@ -241,7 +243,7 @@ void PortExportMIDI::get_state (XMLNode* node) const { XMLNode* port_node; - boost::shared_ptr p = _port.lock (); + std::shared_ptr p = _port.lock (); if (p && (port_node = node->add_child ("MIDIPort"))) { port_node->set_property ("name", p->name ()); } @@ -256,7 +258,7 @@ PortExportMIDI::set_state (XMLNode* node, Session& session) } std::string name; if (xml_port->get_property ("name", name)) { - boost::shared_ptr port = boost::dynamic_pointer_cast (session.engine ().get_port_by_name (name)); + std::shared_ptr port = std::dynamic_pointer_cast (session.engine ().get_port_by_name (name)); if (port) { _port = port; } else { @@ -346,10 +348,10 @@ RegionExportChannelFactory::update_buffers (samplecnt_t samples) position += samples; } -RouteExportChannel::RouteExportChannel (boost::shared_ptr processor, +RouteExportChannel::RouteExportChannel (std::shared_ptr processor, DataType type, size_t channel, - boost::shared_ptr remover) + std::shared_ptr remover) : _processor (processor) , _type (type) , _channel (channel) @@ -362,13 +364,13 @@ RouteExportChannel::~RouteExportChannel () } void -RouteExportChannel::create_from_route (std::list& result, boost::shared_ptr route) +RouteExportChannel::create_from_route (std::list& result, std::shared_ptr route) { - boost::shared_ptr processor = route->add_export_point (); + std::shared_ptr processor = route->add_export_point (); uint32_t n_audio = processor->input_streams ().n_audio (); uint32_t n_midi = processor->input_streams ().n_midi (); - boost::shared_ptr remover (new ProcessorRemover (route, processor)); + std::shared_ptr remover (new ProcessorRemover (route, processor)); result.clear (); for (uint32_t i = 0; i < n_audio; ++i) { result.push_back (ExportChannelPtr (new RouteExportChannel (processor, DataType::AUDIO, i, remover))); @@ -389,7 +391,7 @@ RouteExportChannel::create_from_state (std::list& result, Sess if (!xml_route->get_property ("id", rid)) { return; } - boost::shared_ptr rt = s.route_by_id (rid); + std::shared_ptr rt = s.route_by_id (rid); if (rt) { create_from_route (result, rt); } diff --git a/libs/ardour/export_channel_configuration.cc b/libs/ardour/export_channel_configuration.cc index 2688309173..44d878b6c4 100644 --- a/libs/ardour/export_channel_configuration.cc +++ b/libs/ardour/export_channel_configuration.cc @@ -136,7 +136,7 @@ ExportChannelConfiguration::all_channels_have_ports () const } void -ExportChannelConfiguration::configurations_for_files (std::list>& configs) +ExportChannelConfiguration::configurations_for_files (std::list>& configs) { configs.clear (); @@ -146,7 +146,7 @@ ExportChannelConfiguration::configurations_for_files (std::list config (new ExportChannelConfiguration (session)); + std::shared_ptr config (new ExportChannelConfiguration (session)); config->set_name (_name); config->register_channel (c); configs.push_back (config); diff --git a/libs/ardour/export_format_base.cc b/libs/ardour/export_format_base.cc index 23adbcc7a5..a545214743 100644 --- a/libs/ardour/export_format_base.cc +++ b/libs/ardour/export_format_base.cc @@ -63,22 +63,22 @@ ExportFormatBase::~ExportFormatBase () } -boost::shared_ptr +std::shared_ptr ExportFormatBase::get_intersection (ExportFormatBase const & other) const { return do_set_operation (other, SetIntersection); } -boost::shared_ptr +std::shared_ptr ExportFormatBase::get_union (ExportFormatBase const & other) const { return do_set_operation (other, SetUnion); } -boost::shared_ptr +std::shared_ptr ExportFormatBase::do_set_operation (ExportFormatBase const & other, SetOperation operation) const { - boost::shared_ptr result (new ExportFormatBase ()); + std::shared_ptr result (new ExportFormatBase ()); /* Sets */ diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc index 258ed1a73b..9f227a0fa8 100644 --- a/libs/ardour/export_format_manager.cc +++ b/libs/ardour/export_format_manager.cc @@ -271,9 +271,9 @@ ExportFormatManager::add_format (ExportFormatPtr ptr) /* Encoding options */ - boost::shared_ptr hsf; + std::shared_ptr hsf; - if ((hsf = boost::dynamic_pointer_cast (ptr))) { + if ((hsf = std::dynamic_pointer_cast (ptr))) { hsf->SampleFormatSelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_sample_format_selection, this, _1, _2)); hsf->DitherTypeSelectChanged.connect_same_thread (*this, boost::bind (&ExportFormatManager::change_dither_type_selection, this, _1, _2)); } @@ -546,7 +546,7 @@ ExportFormatManager::select_compatibility (WeakExportFormatCompatibilityPtr cons /* Unselect incompatible items */ - boost::shared_ptr select_intersect; + std::shared_ptr select_intersect; select_intersect = compat_intersect->get_intersection (*current_selection); if (select_intersect->qualities_empty()) { @@ -639,8 +639,8 @@ ExportFormatManager::select_format (ExportFormatPtr const & format) format_to_select = format->default_sample_format(); } - boost::shared_ptr hsf; - if ((hsf = boost::dynamic_pointer_cast (format))) { + std::shared_ptr hsf; + if ((hsf = std::dynamic_pointer_cast (format))) { SampleFormatList sample_formats = hsf->get_sample_formats(); for (SampleFormatList::iterator it = sample_formats.begin (); it != sample_formats.end (); ++it) { if ((*it)->format == format_to_select) { @@ -796,8 +796,8 @@ ExportFormatManager::selection_changed () } } - boost::shared_ptr hsf; - if ((hsf = boost::dynamic_pointer_cast (get_selected_format()))) { + std::shared_ptr hsf; + if ((hsf = std::dynamic_pointer_cast (get_selected_format()))) { SampleFormatList sf_list = hsf->get_sample_formats(); for (SampleFormatList::iterator it = sf_list.begin(); it != sf_list.end(); ++it) { @@ -871,9 +871,9 @@ ExportFormatManager::get_selected_sample_rate () ExportFormatManager::SampleFormatPtr ExportFormatManager::get_selected_sample_format () { - boost::shared_ptr hsf; + std::shared_ptr hsf; - if ((hsf = boost::dynamic_pointer_cast (get_selected_format()))) { + if ((hsf = std::dynamic_pointer_cast (get_selected_format()))) { return hsf->get_selected_sample_format (); } else { return SampleFormatPtr (); diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc index 6b940f4c6a..b27dff29d3 100644 --- a/libs/ardour/export_format_specification.cc +++ b/libs/ardour/export_format_specification.cc @@ -532,7 +532,7 @@ ExportFormatSpecification::set_state (const XMLNode & root) bool ExportFormatSpecification::is_compatible_with (ExportFormatCompatibility const & compatibility) const { - boost::shared_ptr intersection = get_intersection (compatibility); + std::shared_ptr intersection = get_intersection (compatibility); if (intersection->formats_empty() && format_id() != 0) { return false; @@ -582,7 +582,7 @@ ExportFormatSpecification::is_complete () const } bool -ExportFormatSpecification::is_format (boost::shared_ptr format) const +ExportFormatSpecification::is_format (std::shared_ptr format) const { assert (format); return (format_id () == format->get_format_id () && @@ -593,7 +593,7 @@ ExportFormatSpecification::is_format (boost::shared_ptr format) co } void -ExportFormatSpecification::set_format (boost::shared_ptr format) +ExportFormatSpecification::set_format (std::shared_ptr format) { if (format) { FormatId new_fmt = format->get_format_id (); @@ -620,7 +620,7 @@ ExportFormatSpecification::set_format (boost::shared_ptr format) if (!_has_codec_quality) { _codec_quality = 0; } else if (fmt_changed) { - _codec_quality = boost::dynamic_pointer_cast (format)->default_codec_quality(); + _codec_quality = std::dynamic_pointer_cast (format)->default_codec_quality(); } _supports_tagging = format->supports_tagging (); diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc index 42b495754c..29364cf9ae 100644 --- a/libs/ardour/export_formats.cc +++ b/libs/ardour/export_formats.cc @@ -229,7 +229,7 @@ ExportFormatLinear::set_compatibility_state (ExportFormatCompatibility const & c compatible = false; } - boost::shared_ptr intersection = get_intersection (compatibility); + std::shared_ptr intersection = get_intersection (compatibility); if (intersection->endiannesses_empty()) { compatible = false; diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index 5fee63049d..fb93fdd0ae 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -169,7 +169,7 @@ ExportGraphBuilder::cleanup (bool remove_out_files/*=false*/) } void -ExportGraphBuilder::set_current_timespan (boost::shared_ptr span) +ExportGraphBuilder::set_current_timespan (std::shared_ptr span) { timespan = span; } @@ -211,7 +211,7 @@ ExportGraphBuilder::add_config (FileSpec const & config, bool rt) /* Split channel configurations are split into several channel configurations, * each corresponding to a file, at this stage */ - typedef std::list > ConfigList; + typedef std::list > ConfigList; ConfigList file_configs; new_config.channel_config->configurations_for_files (file_configs); @@ -255,7 +255,7 @@ ExportGraphBuilder::add_split_config (FileSpec const & config) /* Encoder */ template <> -boost::shared_ptr > +std::shared_ptr > ExportGraphBuilder::Encoder::init (FileSpec const & new_config) { config = new_config; @@ -269,7 +269,7 @@ ExportGraphBuilder::Encoder::init (FileSpec const & new_config) } template <> -boost::shared_ptr > +std::shared_ptr > ExportGraphBuilder::Encoder::init (FileSpec const & new_config) { config = new_config; @@ -278,7 +278,7 @@ ExportGraphBuilder::Encoder::init (FileSpec const & new_config) } template <> -boost::shared_ptr > +std::shared_ptr > ExportGraphBuilder::Encoder::init (FileSpec const & new_config) { config = new_config; @@ -339,7 +339,7 @@ ExportGraphBuilder::Encoder::get_real_format (FileSpec const & config) template void -ExportGraphBuilder::Encoder::init_writer (boost::shared_ptr > & writer) +ExportGraphBuilder::Encoder::init_writer (std::shared_ptr > & writer) { unsigned channels = config.channel_config->get_n_chans(); int format = get_real_format (config); @@ -364,7 +364,7 @@ ExportGraphBuilder::Encoder::init_writer (boost::shared_ptr void -ExportGraphBuilder::Encoder::init_writer (boost::shared_ptr > & writer) +ExportGraphBuilder::Encoder::init_writer (std::shared_ptr > & writer) { unsigned channels = config.channel_config->get_n_chans(); config.filename->set_channel_config(config.channel_config); @@ -496,7 +496,7 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c normalizer->add_output (limiter); - boost::shared_ptr > intermediate = limiter; + std::shared_ptr > intermediate = limiter; config.filename->set_channel_config (config.channel_config); parent.add_export_fn (config.filename->get_path (config.format)); diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 4028eb7c17..116b88333e 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -160,7 +160,7 @@ ExportProfileManager::prepare_for_export () ++format_it, ++filename_it) { ExportFilenamePtr filename = (*filename_it)->filename; - boost::shared_ptr b; + std::shared_ptr b; if ((*format_it)->format->has_broadcast_info ()) { b.reset (new BroadcastInfo); b->set_from_session (session, (*ts_it)->get_start ()); @@ -871,10 +871,10 @@ ExportProfileManager::init_filenames (XMLNodeList nodes) return true; } -boost::shared_ptr +std::shared_ptr ExportProfileManager::get_warnings () { - boost::shared_ptr warnings (new Warnings ()); + std::shared_ptr warnings (new Warnings ()); TimespanStatePtr timespan_state = timespans.front (); @@ -974,7 +974,7 @@ ExportProfileManager::get_warnings () } void -ExportProfileManager::check_config (boost::shared_ptr warnings, +ExportProfileManager::check_config (std::shared_ptr warnings, TimespanStatePtr timespan_state, ExportChannelConfigPtr channel_config, FormatStatePtr format_state, FilenameStatePtr filename_state) diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc index fb49601234..671f947fc7 100644 --- a/libs/ardour/filter.cc +++ b/libs/ardour/filter.cc @@ -40,7 +40,7 @@ using namespace ARDOUR; using namespace PBD; int -Filter::make_new_sources (boost::shared_ptr region, SourceList& nsrcs, std::string suffix, bool use_session_sample_rate) +Filter::make_new_sources (std::shared_ptr region, SourceList& nsrcs, std::string suffix, bool use_session_sample_rate) { vector names = region->master_source_names(); const SourceList::size_type nsrc = region->sources().size(); @@ -74,14 +74,14 @@ Filter::make_new_sources (boost::shared_ptr region, SourceList& nsrcs, s try { samplecnt_t sample_rate = session.sample_rate (); if (!use_session_sample_rate) { - boost::shared_ptr aregion = boost::dynamic_pointer_cast(region); + std::shared_ptr aregion = std::dynamic_pointer_cast(region); if (aregion) { sample_rate = aregion->audio_source()->sample_rate(); } } - nsrcs.push_back (boost::dynamic_pointer_cast ( + nsrcs.push_back (std::dynamic_pointer_cast ( SourceFactory::createWritable (region->data_type(), session, path, sample_rate))); } @@ -96,7 +96,7 @@ Filter::make_new_sources (boost::shared_ptr region, SourceList& nsrcs, s } int -Filter::finish (boost::shared_ptr region, SourceList& nsrcs, string region_name) +Filter::finish (std::shared_ptr region, SourceList& nsrcs, string region_name) { /* update headers on new sources */ @@ -108,14 +108,14 @@ Filter::finish (boost::shared_ptr region, SourceList& nsrcs, string regi /* this is ugly. */ for (SourceList::iterator si = nsrcs.begin(); si != nsrcs.end(); ++si) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*si); + std::shared_ptr afs = std::dynamic_pointer_cast(*si); if (afs) { afs->done_with_peakfile_writes (); afs->update_header (region->position_sample(), *now, xnow); afs->mark_immutable (); } - boost::shared_ptr smfs = boost::dynamic_pointer_cast(*si); + std::shared_ptr smfs = std::dynamic_pointer_cast(*si); if (smfs) { smfs->set_natural_position (region->position()); smfs->flush (); @@ -139,7 +139,7 @@ Filter::finish (boost::shared_ptr region, SourceList& nsrcs, string regi plist.add (Properties::name, region_name); plist.add (Properties::whole_file, true); - boost::shared_ptr r = RegionFactory::create (nsrcs, plist); + std::shared_ptr r = RegionFactory::create (nsrcs, plist); results.push_back (r); return 0; diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc index 7aa946eb83..4c2c471032 100644 --- a/libs/ardour/gain_control.cc +++ b/libs/ardour/gain_control.cc @@ -57,7 +57,7 @@ static std::string gain_control_name (Evoral::Parameter const& param) return ""; } -static boost::shared_ptr automation_list_new (Evoral::Parameter const& param) +static std::shared_ptr automation_list_new (Evoral::Parameter const& param) { switch (param.type()) { case GainAutomation: @@ -67,7 +67,7 @@ static boost::shared_ptr automation_list_new (Evoral::Parameter case InsertReturnLevel: /* fallthrough */ case TrimAutomation: - return boost::shared_ptr (new AutomationList (param, Temporal::AudioTime)); + return std::shared_ptr (new AutomationList (param, Temporal::AudioTime)); case MainOutVolume: /* not automatable */ break; @@ -75,10 +75,10 @@ static boost::shared_ptr automation_list_new (Evoral::Parameter assert (0); break; } - return boost::shared_ptr (); + return std::shared_ptr (); } -GainControl::GainControl (Session& session, const Evoral::Parameter ¶m, boost::shared_ptr al) +GainControl::GainControl (Session& session, const Evoral::Parameter ¶m, std::shared_ptr al) : SlavableAutomationControl (session, param, ParameterDescriptor(param), al ? al : automation_list_new (param), gain_control_name (param), @@ -104,7 +104,7 @@ GainControl::inc_gain (gain_t factor) } void -GainControl::post_add_master (boost::shared_ptr m) +GainControl::post_add_master (std::shared_ptr m) { if (m->get_value() == 0) { /* master is at -inf, which forces this ctrl to -inf on assignment */ diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 7cd588bd36..af39dac1bc 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -945,7 +945,7 @@ ARDOUR::get_available_sync_options () { vector ret; - boost::shared_ptr backend = AudioEngine::instance ()->current_backend (); + std::shared_ptr backend = AudioEngine::instance ()->current_backend (); if (backend && backend->name () == "JACK") { ret.push_back (Engine); } diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc index c9a0bdd271..1137f5962c 100644 --- a/libs/ardour/graph.cc +++ b/libs/ardour/graph.cc @@ -432,7 +432,7 @@ again: } int -Graph::process_routes (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler) +Graph::process_routes (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler) { DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("graph execution from %1 to %2 = %3\n", start_sample, end_sample, nframes)); @@ -460,7 +460,7 @@ Graph::process_routes (boost::shared_ptr chain, pframes_t nframes, s } int -Graph::routes_no_roll (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending) +Graph::routes_no_roll (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending) { DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("no-roll graph execution from %1 to %2 = %3\n", start_sample, end_sample, nframes)); @@ -487,7 +487,7 @@ Graph::routes_no_roll (boost::shared_ptr chain, pframes_t nframes, s } int -Graph::silence_routes (boost::shared_ptr chain, pframes_t nframes) +Graph::silence_routes (std::shared_ptr chain, pframes_t nframes) { DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("silence graph execution from %1 for = %2\n", nframes)); @@ -510,7 +510,7 @@ Graph::silence_routes (boost::shared_ptr chain, pframes_t nframes) } int -Graph::process_io_plugs (boost::shared_ptr chain, pframes_t nframes, samplepos_t start_sample) +Graph::process_io_plugs (std::shared_ptr chain, pframes_t nframes, samplepos_t start_sample) { DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("IOPlug graph execution at %1 for %2\n", start_sample, nframes)); @@ -615,8 +615,8 @@ GraphChain::GraphChain (GraphNodeList const& nodelist, GraphEdges const& edges) for (auto const& ni : nodelist) { RCUWriter wa (ni->_activation_set); RCUWriter wr (ni->_init_refcount); - boost::shared_ptr ma (wa.get_copy ()); - boost::shared_ptr mr (wr.get_copy ()); + std::shared_ptr ma (wa.get_copy ()); + std::shared_ptr mr (wr.get_copy ()); (*mr)[this] = 0; (*ma)[this].clear (); _nodes_rt.push_back (ni); @@ -632,13 +632,13 @@ GraphChain::GraphChain (GraphNodeList const& nodelist, GraphEdges const& edges) /* Set up ni's activation set */ if (has_output) { - boost::shared_ptr m (ni->_activation_set.reader ()); + std::shared_ptr m (ni->_activation_set.reader ()); for (auto const& i : fed_from_r) { auto it = (*m)[this].insert (i); assert (it.second); /* Increment the refcount of any node that we directly feed */ - boost::shared_ptr a ((*it.first)->_init_refcount.reader ()); + std::shared_ptr a ((*it.first)->_init_refcount.reader ()); (*a)[this] += 1; } } @@ -668,8 +668,8 @@ GraphChain::~GraphChain () for (auto const& ni : _nodes_rt) { RCUWriter wa (ni->_activation_set); RCUWriter wr (ni->_init_refcount); - boost::shared_ptr ma (wa.get_copy ()); - boost::shared_ptr mr (wr.get_copy ()); + std::shared_ptr ma (wa.get_copy ()); + std::shared_ptr mr (wr.get_copy ()); mr->erase (this); ma->erase (this); } diff --git a/libs/ardour/graph_edges.cc b/libs/ardour/graph_edges.cc index 0f5910a084..81abd7abb8 100644 --- a/libs/ardour/graph_edges.cc +++ b/libs/ardour/graph_edges.cc @@ -231,10 +231,10 @@ struct RouteRecEnabledComparator { bool operator () (GraphVertex n1, GraphVertex n2) const { - boost::shared_ptr t1 (boost::dynamic_pointer_cast(n1)); - boost::shared_ptr t2 (boost::dynamic_pointer_cast(n2)); - boost::shared_ptr r1 (boost::dynamic_pointer_cast(n1)); - boost::shared_ptr r2 (boost::dynamic_pointer_cast(n2)); + std::shared_ptr t1 (std::dynamic_pointer_cast(n1)); + std::shared_ptr t2 (std::dynamic_pointer_cast(n2)); + std::shared_ptr r1 (std::dynamic_pointer_cast(n1)); + std::shared_ptr r2 (std::dynamic_pointer_cast(n2)); PresentationInfo::order_t r1o = r1 ? r1->presentation_info().order() : 0; PresentationInfo::order_t r2o = r2 ? r2->presentation_info().order() : 0; diff --git a/libs/ardour/graphnode.cc b/libs/ardour/graphnode.cc index 8d8885956c..a850ed540a 100644 --- a/libs/ardour/graphnode.cc +++ b/libs/ardour/graphnode.cc @@ -33,20 +33,20 @@ GraphActivision::GraphActivision () node_set_t const& GraphActivision::activation_set (GraphChain const* const g) const { - boost::shared_ptr m (_activation_set.reader ()); + std::shared_ptr m (_activation_set.reader ()); return m->at (g); } int GraphActivision::init_refcount (GraphChain const* const g) const { - boost::shared_ptr m (_init_refcount.reader ()); + std::shared_ptr m (_init_refcount.reader ()); return m->at (g); } /* ****************************************************************************/ -GraphNode::GraphNode (boost::shared_ptr graph) +GraphNode::GraphNode (std::shared_ptr graph) : _graph (graph) { g_atomic_int_set (&_refcount, 0); diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index ac774bbada..dc9c366ac2 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -81,7 +81,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -static boost::shared_ptr +static std::shared_ptr open_importable_source (const string& path, samplecnt_t samplerate, ARDOUR::SrcQuality quality) { /* try libsndfile first, because it can get BWF info from .wav, which ExtAudioFile cannot. @@ -90,53 +90,53 @@ open_importable_source (const string& path, samplecnt_t samplerate, ARDOUR::SrcQ */ try { - boost::shared_ptr source(new SndFileImportableSource(path)); + std::shared_ptr source(new SndFileImportableSource(path)); if (source->samplerate() == samplerate) { return source; } /* rewrap as a resampled source */ - return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); + return std::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); } catch (...) { } /* libsndfile failed, see if we can use CoreAudio to handle the IO */ #ifdef HAVE_COREAUDIO try { CAImportableSource* src = new CAImportableSource(path); - boost::shared_ptr source (src); + std::shared_ptr source (src); if (source->samplerate() == samplerate) { return source; } /* rewrap as a resampled source */ - return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); + return std::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); } catch (...) { } #endif /* libsndfile and CoreAudioFile failed, try minimp3-decoder */ try { - boost::shared_ptr source(new Mp3FileImportableSource(path)); + std::shared_ptr source(new Mp3FileImportableSource(path)); if (source->samplerate() == samplerate) { return source; } /* rewrap as a resampled source */ - return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); + return std::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); } catch (...) { } /* finally try FFMPEG */ try { - boost::shared_ptr source(new FFMPEGFileImportableSource(path)); + std::shared_ptr source(new FFMPEGFileImportableSource(path)); if (source->samplerate() == samplerate) { return source; } /* rewrap as a resampled source */ - return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); + return std::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); } catch (...) { } throw failed_constructor (); @@ -183,19 +183,19 @@ Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& impo static bool map_existing_mono_sources (const vector& new_paths, Session& /*sess*/, - uint32_t /*samplerate*/, vector >& newfiles, Session *session) + uint32_t /*samplerate*/, vector >& newfiles, Session *session) { for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { - boost::shared_ptr source = session->audio_source_by_path_and_channel(*i, 0); + std::shared_ptr source = session->audio_source_by_path_and_channel(*i, 0); if (source == 0) { error << string_compose(_("Could not find a source for %1 even though we are updating this file!"), (*i)) << endl; return false; } - newfiles.push_back(boost::dynamic_pointer_cast(source)); + newfiles.push_back(std::dynamic_pointer_cast(source)); } return true; } @@ -203,12 +203,12 @@ map_existing_mono_sources (const vector& new_paths, Session& /*sess*/, static bool create_mono_sources_for_writing (const vector& new_paths, Session& sess, uint32_t samplerate, - vector >& newfiles, + vector >& newfiles, samplepos_t natural_position) { for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { - boost::shared_ptr source; + std::shared_ptr source; try { const DataType type = SMFSource::safe_midi_file_extension (*i) ? DataType::MIDI : DataType::AUDIO; @@ -221,14 +221,14 @@ create_mono_sources_for_writing (const vector& new_paths, return false; } - newfiles.push_back(boost::dynamic_pointer_cast(source)); + newfiles.push_back(std::dynamic_pointer_cast(source)); /* for audio files, reset the timeline position so that any BWF-ish information in the original files we are importing from is maintained. */ - boost::shared_ptr afs; - if ((afs = boost::dynamic_pointer_cast(source)) != 0) { + std::shared_ptr afs; + if ((afs = std::dynamic_pointer_cast(source)) != 0) { afs->set_natural_position (timepos_t (natural_position)); } } @@ -254,10 +254,10 @@ compose_status_message (const string& path, static void write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, - vector >& newfiles) + vector >& newfiles) { const samplecnt_t nframes = ResampledImportableSource::blocksize; - boost::shared_ptr afs; + std::shared_ptr afs; uint32_t channels = source->channels(); if (channels == 0) { return; @@ -272,7 +272,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, float gain = 1; - boost::shared_ptr s = boost::dynamic_pointer_cast (newfiles[0]); + std::shared_ptr s = std::dynamic_pointer_cast (newfiles[0]); assert (s); status.progress = 0.0f; @@ -326,7 +326,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, /* cache the data for very long periods of time (perhaps not writing */ /* it to disk until Ardour closes). So let's force it to flush now. */ for (chn = 0; chn < channels; ++chn) - if ((afs = boost::dynamic_pointer_cast(newfiles[chn])) != 0) + if ((afs = std::dynamic_pointer_cast(newfiles[chn])) != 0) afs->flush (); #endif break; @@ -352,7 +352,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, /* flush to disk */ for (chn = 0; chn < channels; ++chn) { - if ((afs = boost::dynamic_pointer_cast(newfiles[chn])) != 0) { + if ((afs = std::dynamic_pointer_cast(newfiles[chn])) != 0) { afs->write (channel_data[chn].get(), nfread); } } @@ -364,7 +364,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, static void write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, - vector >& newfiles, + vector >& newfiles, bool split_midi_channels) { uint32_t buf_size = 4; @@ -377,7 +377,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, int total_files = newfiles.size(); try { - vector >::iterator s = newfiles.begin(); + vector >::iterator s = newfiles.begin(); int cur_chan = 0; @@ -389,7 +389,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, cur_track = 1 + (int) floor((float)i/16.f); //calculate the Track needed for this sourcefile (offset by 1) } - boost::shared_ptr smfs = boost::dynamic_pointer_cast (*s); + std::shared_ptr smfs = std::dynamic_pointer_cast (*s); if (!smfs) { continue; //should never happen. The calling code should provide exactly the number of tracks&channels we need } @@ -512,9 +512,9 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, } static void -remove_file_source (boost::shared_ptr source) +remove_file_source (std::shared_ptr source) { - boost::shared_ptr fs = boost::dynamic_pointer_cast (source); + std::shared_ptr fs = std::dynamic_pointer_cast (source); fs->DropReferences (); @@ -524,14 +524,14 @@ remove_file_source (boost::shared_ptr source) } void -Session::deinterlace_midi_region (boost::shared_ptr mr) +Session::deinterlace_midi_region (std::shared_ptr mr) { - typedef vector > Sources; + typedef vector > Sources; Sources newfiles; try { - boost::shared_ptr ms = mr->midi_source(0); - boost::shared_ptr smf = boost::dynamic_pointer_cast (mr->midi_source(0)); //ToDo: handle compound sources? + std::shared_ptr ms = mr->midi_source(0); + std::shared_ptr smf = std::dynamic_pointer_cast (mr->midi_source(0)); //ToDo: handle compound sources? string source_path = smf->path(); /* write_midi_data_to_new_files expects to find raw midi on-disk (SMF*). @@ -568,8 +568,8 @@ Session::deinterlace_midi_region (boost::shared_ptr mr) /* not all 16 channels will have midi data; delete any sources that turned up empty */ for (Sources::iterator x = newfiles.begin(); x != newfiles.end(); ) { - boost::shared_ptr smfs; - if ((smfs = boost::dynamic_pointer_cast(*x)) != 0 && smfs->is_empty()) { + std::shared_ptr smfs; + if ((smfs = std::dynamic_pointer_cast(*x)) != 0 && smfs->is_empty()) { x = newfiles.erase(x); } else { ++x; @@ -588,12 +588,12 @@ Session::deinterlace_midi_region (boost::shared_ptr mr) plist.add (Properties::opaque, true); plist.add (Properties::name, (*x)->name()); plist.add (Properties::tags, string_compose ("%1%2%3", _("(split-chans)"), mr->tags ().empty() ? "" : " ", mr->tags ())); - boost::shared_ptr whole = RegionFactory::create (*x, plist); + std::shared_ptr whole = RegionFactory::create (*x, plist); /* ... and insert a discrete copy into the playlist*/ PropertyList plist2; plist2.add (ARDOUR::Properties::whole_file, false); - boost::shared_ptr copy (RegionFactory::create (whole, plist2)); + std::shared_ptr copy (RegionFactory::create (whole, plist2)); mr->playlist()->add_region (copy, mr->position()); } } @@ -628,10 +628,10 @@ unique_track_names (const vector& n) void Session::import_files (ImportStatus& status) { - typedef vector > Sources; + typedef vector > Sources; Sources all_new_sources; - boost::shared_ptr afs; - boost::shared_ptr smfs; + std::shared_ptr afs; + std::shared_ptr smfs; uint32_t num_channels = 0; vector smf_names; @@ -639,7 +639,7 @@ Session::import_files (ImportStatus& status) for (vector::const_iterator p = status.paths.begin(); p != status.paths.end() && !status.cancel; ++p) { - boost::shared_ptr source; + std::shared_ptr source; const DataType type = SMFSource::safe_midi_file_extension (*p) ? DataType::MIDI : DataType::AUDIO; boost::scoped_ptr smf_reader; @@ -747,7 +747,7 @@ Session::import_files (ImportStatus& status) } for (Sources::iterator i = newfiles.begin(); i != newfiles.end(); ++i) { - if ((afs = boost::dynamic_pointer_cast(*i)) != 0) { + if ((afs = std::dynamic_pointer_cast(*i)) != 0) { afs->prepare_for_peakfile_writes (); } } @@ -785,27 +785,27 @@ Session::import_files (ImportStatus& status) for (Sources::iterator x = all_new_sources.begin(); x != all_new_sources.end(); ) { - if ((afs = boost::dynamic_pointer_cast(*x)) != 0) { + if ((afs = std::dynamic_pointer_cast(*x)) != 0) { afs->update_header((*x)->natural_position().samples(), *now, xnow); afs->done_with_peakfile_writes (); /* now that there is data there, requeue the file for analysis */ if (Config->get_auto_analyse_audio()) { - Analyser::queue_source_for_analysis (boost::static_pointer_cast(*x), false); + Analyser::queue_source_for_analysis (std::static_pointer_cast(*x), false); } } /* imported, copied files cannot be written or removed */ - boost::shared_ptr fs = boost::dynamic_pointer_cast(*x); + std::shared_ptr fs = std::dynamic_pointer_cast(*x); if (fs) { /* Only audio files should be marked as immutable - we may need to rewrite MIDI files at any time. */ - if (boost::dynamic_pointer_cast (fs)) { + if (std::dynamic_pointer_cast (fs)) { fs->mark_immutable (); } else { fs->mark_immutable_except_write (); @@ -815,7 +815,7 @@ Session::import_files (ImportStatus& status) /* don't create tracks for empty MIDI sources (channels) */ - if ((smfs = boost::dynamic_pointer_cast(*x)) != 0 && smfs->is_empty()) { + if ((smfs = std::dynamic_pointer_cast(*x)) != 0 && smfs->is_empty()) { x = all_new_sources.erase(x); } else { ++x; diff --git a/libs/ardour/import_pt.cc b/libs/ardour/import_pt.cc index be6b1c5596..74e49f498c 100644 --- a/libs/ardour/import_pt.cc +++ b/libs/ardour/import_pt.cc @@ -70,7 +70,7 @@ struct midipair { struct PlaylistState { PlaylistState () : before (0) {} - boost::shared_ptr playlist; + std::shared_ptr playlist; XMLNode* before; }; @@ -110,7 +110,7 @@ Session::import_sndfile_as_region (string path, SrcQuality quality, timepos_t& p sources.push_back(status.sources.front()); /* Put the source on a region */ - vector > regions; + vector > regions; string region_name; bool use_timestamp; @@ -135,10 +135,10 @@ Session::import_sndfile_as_region (string path, SrcQuality quality, timepos_t& p plist.add (ARDOUR::Properties::whole_file, true); plist.add (ARDOUR::Properties::external, true); - boost::shared_ptr r = RegionFactory::create (sources, plist); + std::shared_ptr r = RegionFactory::create (sources, plist); - if (use_timestamp && boost::dynamic_pointer_cast(r)) { - boost::dynamic_pointer_cast(r)->special_set_position(sources[0]->natural_position()); + if (use_timestamp && std::dynamic_pointer_cast(r)) { + std::dynamic_pointer_cast(r)->special_set_position(sources[0]->natural_position()); } regions.push_back (r); @@ -149,16 +149,16 @@ Session::import_sndfile_as_region (string path, SrcQuality quality, timepos_t& p int n = 0; - for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { - boost::shared_ptr ar = boost::dynamic_pointer_cast (*r); + for (vector >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { + std::shared_ptr ar = std::dynamic_pointer_cast (*r); if (use_timestamp) { if (ar) { /* get timestamp for this region */ - const boost::shared_ptr s (ar->sources().front()); - const boost::shared_ptr as = boost::dynamic_pointer_cast (s); + const std::shared_ptr s (ar->sources().front()); + const std::shared_ptr as = std::dynamic_pointer_cast (s); assert (as); @@ -231,7 +231,7 @@ Session::import_pt_sources (PTFFormat& ptf, ImportStatus& status) srcxml.set_property ("name", w->filename); srcxml.set_property ("type", "audio"); srcxml.set_property ("id", PBD::ID ().to_s ()); - boost::shared_ptr source = SourceFactory::createSilent (*this, srcxml, sourcelen, sample_rate ()); + std::shared_ptr source = SourceFactory::createSilent (*this, srcxml, sourcelen, sample_rate ()); p.index1 = w->index; p.id = source->id (); ptfwavpair.push_back (p); @@ -271,8 +271,8 @@ Session::import_pt_sources (PTFFormat& ptf, ImportStatus& status) void Session::import_pt_rest (PTFFormat& ptf) { - vector > regions; - boost::shared_ptr track; + vector > regions; + std::shared_ptr track; ARDOUR::PluginInfoPtr instrument; vector to_import; string fullpath; @@ -282,7 +282,7 @@ Session::import_pt_rest (PTFFormat& ptf) SourceList just_one_src; - boost::shared_ptr existing_track; + std::shared_ptr existing_track; uint16_t i; uint16_t nth = 0; uint16_t ntr = 0; @@ -320,7 +320,7 @@ Session::import_pt_rest (PTFFormat& ptf) just_one_src.clear (); just_one_src.push_back (*x); - boost::shared_ptr r = RegionFactory::create (just_one_src, plist); + std::shared_ptr r = RegionFactory::create (just_one_src, plist); regions.push_back (r); rp.id = regions.back ()->id (); @@ -344,7 +344,7 @@ Session::import_pt_rest (PTFFormat& ptf) if (a->index != nth) { nth++; DEBUG_TRACE (DEBUG::FileUtils, string_compose ("\tcreate tr(%1) %2\n", nth, a->name.c_str())); - list > at (new_audio_track (1, 2, 0, 1, a->name.c_str(), PresentationInfo::max_order, Normal)); + list > at (new_audio_track (1, 2, 0, 1, a->name.c_str(), PresentationInfo::max_order, Normal)); if (at.empty ()) { return; } @@ -355,7 +355,7 @@ Session::import_pt_rest (PTFFormat& ptf) assert (ntr == nth + 1); for (i = 0; i < ntr; ++i) { existing_track = get_nth_audio_track (i); - boost::shared_ptr playlist = existing_track->playlist(); + std::shared_ptr playlist = existing_track->playlist(); PlaylistState before; before.playlist = playlist; @@ -373,7 +373,7 @@ Session::import_pt_rest (PTFFormat& ptf) if (p->index1 == a->reg.index) { /* Matched a ptf active region to an ardour region */ - boost::shared_ptr r = RegionFactory::region_by_id (p->id); + std::shared_ptr r = RegionFactory::region_by_id (p->id); DEBUG_TRACE (DEBUG::FileUtils, string_compose ("\twav(%1) reg(%2) tr(%3)\n", a->reg.wave.filename.c_str (), a->reg.index, a->index)); /* Use track we created earlier */ @@ -381,8 +381,8 @@ Session::import_pt_rest (PTFFormat& ptf) assert (existing_track); /* Put on existing track */ - boost::shared_ptr playlist = existing_track->playlist (); - boost::shared_ptr copy (RegionFactory::create (r, true)); + std::shared_ptr playlist = existing_track->playlist (); + std::shared_ptr copy (RegionFactory::create (r, true)); playlist->clear_changes (); playlist->add_region (copy, timepos_t (a->reg.startpos)); //add_command (new StatefulDiffCommand (playlist)); @@ -412,11 +412,11 @@ no_audio_tracks: } } - std::map > midi_tracks; + std::map > midi_tracks; /* MIDI - Create unique midi tracks and a lookup table for used tracks */ for (vector::iterator a = uniquetr.begin (); a != uniquetr.end (); ++a) { struct ptflookup miditr; - list > mt (new_midi_track ( + list > mt (new_midi_track ( ChanCount (DataType::MIDI, 1), ChanCount (DataType::MIDI, 1), true, @@ -433,25 +433,25 @@ no_audio_tracks: /* MIDI - Add midi regions one-by-one to corresponding midi tracks */ for (vector::const_iterator a = ptf.miditracks ().begin (); a != ptf.miditracks ().end (); ++a) { - boost::shared_ptr midi_track = midi_tracks[a->index]; + std::shared_ptr midi_track = midi_tracks[a->index]; assert (midi_track); - boost::shared_ptr playlist = midi_track->playlist (); + std::shared_ptr playlist = midi_track->playlist (); samplepos_t f = (samplepos_t)a->reg.startpos * srate / 1920000.; samplecnt_t length = (samplecnt_t)a->reg.length * srate / 1920000.; MusicSample pos (f, 0); - boost::shared_ptr src = create_midi_source_by_stealing_name (midi_track); + std::shared_ptr src = create_midi_source_by_stealing_name (midi_track); PropertyList plist; plist.add (ARDOUR::Properties::start, 0); plist.add (ARDOUR::Properties::length, length); plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix (src->name ())); //printf(" : %d - trackname: (%s)\n", a->index, src->name ().c_str ()); - boost::shared_ptr region = (RegionFactory::create (src, plist)); + std::shared_ptr region = (RegionFactory::create (src, plist)); /* sets position */ region->set_position (timepos_t (pos.sample)); midi_track->playlist ()->add_region (region, timepos_t (pos.sample), 1.0, false); - boost::shared_ptr mr = boost::dynamic_pointer_cast(region); - boost::shared_ptr mm = mr->midi_source (0)->model (); + std::shared_ptr mr = std::dynamic_pointer_cast(region); + std::shared_ptr mm = mr->midi_source (0)->model (); MidiModel::NoteDiffCommand *midicmd; midicmd = mm->new_note_diff_command ("Import ProTools MIDI"); @@ -460,11 +460,11 @@ no_audio_tracks: Temporal::Beats start = Temporal::Beats::from_double (j->pos / 960000.); Temporal::Beats len = Temporal::Beats::from_double(j->length / 960000.); /* PT C-2 = 0, Ardour C-1 = 0, subtract twelve to convert ? */ - midicmd->add (boost::shared_ptr > (new Evoral::Note ((uint8_t)1, start, len, j->note, j->velocity))); + midicmd->add (std::shared_ptr > (new Evoral::Note ((uint8_t)1, start, len, j->note, j->velocity))); } mm->apply_diff_command_only (*this, midicmd); delete midicmd; - boost::shared_ptr copy (RegionFactory::create (mr, true)); + std::shared_ptr copy (RegionFactory::create (mr, true)); playlist->clear_changes (); playlist->add_region (copy, timepos_t (f)); } diff --git a/libs/ardour/instrument_info.cc b/libs/ardour/instrument_info.cc index 2d5a156d4a..791b8c1b58 100644 --- a/libs/ardour/instrument_info.cc +++ b/libs/ardour/instrument_info.cc @@ -61,7 +61,7 @@ InstrumentInfo::set_external_instrument (const string& model, const string& mode } void -InstrumentInfo::set_internal_instrument (boost::shared_ptr p) +InstrumentInfo::set_internal_instrument (std::shared_ptr p) { invalidate_cached_plugin_model (); if (p == internal_instrument.lock ()) { @@ -75,7 +75,7 @@ InstrumentInfo::set_internal_instrument (boost::shared_ptr p) Changed (); /* EMIT SIGNAL */ } - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (pi && pi->plugin ()->has_midnam ()) { pi->plugin()->UpdatedMidnam.connect_same_thread (_midnam_changed, boost::bind (&InstrumentInfo::emit_changed, this)); } @@ -91,9 +91,9 @@ InstrumentInfo::emit_changed () { bool InstrumentInfo::have_custom_plugin_info () const { - boost::shared_ptr p = internal_instrument.lock (); + std::shared_ptr p = internal_instrument.lock (); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (pi && pi->plugin ()->has_midnam ()) { std::string model = pi->plugin ()->midnam_model (); const std::list device_modes = MidiPatchManager::instance ().custom_device_mode_names_by_model (model); @@ -113,8 +113,8 @@ InstrumentInfo::model () const if (!_plugin_model.empty ()) { return _plugin_model; } - boost::shared_ptr p = internal_instrument.lock (); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr p = internal_instrument.lock (); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (pi && pi->plugin ()->has_midnam ()) { _plugin_model = pi->plugin ()->midnam_model (); return _plugin_model; @@ -131,8 +131,8 @@ InstrumentInfo::mode () const if (!_plugin_mode.empty ()) { return _plugin_mode; } - boost::shared_ptr p = internal_instrument.lock (); - boost::shared_ptr pi = boost::dynamic_pointer_cast (p); + std::shared_ptr p = internal_instrument.lock (); + std::shared_ptr pi = std::dynamic_pointer_cast (p); if (pi && pi->plugin ()->has_midnam ()) { const std::list device_modes = MidiPatchManager::instance ().custom_device_mode_names_by_model (model ()); if (device_modes.size () > 0) { @@ -146,33 +146,33 @@ InstrumentInfo::mode () const string InstrumentInfo::get_note_name (uint16_t bank, uint8_t program, uint8_t channel, uint8_t note) const { - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); if (dev_names) { return dev_names->note_name (mode (), channel, bank, program, note); } return ""; } -boost::shared_ptr +std::shared_ptr InstrumentInfo::value_name_list_by_control (uint8_t channel, uint8_t number) const { - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); if (dev_names) { return dev_names->value_name_list_by_control (mode (), channel, number); } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr InstrumentInfo::master_device_names () const { #if 1 /* this safe if model does not exist */ - boost::shared_ptr midnam = MidiPatchManager::instance ().document_by_model (model ()); + std::shared_ptr midnam = MidiPatchManager::instance ().document_by_model (model ()); if (midnam) { return midnam->master_device_names (model ()); } - return boost::shared_ptr (); + return std::shared_ptr (); #else return MidiPatchManager::instance ().master_device_by_model (model ()); #endif @@ -184,10 +184,10 @@ InstrumentInfo::master_device_names () const uint16_t InstrumentInfo::channels_for_control_list (std::string const& ctrl_name_list) const { - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); uint16_t channels = 0; for (int c = 0; c < 16; ++c) { - boost::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), c)); + std::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), c)); if (!chan_names || !chan_names->available_for_channel (c + 1)) { continue; } @@ -201,13 +201,13 @@ InstrumentInfo::channels_for_control_list (std::string const& ctrl_name_list) co return channels; } -boost::shared_ptr +std::shared_ptr InstrumentInfo::control_name_list (uint8_t channel) { - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); - boost::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), channel)); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), channel)); if (!chan_names) { - return boost::shared_ptr (); + return std::shared_ptr (); } return dev_names->control_name_list (chan_names->control_list_name ()); } @@ -215,7 +215,7 @@ InstrumentInfo::control_name_list (uint8_t channel) size_t InstrumentInfo::master_controller_count () const { - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); if (!dev_names) { return 0; } @@ -223,7 +223,7 @@ InstrumentInfo::master_controller_count () const size_t total_ctrls = 0; for (MasterDeviceNames::ControlNameLists::const_iterator l = ctllist.begin(); l != ctllist.end(); ++l) { - boost::shared_ptr const& name_list = l->second; + std::shared_ptr const& name_list = l->second; total_ctrls += name_list->controls().size(); } return total_ctrls; @@ -235,7 +235,7 @@ InstrumentInfo::master_control_names () const { static MasterDeviceNames::ControlNameLists empty_list; - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); if (dev_names) { return dev_names->controls(); } @@ -260,7 +260,7 @@ InstrumentInfo::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel, { PatchPrimaryKey patch_key (program, bank); - boost::shared_ptr const& patch (MidiPatchManager::instance ().find_patch (model (), mode (), channel, patch_key)); + std::shared_ptr const& patch (MidiPatchManager::instance ().find_patch (model (), mode (), channel, patch_key)); if (patch) { return patch->name (); @@ -284,21 +284,21 @@ InstrumentInfo::get_controller_name (Evoral::Parameter param) const return ""; } - boost::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); + std::shared_ptr const& dev_names (MidiPatchManager::instance ().master_device_by_model (model ())); if (!dev_names) { return ""; } - boost::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), param.channel ())); + std::shared_ptr const& chan_names (dev_names->channel_name_set_by_channel (mode (), param.channel ())); if (!chan_names) { return ""; } - boost::shared_ptr const& control_names (dev_names->control_name_list (chan_names->control_list_name ())); + std::shared_ptr const& control_names (dev_names->control_name_list (chan_names->control_list_name ())); if (!control_names) { return ""; } - boost::shared_ptr const& c = control_names->control (param.id ()); + std::shared_ptr const& c = control_names->control (param.id ()); if (c) { return string_compose (c->name () + " [%1]", int(param.channel ()) + 1); @@ -307,7 +307,7 @@ InstrumentInfo::get_controller_name (Evoral::Parameter param) const return ""; } -boost::shared_ptr +std::shared_ptr InstrumentInfo::get_patches (uint8_t channel) { return MidiPatchManager::instance ().find_channel_name_set (model (), mode (), channel); diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index ec009139e3..47c7902b4a 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -50,10 +50,10 @@ using namespace std; PBD::Signal1 InternalSend::CycleStart; InternalSend::InternalSend (Session& s, - boost::shared_ptr p, - boost::shared_ptr mm, - boost::shared_ptr sendfrom, - boost::shared_ptr sendto, + std::shared_ptr p, + std::shared_ptr mm, + std::shared_ptr sendfrom, + std::shared_ptr sendto, Delivery::Role role, bool ignore_bitslot) : Send (s, p, mm, role, ignore_bitslot) @@ -105,7 +105,7 @@ InternalSend::propagate_solo () _send_to->solo_isolate_control()->mod_solo_isolated_by_upstream (-1); } /* propagate further downstream alike Route::input_change_handler() */ - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i) == _send_to || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) { continue; @@ -123,7 +123,7 @@ InternalSend::propagate_solo () _send_from->solo_control()->mod_solo_by_others_downstream (-1); /* propagate further upstream alike Route::output_change_handler() */ - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if (*i == _send_from || !(*i)->can_solo()) { continue; @@ -148,7 +148,7 @@ InternalSend::init_gain () } int -InternalSend::use_target (boost::shared_ptr sendto, bool update_name) +InternalSend::use_target (std::shared_ptr sendto, bool update_name) { if (_send_to) { propagate_solo (); @@ -373,7 +373,7 @@ InternalSend::set_allow_feedback (bool yn) } bool -InternalSend::feeds (boost::shared_ptr other) const +InternalSend::feeds (std::shared_ptr other) const { if (_role == Listen || !_allow_feedback) { return _send_to == other; @@ -448,7 +448,7 @@ InternalSend::after_connect () return 0; } - boost::shared_ptr sendto; + std::shared_ptr sendto; if ((sendto = _session.route_by_id (_send_to_id)) == 0) { error << string_compose (_("%1 - cannot find any track/bus with the ID %2 to connect to"), display_name (), _send_to_id) << endmsg; diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 7057fd3250..0f2ae80ebe 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -110,7 +110,7 @@ IO::~IO () } void -IO::connection_change (boost::shared_ptr a, boost::shared_ptr b) +IO::connection_change (std::shared_ptr a, std::shared_ptr b) { if (_session.deletion_in_progress ()) { return; @@ -151,7 +151,7 @@ IO::silence (samplecnt_t nframes) } int -IO::disconnect (boost::shared_ptr our_port, string other_port, void* src) +IO::disconnect (std::shared_ptr our_port, string other_port, void* src) { if (other_port.length() == 0 || our_port == 0) { return 0; @@ -185,7 +185,7 @@ IO::disconnect (boost::shared_ptr our_port, string other_port, void* src) } int -IO::connect (boost::shared_ptr our_port, string other_port, void* src) +IO::connect (std::shared_ptr our_port, string other_port, void* src) { if (other_port.length() == 0 || our_port == 0) { return 0; @@ -230,7 +230,7 @@ IO::can_add_port (DataType type) const } int -IO::remove_port (boost::shared_ptr port, void* src) +IO::remove_port (std::shared_ptr port, void* src) { ChanCount before = _ports.count (); ChanCount after = before; @@ -292,7 +292,7 @@ IO::remove_port (boost::shared_ptr port, void* src) int IO::add_port (string destination, void* src, DataType type) { - boost::shared_ptr our_port; + std::shared_ptr our_port; if (type == DataType::NIL) { type = _default_type; @@ -384,8 +384,8 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed) assert (!AudioEngine::instance()->process_lock().trylock()); #endif - boost::shared_ptr port; - vector > deleted_ports; + std::shared_ptr port; + vector > deleted_ports; changed = false; @@ -659,7 +659,7 @@ IO::set_state (const XMLNode& node, int version) continue; } - boost::shared_ptr p = port_by_name (prop->value()); + std::shared_ptr p = port_by_name (prop->value()); if (p) { p->set_state (**i, version); @@ -709,14 +709,14 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) return 0; } -boost::shared_ptr +std::shared_ptr IO::find_possible_bundle (const string &desired_name) { static const string digits = "0123456789"; const string &default_name = (_direction == Input ? _("in") : _("out")); const string &bundle_type_name = (_direction == Input ? _("input") : _("output")); - boost::shared_ptr c = _session.bundle_by_name (desired_name); + std::shared_ptr c = _session.bundle_by_name (desired_name); if (!c) { int bundle_number, mask; @@ -800,7 +800,7 @@ IO::find_possible_bundle (const string &desired_name) } int -IO::get_port_counts_2X (XMLNode const & node, int /*version*/, ChanCount& n, boost::shared_ptr& /*c*/) +IO::get_port_counts_2X (XMLNode const & node, int /*version*/, ChanCount& n, std::shared_ptr& /*c*/) { XMLProperty const * prop; XMLNodeList children = node.children (); @@ -828,7 +828,7 @@ IO::get_port_counts_2X (XMLNode const & node, int /*version*/, ChanCount& n, boo } int -IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr& c) +IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, std::shared_ptr& c) { if (version < 3000) { return get_port_counts_2X (node, version, n, c); @@ -885,7 +885,7 @@ int IO::create_ports (const XMLNode& node, int version) { ChanCount n; - boost::shared_ptr c; + std::shared_ptr c; get_port_counts (node, version, n, c); @@ -1323,12 +1323,12 @@ IO::connected_latency (bool for_playback) const } int -IO::connect_ports_to_bundle (boost::shared_ptr c, bool exclusive, void* src) { +IO::connect_ports_to_bundle (std::shared_ptr c, bool exclusive, void* src) { return connect_ports_to_bundle(c, exclusive, false, src); } int -IO::connect_ports_to_bundle (boost::shared_ptr c, bool exclusive, +IO::connect_ports_to_bundle (std::shared_ptr c, bool exclusive, bool allow_partial, void* src) { BLOCK_PROCESS_CALLBACK (); @@ -1351,7 +1351,7 @@ IO::connect_ports_to_bundle (boost::shared_ptr c, bool exclusive, } int -IO::disconnect_ports_from_bundle (boost::shared_ptr c, void* src) +IO::disconnect_ports_from_bundle (std::shared_ptr c, void* src) { BLOCK_PROCESS_CALLBACK (); @@ -1462,14 +1462,14 @@ IO::find_port_hole (const char* base) } -boost::shared_ptr +std::shared_ptr IO::audio(uint32_t n) const { return _ports.nth_audio_port (n); } -boost::shared_ptr +std::shared_ptr IO::midi(uint32_t n) const { return _ports.nth_midi_port (n); @@ -1515,7 +1515,7 @@ IO::bundles_connected () BundleList bundles; /* Session bundles */ - boost::shared_ptr b = _session.bundles (); + std::shared_ptr b = _session.bundles (); for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { if ((*i)->connected_to (_bundle, _session.engine())) { bundles.push_back (*i); @@ -1524,7 +1524,7 @@ IO::bundles_connected () /* Route bundles */ - boost::shared_ptr r = _session.get_routes (); + std::shared_ptr r = _session.get_routes (); if (_direction == Input) { for (ARDOUR::RouteList::iterator i = r->begin(); i != r->end(); ++i) { @@ -1544,7 +1544,7 @@ IO::bundles_connected () } -IO::UserBundleInfo::UserBundleInfo (IO* io, boost::shared_ptr b) +IO::UserBundleInfo::UserBundleInfo (IO* io, std::shared_ptr b) { bundle = b; b->Changed.connect_same_thread (changed, boost::bind (&IO::bundle_changed, io, _1)); @@ -1618,7 +1618,7 @@ IO::connected () const } bool -IO::connected_to (boost::shared_ptr other) const +IO::connected_to (std::shared_ptr other) const { if (!other) { return connected (); @@ -1632,8 +1632,8 @@ IO::connected_to (boost::shared_ptr other) const for (i = 0; i < no; ++i) { for (j = 0; j < ni; ++j) { - boost::shared_ptr pa (nth(i)); - boost::shared_ptr pb (other->nth(j)); + std::shared_ptr pa (nth(i)); + std::shared_ptr pb (other->nth(j)); if (pa && pb && pa->connected_to (pb->name())) { return true; } @@ -1717,7 +1717,7 @@ IO::copy_to_outputs (BufferSet& bufs, DataType type, pframes_t nframes, samplecn } } -boost::shared_ptr +std::shared_ptr IO::port_by_name (const std::string& str) const { /* to be called only from ::set_state() - no locking */ @@ -1725,11 +1725,11 @@ IO::port_by_name (const std::string& str) const for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) { if (i->name() == str) { - return boost::const_pointer_cast (*i); + return std::const_pointer_cast (*i); } } - return boost::shared_ptr (); + return std::shared_ptr (); } bool @@ -1745,7 +1745,7 @@ IO::physically_connected () const } bool -IO::has_port (boost::shared_ptr p) const +IO::has_port (std::shared_ptr p) const { Glib::Threads::RWLock::ReaderLock rl (_io_lock); return _ports.contains (p); diff --git a/libs/ardour/io_plug.cc b/libs/ardour/io_plug.cc index 93ed236adc..4a47fc53d4 100644 --- a/libs/ardour/io_plug.cc +++ b/libs/ardour/io_plug.cc @@ -40,7 +40,7 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -IOPlug::IOPlug (Session& s, boost::shared_ptr p, bool pre) +IOPlug::IOPlug (Session& s, std::shared_ptr p, bool pre) : SessionObject (s, "") , GraphNode (s._process_graph) , _plugin (p) @@ -62,7 +62,7 @@ IOPlug::IOPlug (Session& s, boost::shared_ptr p, bool pre) IOPlug::~IOPlug () { for (CtrlOutMap::const_iterator i = _control_outputs.begin(); i != _control_outputs.end(); ++i) { - boost::dynamic_pointer_cast(i->second)->drop_references (); + std::dynamic_pointer_cast(i->second)->drop_references (); } } @@ -102,7 +102,7 @@ IOPlug::get_state() const node->add_child_nocopy (_plugin->get_state()); for (auto const& c : controls()) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (c.second); + std::shared_ptr ac = std::dynamic_pointer_cast (c.second); if (ac) { node->add_child_nocopy (ac->get_state()); } @@ -316,13 +316,13 @@ IOPlug::create_parameters () _plugin->get_parameter_descriptor (i, desc); if (!_plugin->parameter_is_input (i)) { - _control_outputs[i] = boost::shared_ptr (new ReadOnlyControl (_plugin, desc, i)); + _control_outputs[i] = std::shared_ptr (new ReadOnlyControl (_plugin, desc, i)); continue; } Evoral::Parameter param (PluginAutomation, 0, i); - boost::shared_ptr c (new PluginControl(this, param, desc)); + std::shared_ptr c (new PluginControl(this, param, desc)); c->set_flag (Controllable::NotAutomatable); add_control (c); @@ -337,7 +337,7 @@ IOPlug::create_parameters () if (desc.datatype == Variant::NOTHING) { continue; } - boost::shared_ptr c (new PluginPropertyControl (this, param, desc)); + std::shared_ptr c (new PluginPropertyControl (this, param, desc)); c->set_flag (Controllable::NotAutomatable); add_control (c); } @@ -348,8 +348,8 @@ IOPlug::create_parameters () void IOPlug::parameter_changed_externally (uint32_t which, float val) { - boost::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, which)); - boost::shared_ptr pc = boost::dynamic_pointer_cast (c); + std::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, which)); + std::shared_ptr pc = std::dynamic_pointer_cast (c); if (pc) { pc->catch_up_with_external_value (val); } @@ -518,12 +518,12 @@ IOPlug::clear_stats () g_atomic_int_set (&_stat_reset, 1); } -boost::shared_ptr +std::shared_ptr IOPlug::control_output (uint32_t num) const { CtrlOutMap::const_iterator i = _control_outputs.find (num); if (i == _control_outputs.end ()) { - return boost::shared_ptr (); + return std::shared_ptr (); } else { return (*i).second; } @@ -541,12 +541,12 @@ IOPlug::write_immediate_event (Evoral::EventType event_type, size_t size, const return _plugin->write_immediate_event (event_type, size, buf); } -boost::shared_ptr +std::shared_ptr IOPlug::control_factory(const Evoral::Parameter& param) { Evoral::Control* control = NULL; ParameterDescriptor desc(param); - boost::shared_ptr list; + std::shared_ptr list; #if 0 if (param.type() == PluginAutomation) { @@ -561,11 +561,11 @@ IOPlug::control_factory(const Evoral::Parameter& param) #endif if (!control) { - boost::shared_ptr list; + std::shared_ptr list; control = new AutomationControl (_session, param, desc, list); } - return boost::shared_ptr(control); + return std::shared_ptr(control); } std::string @@ -580,9 +580,9 @@ IOPlug::describe_parameter (Evoral::Parameter param) } bool -IOPlug::direct_feeds_according_to_reality (boost::shared_ptr node, bool* via_send_only) +IOPlug::direct_feeds_according_to_reality (std::shared_ptr node, bool* via_send_only) { - boost::shared_ptr other (boost::dynamic_pointer_cast (node)); + std::shared_ptr other (std::dynamic_pointer_cast (node)); assert (other && other->_pre == _pre); if (via_send_only) { *via_send_only = false; @@ -595,7 +595,7 @@ IOPlug::direct_feeds_according_to_reality (boost::shared_ptr node, bo IOPlug::PluginControl::PluginControl (IOPlug* p, Evoral::Parameter const& param, ParameterDescriptor const& desc) - : AutomationControl (p->session (), param, desc, boost::shared_ptr (), p->describe_parameter (param)) + : AutomationControl (p->session (), param, desc, std::shared_ptr (), p->describe_parameter (param)) , _iop (p) { } @@ -620,7 +620,7 @@ IOPlug::PluginControl::get_state () const XMLNode& node (AutomationControl::get_state()); node.set_property ("parameter", parameter().id()); - boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (_iop->plugin ()); + std::shared_ptr lv2plugin = std::dynamic_pointer_cast (_iop->plugin ()); if (lv2plugin) { node.set_property ("symbol", lv2plugin->port_symbol (parameter().id())); } @@ -631,7 +631,7 @@ IOPlug::PluginControl::get_state () const double IOPlug::PluginControl::get_value () const { - boost::shared_ptr plugin = _iop->plugin (); + std::shared_ptr plugin = _iop->plugin (); if (!plugin) { return 0.0; @@ -643,7 +643,7 @@ IOPlug::PluginControl::get_value () const std::string IOPlug::PluginControl::get_user_string () const { - boost::shared_ptr plugin = _iop->plugin (0); + std::shared_ptr plugin = _iop->plugin (0); if (plugin) { std::string pp; if (plugin->print_parameter (parameter().id(), pp) && pp.size () > 0) { diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc index c2f9f9dfeb..12e3850edd 100644 --- a/libs/ardour/io_processor.cc +++ b/libs/ardour/io_processor.cc @@ -70,7 +70,7 @@ IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output, /* create an IOProcessor that proxies to an existing IO object */ -IOProcessor::IOProcessor (Session& s, boost::shared_ptr in, boost::shared_ptr out, +IOProcessor::IOProcessor (Session& s, std::shared_ptr in, std::shared_ptr out, const string& proc_name, Temporal::TimeDomain td, bool sendish) : Processor(s, proc_name, td) , _input (in) @@ -98,7 +98,7 @@ IOProcessor::~IOProcessor () } void -IOProcessor::set_input (boost::shared_ptr io) +IOProcessor::set_input (std::shared_ptr io) { /* CALLER MUST HOLD PROCESS LOCK */ @@ -107,7 +107,7 @@ IOProcessor::set_input (boost::shared_ptr io) } void -IOProcessor::set_output (boost::shared_ptr io) +IOProcessor::set_output (std::shared_ptr io) { /* CALLER MUST HOLD PROCESS LOCK */ @@ -335,7 +335,7 @@ IOProcessor::set_name (const std::string& new_name) } bool -IOProcessor::feeds (boost::shared_ptr other) const +IOProcessor::feeds (std::shared_ptr other) const { return _output && _output->connected_to (other->input()); } diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc index 23818711a3..76dedd78eb 100644 --- a/libs/ardour/ladspa_plugin.cc +++ b/libs/ardour/ladspa_plugin.cc @@ -629,10 +629,10 @@ LadspaPlugin::parameter_is_input (uint32_t param) const return LADSPA_IS_PORT_INPUT(port_descriptor (param)); } -boost::shared_ptr +std::shared_ptr LadspaPlugin::get_scale_points(uint32_t port_index) const { - boost::shared_ptr ret; + std::shared_ptr ret; #ifdef HAVE_LRDF const uint32_t id = atol(unique_id().c_str()); lrdf_defaults* points = lrdf_get_scale_values(id, port_index); @@ -641,7 +641,7 @@ LadspaPlugin::get_scale_points(uint32_t port_index) const return ret; } - ret = boost::shared_ptr(new ScalePoints()); + ret = std::shared_ptr(new ScalePoints()); for (uint32_t i = 0; i < points->count; ++i) { ret->insert(make_pair(points->items[i].label, diff --git a/libs/ardour/legatize.cc b/libs/ardour/legatize.cc index d922bf3f8f..eb6509c3d8 100644 --- a/libs/ardour/legatize.cc +++ b/libs/ardour/legatize.cc @@ -30,7 +30,7 @@ Legatize::~Legatize () {} Command* -Legatize::operator()(boost::shared_ptr model, +Legatize::operator()(std::shared_ptr model, Temporal::Beats position, std::vector& seqs) { diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 88acf9824f..a58734a602 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -754,7 +754,7 @@ Location::unlock () } void -Location::set_scene_change (boost::shared_ptr sc) +Location::set_scene_change (std::shared_ptr sc) { if (_scene_change != sc) { _scene_change = sc; diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 21968e28d7..ffd7df760c 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -114,11 +114,11 @@ LTC_TransportMaster::~LTC_TransportMaster() } void -LTC_TransportMaster::connection_handler (boost::weak_ptr w0, std::string n0, boost::weak_ptr w1, std::string n1, bool con) +LTC_TransportMaster::connection_handler (std::weak_ptr w0, std::string n0, std::weak_ptr w1, std::string n1, bool con) { TransportMaster::connection_handler(w0, n0, w1, n1, con); - boost::shared_ptr p = w1.lock (); + std::shared_ptr p = w1.lock (); if (p == _port) { resync_latency (false); } diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc index b802d65eb9..a29f75ac2b 100644 --- a/libs/ardour/lua_api.cc +++ b/libs/ardour/lua_api.cc @@ -73,23 +73,23 @@ ARDOUR::LuaAPI::datatype_ctor_midi (lua_State *L) return 1; } -boost::shared_ptr +std::shared_ptr ARDOUR::LuaAPI::nil_processor () { - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr ARDOUR::LuaAPI::new_luaproc (Session *s, const string& name) { return new_luaproc_with_time_domain (s, name, Config->get_default_automation_time_domain()); } -boost::shared_ptr +std::shared_ptr ARDOUR::LuaAPI::new_luaproc_with_time_domain (Session *s, const string& name, Temporal::TimeDomain td) { if (!s) { - return boost::shared_ptr (); + return std::shared_ptr (); } LuaScriptInfoPtr spi; @@ -103,7 +103,7 @@ ARDOUR::LuaAPI::new_luaproc_with_time_domain (Session *s, const string& name, Te if (!spi) { warning << _("Script with given name was not found\n"); - return boost::shared_ptr (); + return std::shared_ptr (); } PluginPtr p; @@ -112,20 +112,20 @@ ARDOUR::LuaAPI::new_luaproc_with_time_domain (Session *s, const string& name, Te p = (lpi->load (*s)); } catch (...) { warning << _("Failed to instantiate Lua Processor\n"); - return boost::shared_ptr (); + return std::shared_ptr (); } - return boost::shared_ptr (new PluginInsert (*s, td, p)); + return std::shared_ptr (new PluginInsert (*s, td, p)); } -boost::shared_ptr -ARDOUR::LuaAPI::new_send (Session* s, boost::shared_ptr r, boost::shared_ptr before) +std::shared_ptr +ARDOUR::LuaAPI::new_send (Session* s, std::shared_ptr r, std::shared_ptr before) { if (!s) { - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr send (new Send (*s, r->pannable (), r->mute_master ())); + std::shared_ptr send (new Send (*s, r->pannable (), r->mute_master ())); /* make an educated guess at the initial number of outputs for the send */ ChanCount outs = before ? before->input_streams () : r->n_outputs(); @@ -135,14 +135,14 @@ ARDOUR::LuaAPI::new_send (Session* s, boost::shared_ptr r, boost::shared_ send->output()->ensure_io (outs, false, r.get()); } catch (AudioEngine::PortRegistrationFailure& err) { error << string_compose (_("Cannot set up new send: %1"), err.what ()) << endmsg; - return boost::shared_ptr (); + return std::shared_ptr (); } if (0 == r->add_processor (send, before)) { return send; } - return boost::shared_ptr (); + return std::shared_ptr (); } std::string @@ -213,28 +213,28 @@ ARDOUR::LuaAPI::new_plugin_info (const string& name, ARDOUR::PluginType type) return PluginInfoPtr (); } -boost::shared_ptr +std::shared_ptr ARDOUR::LuaAPI::new_plugin (Session *s, const string& name, ARDOUR::PluginType type, const string& preset) { return new_plugin_with_time_domain (s, name, type, Config->get_default_automation_time_domain(), preset); } -boost::shared_ptr +std::shared_ptr ARDOUR::LuaAPI::new_plugin_with_time_domain (Session *s, const string& name, ARDOUR::PluginType type, Temporal::TimeDomain td, const string& preset) { if (!s) { - return boost::shared_ptr (); + return std::shared_ptr (); } PluginInfoPtr pip = new_plugin_info (name, type); if (!pip) { - return boost::shared_ptr (); + return std::shared_ptr (); } PluginPtr p = pip->load (*s); if (!p) { - return boost::shared_ptr (); + return std::shared_ptr (); } if (!preset.empty ()) { @@ -244,13 +244,13 @@ ARDOUR::LuaAPI::new_plugin_with_time_domain (Session *s, const string& name, ARD } } - return boost::shared_ptr (new PluginInsert (*s, td, p)); + return std::shared_ptr (new PluginInsert (*s, td, p)); } bool -ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr pi, uint32_t which, float val) +ARDOUR::LuaAPI::set_plugin_insert_param (std::shared_ptr pi, uint32_t which, float val) { - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr plugin = pi->plugin (); if (!plugin) { return false; } bool ok=false; @@ -262,16 +262,16 @@ ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr pi, uin if (plugin->get_parameter_descriptor (controlid, pd) != 0) { return false; } if (val < pd.lower || val > pd.upper) { return false; } - boost::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); + std::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); c->set_value (val, PBD::Controllable::NoGroup); return true; } float -ARDOUR::LuaAPI::get_plugin_insert_param (boost::shared_ptr pi, uint32_t which, bool &ok) +ARDOUR::LuaAPI::get_plugin_insert_param (std::shared_ptr pi, uint32_t which, bool &ok) { ok=false; - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr plugin = pi->plugin (); if (!plugin) { return 0; } uint32_t controlid = plugin->nth_parameter (which, ok); if (!ok) { return 0; } @@ -279,26 +279,26 @@ ARDOUR::LuaAPI::get_plugin_insert_param (boost::shared_ptr pi, uin } bool -ARDOUR::LuaAPI::set_processor_param (boost::shared_ptr proc, uint32_t which, float val) +ARDOUR::LuaAPI::set_processor_param (std::shared_ptr proc, uint32_t which, float val) { - boost::shared_ptr pi = boost::dynamic_pointer_cast (proc); + std::shared_ptr pi = std::dynamic_pointer_cast (proc); if (!pi) { return false; } return set_plugin_insert_param (pi, which, val); } float -ARDOUR::LuaAPI::get_processor_param (boost::shared_ptr proc, uint32_t which, bool &ok) +ARDOUR::LuaAPI::get_processor_param (std::shared_ptr proc, uint32_t which, bool &ok) { ok=false; - boost::shared_ptr pi = boost::dynamic_pointer_cast (proc); + std::shared_ptr pi = std::dynamic_pointer_cast (proc); if (!pi) { ok = false; return 0;} return get_plugin_insert_param (pi, which, ok); } bool -ARDOUR::LuaAPI::reset_processor_to_default ( boost::shared_ptr proc ) +ARDOUR::LuaAPI::reset_processor_to_default ( std::shared_ptr proc ) { - boost::shared_ptr pi = boost::dynamic_pointer_cast (proc); + std::shared_ptr pi = std::dynamic_pointer_cast (proc); if (pi) { pi->reset_parameters_to_default(); return true; @@ -309,7 +309,7 @@ ARDOUR::LuaAPI::reset_processor_to_default ( boost::shared_ptr proc ) int ARDOUR::LuaAPI::plugin_automation (lua_State *L) { - typedef boost::shared_ptr T; + typedef std::shared_ptr T; int top = lua_gettop (L); if (top < 2) { @@ -320,11 +320,11 @@ ARDOUR::LuaAPI::plugin_automation (lua_State *L) if (!p) { return luaL_error (L, "Invalid pointer to Ardour:Processor"); } - boost::shared_ptr pi = boost::dynamic_pointer_cast (*p); + std::shared_ptr pi = std::dynamic_pointer_cast (*p); if (!pi) { return luaL_error (L, "Given Processor is not a Plugin Insert"); } - boost::shared_ptr plugin = pi->plugin (); + std::shared_ptr plugin = pi->plugin (); if (!plugin) { return luaL_error (L, "Given Processor is not a Plugin"); } @@ -343,10 +343,10 @@ ARDOUR::LuaAPI::plugin_automation (lua_State *L) return luaL_error (L, "Cannot describe parameter"); } - boost::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); + std::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); - luabridge::Stack >::push (L, c->alist ()); - luabridge::Stack >::push (L, c->list ()); + luabridge::Stack >::push (L, c->alist ()); + luabridge::Stack >::push (L, c->list ()); luabridge::Stack::push (L, pd); return 3; } @@ -958,7 +958,7 @@ LuaAPI::Vamp::initialize () } int -LuaAPI::Vamp::analyze (boost::shared_ptr r, uint32_t channel, luabridge::LuaRef cb) +LuaAPI::Vamp::analyze (std::shared_ptr r, uint32_t channel, luabridge::LuaRef cb) { if (!_initialized) { if (!initialize ()) { @@ -1014,16 +1014,16 @@ LuaAPI::Vamp::process (const std::vector& d, ::Vamp::RealTime rt) return _plugin->process (bufs, rt); } -boost::shared_ptr > +std::shared_ptr > LuaAPI::new_noteptr (uint8_t chan, Temporal::Beats beat_time, Temporal::Beats length, uint8_t note, uint8_t velocity) { - return boost::shared_ptr > (new Evoral::Note(chan, beat_time, length, note, velocity)); + return std::shared_ptr > (new Evoral::Note(chan, beat_time, length, note, velocity)); } -std::list > > -LuaAPI::note_list (boost::shared_ptr mm) +std::list > > +LuaAPI::note_list (std::shared_ptr mm) { - typedef boost::shared_ptr > NotePtr; + typedef std::shared_ptr > NotePtr; std::list note_ptr_list; @@ -1038,7 +1038,7 @@ LuaAPI::note_list (boost::shared_ptr mm) const samplecnt_t LuaAPI::Rubberband::_bufsize = 256; -LuaAPI::Rubberband::Rubberband (boost::shared_ptr r, bool percussive) +LuaAPI::Rubberband::Rubberband (std::shared_ptr r, bool percussive) : _region (r) , _rbs (r->session().sample_rate(), r->n_channels(), percussive ? RubberBand::RubberBandStretcher::DefaultOptions : RubberBand::RubberBandStretcher::PercussiveOptions, @@ -1097,13 +1097,13 @@ LuaAPI::Rubberband::read (Sample* buf, samplepos_t pos, samplecnt_t cnt, int cha static void null_deleter (LuaAPI::Rubberband*) {} -boost::shared_ptr +std::shared_ptr LuaAPI::Rubberband::readable () { if (!_self) { - _self = boost::shared_ptr (this, &null_deleter); + _self = std::shared_ptr (this, &null_deleter); } - return boost::dynamic_pointer_cast (_self); + return std::dynamic_pointer_cast (_self); } bool @@ -1180,10 +1180,10 @@ LuaAPI::Rubberband::retrieve (float** buffers) return true; } -boost::shared_ptr +std::shared_ptr LuaAPI::Rubberband::process (luabridge::LuaRef cb) { - boost::shared_ptr rv; + std::shared_ptr rv; if (cb.type () == LUA_TFUNCTION) { _cb = new luabridge::LuaRef (cb); } @@ -1208,7 +1208,7 @@ LuaAPI::Rubberband::process (luabridge::LuaRef cb) } try { - _asrc.push_back (boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, session, path, sample_rate))); + _asrc.push_back (std::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, session, path, sample_rate))); } catch (failed_constructor& err) { cleanup (true); @@ -1238,7 +1238,7 @@ LuaAPI::Rubberband::process (luabridge::LuaRef cb) return rv; } -boost::shared_ptr +std::shared_ptr LuaAPI::Rubberband::finalize () { time_t xnow = time (NULL); @@ -1246,8 +1246,8 @@ LuaAPI::Rubberband::finalize () /* this is the same as RBEffect::finish, Filter::finish */ SourceList sl; - for (std::vector >::iterator i = _asrc.begin (); i != _asrc.end (); ++i) { - boost::shared_ptr afs = boost::dynamic_pointer_cast (*i); + for (std::vector >::iterator i = _asrc.begin (); i != _asrc.end (); ++i) { + std::shared_ptr afs = std::dynamic_pointer_cast (*i); assert (afs); afs->done_with_peakfile_writes (); afs->update_header (_region->position_sample (), *now, xnow); @@ -1264,8 +1264,8 @@ LuaAPI::Rubberband::finalize () plist.add (Properties::name, region_name); plist.add (Properties::whole_file, true); - boost::shared_ptr r = RegionFactory::create (sl, plist); - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr r = RegionFactory::create (sl, plist); + std::shared_ptr ar = std::dynamic_pointer_cast (r); ar->set_ancestral_data (timepos_t (_read_start), timecnt_t (_read_len, timepos_t (_read_start)), _stretch_ratio, _pitch_ratio); ar->set_master_sources (_region->master_sources ()); @@ -1287,7 +1287,7 @@ void LuaAPI::Rubberband::cleanup (bool abort) { if (abort) { - for (std::vector >::iterator i = _asrc.begin (); i != _asrc.end (); ++i) { + for (std::vector >::iterator i = _asrc.begin (); i != _asrc.end (); ++i) { (*i)->mark_for_remove (); } } diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 2d18248eb7..9461b47f47 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -304,54 +304,54 @@ CLASSKEYS(std::vector); CLASSKEYS(std::list); CLASSKEYS(std::vector); -CLASSKEYS(std::vector >); -CLASSKEYS(std::vector >); -CLASSKEYS(std::vector >); +CLASSKEYS(std::vector >); +CLASSKEYS(std::vector >); +CLASSKEYS(std::vector >); CLASSKEYS(std::vector); -CLASSKEYS(std::list >); // PluginInfoList +CLASSKEYS(std::list >); // PluginInfoList CLASSKEYS(std::list); CLASSKEYS(std::list); CLASSKEYS(std::list); -CLASSKEYS(std::list >); -CLASSKEYS(std::list >); -CLASSKEYS(std::list >); -CLASSKEYS(std::list >); -CLASSKEYS(boost::shared_ptr > >); -CLASSKEYS(boost::shared_ptr > >); +CLASSKEYS(std::list >); +CLASSKEYS(std::list >); +CLASSKEYS(std::list >); +CLASSKEYS(std::list >); +CLASSKEYS(std::shared_ptr > >); +CLASSKEYS(std::shared_ptr > >); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr >); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr >); -CLASSKEYS(boost::shared_ptr >); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr >); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr >); +CLASSKEYS(std::shared_ptr >); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::shared_ptr); -CLASSKEYS(boost::weak_ptr); -CLASSKEYS(boost::weak_ptr); -CLASSKEYS(boost::weak_ptr); -CLASSKEYS(boost::weak_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::shared_ptr); +CLASSKEYS(std::weak_ptr); +CLASSKEYS(std::weak_ptr); +CLASSKEYS(std::weak_ptr); +CLASSKEYS(std::weak_ptr); -CLASSKEYS(boost::shared_ptr); +CLASSKEYS(std::shared_ptr); CLASSKEYS(Vamp::RealTime); CLASSKEYS(Vamp::PluginBase); @@ -399,7 +399,7 @@ CLASSKEYS(LuaDialog::ProgressWindow); * - Do not dereference Shared or Weak Pointers. Pass the pointer to Lua. * - Define Objects as boost:shared_ptr Object whenever possible. * - * Storing a boost::shared_ptr in a Lua-variable keeps the reference + * Storing a std::shared_ptr in a Lua-variable keeps the reference * until that variable is set to 'nil'. * (if the script were to keep a direct pointer to the object instance, the * behaviour is undefined if the actual object goes away) @@ -889,7 +889,7 @@ LuaBindings::common (lua_State* L) .endClass () .beginWSPtrClass ("Control") - .addFunction ("list", (boost::shared_ptr(Evoral::Control::*)())&Evoral::Control::list) + .addFunction ("list", (std::shared_ptr(Evoral::Control::*)())&Evoral::Control::list) .endClass () .beginClass ("ParameterDescriptor") @@ -1251,7 +1251,7 @@ LuaBindings::common (lua_State* L) .addFunction ("num_ports", (size_t (PortSet::*)(DataType)const)&PortSet::num_ports) .addFunction ("add", &PortSet::add) .addFunction ("remove", &PortSet::remove) - .addFunction ("port", (boost::shared_ptr (PortSet::*)(DataType, size_t)const)&PortSet::port) + .addFunction ("port", (std::shared_ptr (PortSet::*)(DataType, size_t)const)&PortSet::port) .addFunction ("contains", &PortSet::contains) .addFunction ("clear", &PortSet::clear) .addFunction ("empty", &PortSet::empty) @@ -1262,7 +1262,7 @@ LuaBindings::common (lua_State* L) .addFunction ("add_port", &IO::add_port) .addFunction ("remove_port", &IO::remove_port) .addFunction ("connect", &IO::connect) - .addFunction ("disconnect", (int (IO::*)(boost::shared_ptr, std::string, void *))&IO::disconnect) + .addFunction ("disconnect", (int (IO::*)(std::shared_ptr, std::string, void *))&IO::disconnect) .addFunction ("disconnect_all", (int (IO::*)(void *))&IO::disconnect) .addFunction ("physically_connected", &IO::physically_connected) .addFunction ("has_port", &IO::has_port) @@ -1433,7 +1433,7 @@ LuaBindings::common (lua_State* L) .addFunction ("soloed", &Route::soloed) .addFunction ("amp", &Route::amp) .addFunction ("trim", &Route::trim) - .addFunction ("peak_meter", (boost::shared_ptr (Route::*)())&Route::peak_meter) + .addFunction ("peak_meter", (std::shared_ptr (Route::*)())&Route::peak_meter) .addFunction ("set_meter_point", &Route::set_meter_point) .addFunction ("signal_latency", &Route::signal_latency) .addFunction ("playback_latency", &Route::playback_latency) @@ -1466,7 +1466,7 @@ LuaBindings::common (lua_State* L) .addFunction ("lower_region", &Playlist::lower_region) .addFunction ("raise_region_to_top", &Playlist::raise_region_to_top) .addFunction ("lower_region_to_bottom", &Playlist::lower_region_to_bottom) - .addFunction ("duplicate", (void (Playlist::*)(boost::shared_ptr, Temporal::timepos_t &, timecnt_t const &, float))&Playlist::duplicate) + .addFunction ("duplicate", (void (Playlist::*)(std::shared_ptr, Temporal::timepos_t &, timecnt_t const &, float))&Playlist::duplicate) .addFunction ("duplicate_until", &Playlist::duplicate_until) .addFunction ("duplicate_range", &Playlist::duplicate_range) .addFunction ("combine", &Playlist::combine) @@ -1478,7 +1478,7 @@ LuaBindings::common (lua_State* L) .addFunction ("split_region", &Playlist::split_region) .addFunction ("get_orig_track_id", &Playlist::get_orig_track_id) //.addFunction ("split", &Playlist::split) // XXX needs MusicSample - .addFunction ("cut", (boost::shared_ptr (Playlist::*)(std::list&, bool))&Playlist::cut) + .addFunction ("cut", (std::shared_ptr (Playlist::*)(std::list&, bool))&Playlist::cut) #if 0 .addFunction ("copy", &Playlist::copy) .addFunction ("paste", &Playlist::paste) @@ -1626,13 +1626,13 @@ LuaBindings::common (lua_State* L) .addFunction ("set_video_locked", &Region::set_video_locked) .addFunction ("set_position_locked", &Region::set_position_locked) .addFunction ("source", &Region::source) - .addFunction ("control", static_cast(Region::*)(const Evoral::Parameter&, bool)>(&Region::control)) + .addFunction ("control", static_cast(Region::*)(const Evoral::Parameter&, bool)>(&Region::control)) .endClass () .deriveWSPtrClass ("MidiRegion") .addFunction ("do_export", &MidiRegion::do_export) .addFunction ("midi_source", &MidiRegion::midi_source) - .addFunction ("model", (boost::shared_ptr (MidiRegion::*)())&MidiRegion::model) + .addFunction ("model", (std::shared_ptr (MidiRegion::*)())&MidiRegion::model) .endClass () .deriveWSPtrClass ("AudioRegion") @@ -1725,7 +1725,7 @@ LuaBindings::common (lua_State* L) .deriveWSPtrClass ("Automatable") .addCast ("to_slavable") - .addFunction ("automation_control", (boost::shared_ptr(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control) + .addFunction ("automation_control", (std::shared_ptr(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control) .addFunction ("all_automatable_params", &Automatable::all_automatable_params) .endClass () @@ -1759,7 +1759,7 @@ LuaBindings::common (lua_State* L) .endClass () .beginStdVector ("PresetVector").endClass () - .beginStdList > ("PluginInfoList").endClass () + .beginStdList > ("PluginInfoList").endClass () .deriveClass ("ParameterDescriptor") .addVoidConstructor () @@ -1776,7 +1776,7 @@ LuaBindings::common (lua_State* L) .addStaticFunction ("midi_note_name", &ParameterDescriptor::midi_note_name) .endClass () - .beginStdVector > ("ProcessorVector").endClass () + .beginStdVector > ("ProcessorVector").endClass () .deriveWSPtrClass ("Processor") .addCast ("to_automatable") @@ -1826,8 +1826,8 @@ LuaBindings::common (lua_State* L) .deriveWSPtrClass ("IOProcessor") .addFunction ("natural_input_streams", &IOProcessor::natural_input_streams) .addFunction ("natural_output_streams", &IOProcessor::natural_output_streams) - .addFunction ("input", (boost::shared_ptr(IOProcessor::*)())&IOProcessor::input) - .addFunction ("output", (boost::shared_ptr(IOProcessor::*)())&IOProcessor::output) + .addFunction ("input", (std::shared_ptr(IOProcessor::*)())&IOProcessor::input) + .addFunction ("output", (std::shared_ptr(IOProcessor::*)())&IOProcessor::output) .endClass () .deriveWSPtrClass ("SideChain") @@ -2033,7 +2033,7 @@ LuaBindings::common (lua_State* L) .endClass () .deriveWSPtrClass ("Amp") - .addFunction ("gain_control", (boost::shared_ptr(Amp::*)())&Amp::gain_control) + .addFunction ("gain_control", (std::shared_ptr(Amp::*)())&Amp::gain_control) .addStaticFunction ("apply_gain", static_cast(&Amp::apply_gain)) .endClass () @@ -2099,73 +2099,73 @@ LuaBindings::common (lua_State* L) .addFunction ("n_channels", &AudioSource::n_channels) .endClass () - // > - .beginStdList > ("AudioTrackList") + // > + .beginStdList > ("AudioTrackList") .endClass () .beginStdList ("TimelineRangeList") .endClass () - // std::list > - .beginStdList > ("MidiTrackList") + // std::list > + .beginStdList > ("MidiTrackList") .endClass () - // RouteList == std::list > - .beginConstStdList > ("RouteList") + // RouteList == std::list > + .beginConstStdList > ("RouteList") .endClass () - // StripableList == std::list > - .beginConstStdList > ("StripableList") + // StripableList == std::list > + .beginConstStdList > ("StripableList") .endClass () - // VCAList == std::list > - .beginConstStdList > ("VCAList") + // VCAList == std::list > + .beginConstStdList > ("VCAList") .endClass () - // VCAVector == std::vector > - .beginConstStdVector > ("VCAVector") + // VCAVector == std::vector > + .beginConstStdVector > ("VCAVector") .endClass () - // boost::shared_ptr - .beginPtrStdList > ("RouteListPtr") - .addVoidPtrConstructor > > () + // std::shared_ptr + .beginPtrStdList > ("RouteListPtr") + .addVoidPtrConstructor > > () .endClass () - // boost::shared_ptr - .beginPtrStdVector > ("BundleListPtr") - .addVoidPtrConstructor > > () + // std::shared_ptr + .beginPtrStdVector > ("BundleListPtr") + .addVoidPtrConstructor > > () .endClass () - // typedef std::list > WeakRouteList - .beginConstStdList > ("WeakRouteList") + // typedef std::list > WeakRouteList + .beginConstStdList > ("WeakRouteList") .endClass () // RouteGroupList == std::list .beginConstStdCPtrList ("RouteGroupList") .endClass () - // typedef std::vector > Region::SourceList - .beginStdVector > ("SourceList") + // typedef std::vector > Region::SourceList + .beginStdVector > ("SourceList") .endClass () - // typedef std::vector > - .beginStdVector > ("ReadableList") + // typedef std::vector > + .beginStdVector > ("ReadableList") .endClass () - // from SessionPlaylists: std::vector > - .beginStdVector > ("PlaylistList") + // from SessionPlaylists: std::vector > + .beginStdVector > ("PlaylistList") .endClass () - // std::list< boost::weak_ptr > - .beginConstStdList > ("WeakAudioSourceList") + // std::list< std::weak_ptr > + .beginConstStdList > ("WeakAudioSourceList") .endClass () - // typedef std::vector > RegionVector - .beginStdVector > ("RegionVector") + // typedef std::vector > RegionVector + .beginStdVector > ("RegionVector") .endClass () - // typedef std::set > PBD::ControllableSet; - .beginStdSet > ("ControllableSet") + // typedef std::set > PBD::ControllableSet; + .beginStdSet > ("ControllableSet") .endClass () // typedef std::set AutomationTypeSet; @@ -2176,17 +2176,17 @@ LuaBindings::common (lua_State* L) .beginStdVector ("XrunPositions") .endClass () - // typedef std::list > RegionList - .beginConstStdList > ("RegionList") + // typedef std::list > RegionList + .beginConstStdList > ("RegionList") .endClass () - // boost::shared_ptr > > - .beginPtrStdList > ("RegionListPtr") - .addVoidPtrConstructor > > () + // std::shared_ptr > > + .beginPtrStdList > ("RegionListPtr") + .addVoidPtrConstructor > > () .endClass () // RegionFactory::RegionMap - .beginStdMap > ("RegionMap") + .beginStdMap > ("RegionMap") .endClass () // typedef std::map PortManager::AudioPortMeters; @@ -2197,12 +2197,12 @@ LuaBindings::common (lua_State* L) .beginStdMap ("MIDIPortMeters") .endClass () - // typedef std::list > ProcessorList - .beginStdList > ("ProcessorList") + // typedef std::list > ProcessorList + .beginStdList > ("ProcessorList") .endClass () - //std::list > PortList - .beginConstStdList > ("PortList") + //std::list > PortList + .beginConstStdList > ("PortList") .endClass () .beginConstStdCPtrList ("LocationList") @@ -2211,14 +2211,14 @@ LuaBindings::common (lua_State* L) .beginConstStdVector ("ParameterList") .endClass () - .beginStdList > ("ControlList") + .beginStdList > ("ControlList") .endClass () - .beginPtrStdList > ("ControlListPtr") - .addVoidPtrConstructor > > () + .beginPtrStdList > ("ControlListPtr") + .addVoidPtrConstructor > > () .endClass () - .beginStdList > > ("NotePtrList") + .beginStdList > > ("NotePtrList") .endClass () .beginConstStdCPtrList ("EventList") @@ -2226,13 +2226,13 @@ LuaBindings::common (lua_State* L) #if 0 // depends on Evoal:: Note, Beats see note_fixer.h // typedef Evoral::Note Note - // std::set< boost::weak_ptr > - .beginStdSet > ("WeakNoteSet") + // std::set< std::weak_ptr > + .beginStdSet > ("WeakNoteSet") .endClass () #endif - // std::list > - .beginConstStdList > ("WeakSourceList") + // std::list > + .beginConstStdList > ("WeakSourceList") .endClass () .beginClass ("ChanCount") @@ -2716,7 +2716,7 @@ LuaBindings::common (lua_State* L) .addFunction ("connect", &PortManager::connect) .addFunction ("physically_connected", &PortManager::physically_connected) .addFunction ("disconnect", (int (PortManager::*)(const std::string&, const std::string&))&PortManager::disconnect) - .addFunction ("disconnect_port", (int (PortManager::*)(boost::shared_ptr))&PortManager::disconnect) + .addFunction ("disconnect_port", (int (PortManager::*)(std::shared_ptr))&PortManager::disconnect) .addFunction ("get_port_by_name", &PortManager::get_port_by_name) .addFunction ("get_pretty_name_by_name", &PortManager::get_pretty_name_by_name) .addFunction ("port_is_physical", &PortManager::port_is_physical) @@ -2873,7 +2873,7 @@ LuaBindings::common (lua_State* L) .addFunction ("snap_name", &Session::snap_name) .addFunction ("monitor_out", &Session::monitor_out) .addFunction ("master_out", &Session::master_out) - .addFunction ("add_internal_send", (void (Session::*)(boost::shared_ptr, boost::shared_ptr, boost::shared_ptr))&Session::add_internal_send) + .addFunction ("add_internal_send", (void (Session::*)(std::shared_ptr, std::shared_ptr, std::shared_ptr))&Session::add_internal_send) .addFunction ("add_internal_sends", &Session::add_internal_sends) .addFunction ("locations", &Session::locations) .addFunction ("soloing", &Session::soloing) @@ -2916,7 +2916,7 @@ LuaBindings::common (lua_State* L) .beginClass ("RegionFactory") .addStaticFunction ("region_by_id", &RegionFactory::region_by_id) .addStaticFunction ("regions", &RegionFactory::regions) - .addStaticFunction ("clone_region", static_cast (*)(boost::shared_ptr, bool, bool)>(&RegionFactory::create)) + .addStaticFunction ("clone_region", static_cast (*)(std::shared_ptr, bool, bool)>(&RegionFactory::create)) .endClass () /* session enums (rt-safe, common) */ @@ -2997,7 +2997,7 @@ LuaBindings::common (lua_State* L) .endClass () .beginClass ("Rubberband") - .addConstructor , bool)> () + .addConstructor , bool)> () .addFunction ("set_strech_and_pitch", &ARDOUR::LuaAPI::Rubberband::set_strech_and_pitch) .addFunction ("set_mapping", &ARDOUR::LuaAPI::Rubberband::set_mapping) .addFunction ("process", &ARDOUR::LuaAPI::Rubberband::process) diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc index a959b8f4da..c8865016e2 100644 --- a/libs/ardour/luaproc.cc +++ b/libs/ardour/luaproc.cc @@ -189,11 +189,11 @@ LuaProc::drop_references () Plugin::drop_references (); } -boost::weak_ptr +std::weak_ptr LuaProc::route () const { if (!_owner) { - return boost::weak_ptr(); + return std::weak_ptr(); } return static_cast(_owner)->weakroute (); } @@ -341,7 +341,7 @@ LuaProc::load_script () } assert (pn == (int) _ctrl_params.size ()); - //_param_desc[pn] = boost::shared_ptr (new ParameterDescriptor()); + //_param_desc[pn] = std::shared_ptr (new ParameterDescriptor()); luabridge::LuaRef lr = i.value (); if (type == "input") { @@ -1033,15 +1033,15 @@ LuaProc::describe_parameter (Evoral::Parameter param) return "??"; } -boost::shared_ptr +std::shared_ptr LuaProc::parse_scale_points (luabridge::LuaRef* lr) { if (!(*lr)["scalepoints"].isTable()) { - return boost::shared_ptr (); + return std::shared_ptr (); } int cnt = 0; - boost::shared_ptr rv = boost::shared_ptr(new ScalePoints()); + std::shared_ptr rv = std::shared_ptr(new ScalePoints()); luabridge::LuaRef scalepoints ((*lr)["scalepoints"]); for (luabridge::Iterator i (scalepoints); !i.isNil (); ++i) { @@ -1055,10 +1055,10 @@ LuaProc::parse_scale_points (luabridge::LuaRef* lr) if (rv->size() > 0) { return rv; } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr LuaProc::get_scale_points (uint32_t port) const { int lp = _ctrl_params[port].second; @@ -1148,7 +1148,7 @@ LuaProc::presets_tree () const bool LuaProc::load_preset (PresetRecord r) { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return false; } @@ -1184,7 +1184,7 @@ LuaProc::load_preset (PresetRecord r) std::string LuaProc::do_save_preset (std::string name) { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return ""; } @@ -1218,7 +1218,7 @@ LuaProc::do_save_preset (std::string name) { void LuaProc::do_remove_preset (std::string name) { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return; } @@ -1231,7 +1231,7 @@ LuaProc::do_remove_preset (std::string name) void LuaProc::find_presets () { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t) { XMLNode* root = t->root (); for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 4cef12aee4..79692fad57 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -1771,9 +1771,9 @@ LV2Plugin::has_editor() const } void -LV2Plugin::add_slave (boost::shared_ptr p, bool) +LV2Plugin::add_slave (std::shared_ptr p, bool) { - boost::shared_ptr lv2 = boost::dynamic_pointer_cast (p); + std::shared_ptr lv2 = std::dynamic_pointer_cast (p); if (lv2) { Glib::Threads::Mutex::Lock lm (_slave_lock); _slaves.insert (lv2); @@ -1781,9 +1781,9 @@ LV2Plugin::add_slave (boost::shared_ptr p, bool) } void -LV2Plugin::remove_slave (boost::shared_ptr p) +LV2Plugin::remove_slave (std::shared_ptr p) { - boost::shared_ptr lv2 = boost::dynamic_pointer_cast (p); + std::shared_ptr lv2 = std::dynamic_pointer_cast (p); if (lv2) { Glib::Threads::Mutex::Lock lm (_slave_lock); _slaves.erase (lv2); @@ -2562,7 +2562,7 @@ LV2Plugin::automatable() const } void -LV2Plugin::set_automation_control (uint32_t i, boost::shared_ptr c) +LV2Plugin::set_automation_control (uint32_t i, std::shared_ptr c) { if ((_port_flags[i] & (PORT_CTRLED | PORT_CTRLER))) { DEBUG_TRACE(DEBUG::LV2Automate, string_compose ("Ctrl Port %1\n", i)); @@ -3294,18 +3294,18 @@ LV2Plugin::designated_bypass_port () return UINT32_MAX; } -boost::shared_ptr +std::shared_ptr LV2Plugin::get_scale_points(uint32_t port_index) const { const LilvPort* port = lilv_plugin_get_port_by_index(_impl->plugin, port_index); LilvScalePoints* points = lilv_port_get_scale_points(_impl->plugin, port); - boost::shared_ptr ret; + std::shared_ptr ret; if (!points) { return ret; } - ret = boost::shared_ptr(new ScalePoints()); + ret = std::shared_ptr(new ScalePoints()); LILV_FOREACH(scale_points, i, points) { const LilvScalePoint* p = lilv_scale_points_get(points, i); diff --git a/libs/ardour/midi_automation_list_binder.cc b/libs/ardour/midi_automation_list_binder.cc index 31171820c2..99f207d668 100644 --- a/libs/ardour/midi_automation_list_binder.cc +++ b/libs/ardour/midi_automation_list_binder.cc @@ -44,7 +44,7 @@ MidiAutomationListBinder::MidiAutomationListBinder (XMLNode* node, Session::Sour Session::SourceMap::const_iterator i = sources.find (PBD::ID (id_str)); assert (i != sources.end()); - _source = (boost::dynamic_pointer_cast (i->second)).get(); + _source = (std::dynamic_pointer_cast (i->second)).get(); _parameter = EventTypeMap::instance().from_symbol (parameter_str); } @@ -52,10 +52,10 @@ MidiAutomationListBinder::MidiAutomationListBinder (XMLNode* node, Session::Sour void MidiAutomationListBinder::set_state (XMLNode const & node, int version) const { - boost::shared_ptr model = _source->model (); + std::shared_ptr model = _source->model (); assert (model); - boost::shared_ptr control = model->automation_control (_parameter); + std::shared_ptr control = model->automation_control (_parameter); assert (control); control->alist().get()->set_state (node, version); @@ -64,10 +64,10 @@ MidiAutomationListBinder::set_state (XMLNode const & node, int version) const XMLNode& MidiAutomationListBinder::get_state () const { - boost::shared_ptr model = _source->model (); + std::shared_ptr model = _source->model (); assert (model); - boost::shared_ptr control = model->automation_control (_parameter); + std::shared_ptr control = model->automation_control (_parameter); assert (control); return control->alist().get()->get_state (); @@ -76,10 +76,10 @@ MidiAutomationListBinder::get_state () const std::string MidiAutomationListBinder::type_name() const { - boost::shared_ptr model = _source->model (); + std::shared_ptr model = _source->model (); assert (model); - boost::shared_ptr control = model->automation_control (_parameter); + std::shared_ptr control = model->automation_control (_parameter); assert (control); return PBD::demangled_name (*control->alist().get()); diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index d0350b78c0..23b84ee592 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -73,11 +73,11 @@ MIDIClock_TransportMaster::init () } void -MIDIClock_TransportMaster::connection_handler (boost::weak_ptr w0, std::string n0, boost::weak_ptr w1, std::string n1, bool con) +MIDIClock_TransportMaster::connection_handler (std::weak_ptr w0, std::string n0, std::weak_ptr w1, std::string n1, bool con) { TransportMaster::connection_handler(w0, n0, w1, n1, con); - boost::shared_ptr p = w1.lock (); + std::shared_ptr p = w1.lock (); if (p == _port) { resync_latency (false); } diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 85d74fd020..3df1b29727 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -129,7 +129,7 @@ MidiModel::apply_diff_command_only(Session& session, Command* cmd) #define REMOVED_PATCH_CHANGES_ELEMENT "RemovedPatchChanges" #define DIFF_PATCH_CHANGES_ELEMENT "ChangedPatchChanges" -MidiModel::DiffCommand::DiffCommand(boost::shared_ptr m, const std::string& name) +MidiModel::DiffCommand::DiffCommand(std::shared_ptr m, const std::string& name) : Command (name) , _model (m) , _name (name) @@ -137,7 +137,7 @@ MidiModel::DiffCommand::DiffCommand(boost::shared_ptr m, const std::s assert(_model); } -MidiModel::NoteDiffCommand::NoteDiffCommand (boost::shared_ptr m, const XMLNode& node) +MidiModel::NoteDiffCommand::NoteDiffCommand (std::shared_ptr m, const XMLNode& node) : DiffCommand (m, "") { assert (_model); @@ -679,7 +679,7 @@ MidiModel::NoteDiffCommand::get_state () const return *diff_command; } -MidiModel::SysExDiffCommand::SysExDiffCommand (boost::shared_ptr m, const XMLNode& node) +MidiModel::SysExDiffCommand::SysExDiffCommand (std::shared_ptr m, const XMLNode& node) : DiffCommand (m, "") { assert (_model); @@ -687,7 +687,7 @@ MidiModel::SysExDiffCommand::SysExDiffCommand (boost::shared_ptr m, c } void -MidiModel::SysExDiffCommand::change (boost::shared_ptr > s, TimeType new_time) +MidiModel::SysExDiffCommand::change (std::shared_ptr > s, TimeType new_time) { Change change; @@ -856,13 +856,13 @@ MidiModel::SysExDiffCommand::get_state () const return *diff_command; } -MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr m, const string& name) +MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (std::shared_ptr m, const string& name) : DiffCommand (m, name) { assert (_model); } -MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (boost::shared_ptr m, const XMLNode & node) +MidiModel::PatchChangeDiffCommand::PatchChangeDiffCommand (std::shared_ptr m, const XMLNode & node) : DiffCommand (m, "") { assert (_model); @@ -1230,7 +1230,7 @@ MidiModel::PatchChangeDiffCommand::get_state () const * `Discrete' mode). */ bool -MidiModel::write_to (boost::shared_ptr source, +MidiModel::write_to (std::shared_ptr source, const Source::WriterLock& source_lock) { ReadLock lock (read_lock()); /* Sequence read-lock */ @@ -1288,7 +1288,7 @@ MidiModel::sync_to_source (const Source::WriterLock& source_lock) * destroying the original note durations. */ bool -MidiModel::write_section_to (boost::shared_ptr source, +MidiModel::write_section_to (std::shared_ptr source, const Source::WriterLock& source_lock, TimeType begin_time, TimeType end_time, @@ -1400,7 +1400,7 @@ MidiModel::find_patch_change (Evoral::event_id_t id) return PatchChangePtr (); } -boost::shared_ptr > +std::shared_ptr > MidiModel::find_sysex (Evoral::event_id_t sysex_id) { /* used only for looking up notes when reloading history from disk, @@ -1413,7 +1413,7 @@ MidiModel::find_sysex (Evoral::event_id_t sysex_id) } } - return boost::shared_ptr > (); + return std::shared_ptr > (); } /** Lock and invalidate the source. @@ -1664,7 +1664,7 @@ MidiModel::source_automation_state_changed (Evoral::Parameter const& p, AutoStat { { Glib::Threads::Mutex::Lock lm (_control_lock); - boost::shared_ptr al = boost::dynamic_pointer_cast (control(p)->list ()); + std::shared_ptr al = std::dynamic_pointer_cast (control(p)->list ()); al->set_automation_state (s); } /* re-read MIDI */ @@ -1677,10 +1677,10 @@ MidiModel::automation_list_automation_state_changed (Evoral::Parameter const& p, _midi_source.set_automation_state_of (p, s); } -boost::shared_ptr +std::shared_ptr MidiModel::control_factory (Evoral::Parameter const & p) { - boost::shared_ptr c = Automatable::control_factory (p); + std::shared_ptr c = Automatable::control_factory (p); /* Set up newly created control's lists to the appropriate interpolation and automation state from our source. @@ -1688,7 +1688,7 @@ MidiModel::control_factory (Evoral::Parameter const & p) c->list()->set_interpolation (_midi_source.interpolation_of (p)); - boost::shared_ptr al = boost::dynamic_pointer_cast (c->list ()); + std::shared_ptr al = std::dynamic_pointer_cast (c->list ()); assert (al); al->set_automation_state (_midi_source.automation_state_of (p)); @@ -1729,7 +1729,7 @@ MidiModel::insert_silence_at_start (TimeType t) /* Controllers */ for (Controls::iterator i = controls().begin(); i != controls().end(); ++i) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); + std::shared_ptr ac = std::dynamic_pointer_cast (i->second); XMLNode& before = ac->alist()->get_state (); i->second->list()->shift (timepos_t::zero (i->second->list()->time_domain()), timecnt_t (t)); XMLNode& after = ac->alist()->get_state (); diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index 151a071744..40d6af221e 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -83,8 +83,8 @@ MidiPatchManager::add_search_path (const Searchpath& search_path) bool MidiPatchManager::add_custom_midnam (const std::string& id, char const* midnam) { - boost::shared_ptr document; - document = boost::shared_ptr(new MIDINameDocument()); + std::shared_ptr document; + document = std::shared_ptr(new MIDINameDocument()); XMLTree mxml; if (mxml.read_buffer (midnam, true)) { if (0 == document->set_state (mxml, *mxml.root())) { @@ -113,7 +113,7 @@ MidiPatchManager::update_custom_midnam (const std::string& id, char const* midna bool MidiPatchManager::is_custom_model (const std::string& model) const { - boost::shared_ptr midnam = document_by_model (model); + std::shared_ptr midnam = document_by_model (model); return (midnam && midnam->file_path().substr(0, 7) == "custom:"); } @@ -167,9 +167,9 @@ MidiPatchManager::remove_midnam_files_from_directory(const std::string& director bool MidiPatchManager::load_midi_name_document (const std::string& file_path) { - boost::shared_ptr document; + std::shared_ptr document; try { - document = boost::shared_ptr(new MIDINameDocument(file_path)); + document = std::shared_ptr(new MIDINameDocument(file_path)); } catch (...) { error << string_compose(_("Error parsing MIDI patch file %1"), file_path) @@ -179,18 +179,18 @@ MidiPatchManager::load_midi_name_document (const std::string& file_path) return add_midi_name_document (document); } -boost::shared_ptr +std::shared_ptr MidiPatchManager::document_by_model(std::string model_name) const { MidiNameDocuments::const_iterator i = _documents.find (model_name); if (i != _documents.end ()) { return i->second; } - return boost::shared_ptr (); + return std::shared_ptr (); } bool -MidiPatchManager::add_midi_name_document (boost::shared_ptr document) +MidiPatchManager::add_midi_name_document (std::shared_ptr document) { bool added = false; for (MIDINameDocument::MasterDeviceNamesList::const_iterator device = @@ -237,7 +237,7 @@ MidiPatchManager::remove_midi_name_document (const std::string& file_path, bool for (MidiNameDocuments::iterator i = _documents.begin(); i != _documents.end();) { if (i->second->file_path() == file_path) { - boost::shared_ptr document = i->second; + std::shared_ptr document = i->second; info << string_compose(_("Removing MIDI patch file %1"), file_path) << endmsg; diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 284ec51ed9..fc0e3ae7cc 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -71,13 +71,13 @@ MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden) { } -MidiPlaylist::MidiPlaylist (boost::shared_ptr other, string name, bool hidden) +MidiPlaylist::MidiPlaylist (std::shared_ptr other, string name, bool hidden) : Playlist (other, name, hidden) , _note_mode(other->_note_mode) { } -MidiPlaylist::MidiPlaylist (boost::shared_ptr other, +MidiPlaylist::MidiPlaylist (std::shared_ptr other, timepos_t const & start, timepos_t const & dur, string name, @@ -109,14 +109,14 @@ struct EventsSortByTimeAndType { }; void -MidiPlaylist::remove_dependents (boost::shared_ptr region) +MidiPlaylist::remove_dependents (std::shared_ptr region) { } void -MidiPlaylist::region_going_away (boost::weak_ptr region) +MidiPlaylist::region_going_away (std::weak_ptr region) { - boost::shared_ptr r = region.lock(); + std::shared_ptr r = region.lock(); if (r) { remove_dependents(r); } @@ -141,7 +141,7 @@ MidiPlaylist::set_state (const XMLNode& node, int version) void MidiPlaylist::dump () const { - boost::shared_ptr r; + std::shared_ptr r; cerr << "Playlist \"" << _name << "\" " << endl << regions.size() << " regions " @@ -160,9 +160,9 @@ MidiPlaylist::dump () const } bool -MidiPlaylist::destroy_region (boost::shared_ptr region) +MidiPlaylist::destroy_region (std::shared_ptr region) { - boost::shared_ptr r = boost::dynamic_pointer_cast (region); + std::shared_ptr r = std::dynamic_pointer_cast (region); if (!r) { return false; @@ -197,7 +197,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr region) return changed; } void -MidiPlaylist::_split_region (boost::shared_ptr region, timepos_t const & playlist_position, ThawList& thawlist) +MidiPlaylist::_split_region (std::shared_ptr region, timepos_t const & playlist_position, ThawList& thawlist) { if (!region->covers (playlist_position)) { return; @@ -208,14 +208,14 @@ MidiPlaylist::_split_region (boost::shared_ptr region, timepos_t const & return; } - boost::shared_ptr mr = boost::dynamic_pointer_cast(region); + std::shared_ptr mr = std::dynamic_pointer_cast(region); if (mr == 0) { return; } - boost::shared_ptr left; - boost::shared_ptr right; + std::shared_ptr left; + std::shared_ptr right; string before_name; string after_name; @@ -269,7 +269,7 @@ MidiPlaylist::contained_automation() set ret; for (RegionList::const_iterator r = regions.begin(); r != regions.end(); ++r) { - boost::shared_ptr mr = boost::dynamic_pointer_cast(*r); + std::shared_ptr mr = std::dynamic_pointer_cast(*r); for (Automatable::Controls::iterator c = mr->model()->controls().begin(); c != mr->model()->controls().end(); ++c) { @@ -289,7 +289,7 @@ MidiPlaylist::render (MidiChannelFilter* filter) DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("---- MidiPlaylist::render (regions: %1)-----\n", regions.size())); - std::list> regs; + std::list> regs; for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { @@ -303,7 +303,7 @@ MidiPlaylist::render (MidiChannelFilter* filter) continue; } - boost::shared_ptr mr = boost::dynamic_pointer_cast (*i); + std::shared_ptr mr = std::dynamic_pointer_cast (*i); if (!mr) { continue; } @@ -324,7 +324,7 @@ MidiPlaylist::render (MidiChannelFilter* filter) if (regs.size() == 1) { wpr.acquire (); _rendered.clear (); - boost::shared_ptr mr = regs.front (); + std::shared_ptr mr = regs.front (); DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("render from %1\n", mr->name())); mr->render (_rendered, 0, _note_mode, filter); DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("---- End MidiPlaylist::render, events: %1\n", _rendered.size())); @@ -351,7 +351,7 @@ MidiPlaylist::render (MidiChannelFilter* filter) DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1 regions to read\n", regs.size())); for (auto i = regs.rbegin(); i != regs.rend(); ++i) { - boost::shared_ptr mr = *i; + std::shared_ptr mr = *i; DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("render from %1\n", mr->name())); mr->render (evlist, 0, _note_mode, filter); } @@ -368,7 +368,7 @@ MidiPlaylist::render (MidiChannelFilter* filter) /* iterate, top-most region first */ for (auto i = regs.rbegin(); i != regs.rend(); ++i) { - boost::shared_ptr mr = *i; + std::shared_ptr mr = *i; DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("maybe render from %1\n", mr->name())); if (top) { @@ -439,25 +439,25 @@ MidiPlaylist::rendered () return &_rendered; } -boost::shared_ptr -MidiPlaylist::combine (RegionList const & rl, boost::shared_ptr trk) +std::shared_ptr +MidiPlaylist::combine (RegionList const & rl, std::shared_ptr trk) { RegionWriteLock rwl (this, true); if (rl.size() < 2) { - return boost::shared_ptr (); + return std::shared_ptr (); } RegionList sorted (rl); sorted.sort (RegionSortByLayerAndPosition()); - boost::shared_ptr first = sorted.front(); + std::shared_ptr first = sorted.front(); timepos_t earliest (timepos_t::max (Temporal::BeatTime)); timepos_t latest (Temporal::BeatTime); for (auto const & r : rl) { - assert (boost::dynamic_pointer_cast (r)); + assert (std::dynamic_pointer_cast (r)); if (r->position() < earliest) { earliest = r->position(); } @@ -466,14 +466,14 @@ MidiPlaylist::combine (RegionList const & rl, boost::shared_ptr trk) } } - boost::shared_ptr ms (session().create_midi_source_by_stealing_name (trk)); - boost::shared_ptr new_region = boost::dynamic_pointer_cast (RegionFactory::create (ms, first->derive_properties (false), true, &rwl.thawlist)); + std::shared_ptr ms (session().create_midi_source_by_stealing_name (trk)); + std::shared_ptr new_region = std::dynamic_pointer_cast (RegionFactory::create (ms, first->derive_properties (false), true, &rwl.thawlist)); timepos_t pos (first->position()); new_region->set_position (pos); for (auto const & other : sorted) { - new_region->merge (boost::dynamic_pointer_cast (other)); + new_region->merge (std::dynamic_pointer_cast (other)); remove_region_internal (other, rwl.thawlist); } @@ -496,6 +496,6 @@ MidiPlaylist::combine (RegionList const & rl, boost::shared_ptr trk) } void -MidiPlaylist::uncombine (boost::shared_ptr r) +MidiPlaylist::uncombine (std::shared_ptr r) { } diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 5fcb6f8d92..d0fce0300e 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -410,7 +410,7 @@ MidiPort::add_shadow_port (string const & name, MidiFilter mf) _shadow_midi_filter = mf; - if (!(_shadow_port = boost::dynamic_pointer_cast (AudioEngine::instance()->register_output_port (DataType::MIDI, name, false, PortFlags (Shadow|IsTerminal))))) { + if (!(_shadow_port = std::dynamic_pointer_cast (AudioEngine::instance()->register_output_port (DataType::MIDI, name, false, PortFlags (Shadow|IsTerminal))))) { return -3; } diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 85daf49792..a68c814345 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -82,7 +82,7 @@ MidiRegion::MidiRegion (const SourceList& srcs) assert(_type == DataType::MIDI); } -MidiRegion::MidiRegion (boost::shared_ptr other) +MidiRegion::MidiRegion (std::shared_ptr other) : Region (other) , _ignore_shift (false) { @@ -92,7 +92,7 @@ MidiRegion::MidiRegion (boost::shared_ptr other) } /** Create a new MidiRegion that is part of an existing one */ -MidiRegion::MidiRegion (boost::shared_ptr other, timecnt_t const & offset) +MidiRegion::MidiRegion (std::shared_ptr other, timecnt_t const & offset) : Region (other, offset) , _ignore_shift (false) { @@ -111,12 +111,12 @@ MidiRegion::~MidiRegion () bool MidiRegion::do_export (string const& path) const { - boost::shared_ptr newsrc; + std::shared_ptr newsrc; /* caller must check for pre-existing file */ assert (!path.empty()); assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)); - newsrc = boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, _session, path, _session.sample_rate (), false, true)); + newsrc = std::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, _session, path, _session.sample_rate (), false, true)); { /* Lock our source since we'll be reading from it. write_to() will @@ -134,24 +134,24 @@ MidiRegion::do_export (string const& path) const /** Create a new MidiRegion that has its own version of some/all of the Source used by another. */ -boost::shared_ptr +std::shared_ptr MidiRegion::clone (string path) const { - boost::shared_ptr newsrc; + std::shared_ptr newsrc; /* caller must check for pre-existing file */ assert (!path.empty()); assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)); - newsrc = boost::dynamic_pointer_cast( + newsrc = std::dynamic_pointer_cast( SourceFactory::createWritable(DataType::MIDI, _session, path, _session.sample_rate())); return clone (newsrc); } -boost::shared_ptr -MidiRegion::clone (boost::shared_ptr newsrc, ThawList* tl) const +std::shared_ptr +MidiRegion::clone (std::shared_ptr newsrc, ThawList* tl) const { { - boost::shared_ptr ms = midi_source(0); + std::shared_ptr ms = midi_source(0); /* copy source state (cue markers, captured_for, CC/param interpolation */ XMLNode& node (ms->get_state()); @@ -168,7 +168,7 @@ MidiRegion::clone (boost::shared_ptr newsrc, ThawList* tl) const Source::ReaderLock lm (ms->mutex()); if (ms->write_to (lm, newsrc, Temporal::Beats(), std::numeric_limits::max())) { delete &node; - return boost::shared_ptr (); + return std::shared_ptr (); } /* compare to SMFSource::set_state */ @@ -185,7 +185,7 @@ MidiRegion::clone (boost::shared_ptr newsrc, ThawList* tl) const plist.add (Properties::import, false); plist.add (Properties::layer, 0); - boost::shared_ptr ret (boost::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true, tl))); + std::shared_ptr ret (std::dynamic_pointer_cast (RegionFactory::create (newsrc, plist, true, tl))); return ret; } @@ -257,7 +257,7 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, return timecnt_t(); /* read nothing */ } - boost::shared_ptr src = midi_source(chan_n); + std::shared_ptr src = midi_source(chan_n); Source::ReaderLock lm (src->mutex()); @@ -319,7 +319,7 @@ MidiRegion::render_range (Evoral::EventSink& dst, return 0; /* read nothing */ } - boost::shared_ptr src = midi_source(chan_n); + std::shared_ptr src = midi_source(chan_n); #if 0 @@ -402,48 +402,48 @@ MidiRegion::recompute_at_start () } int -MidiRegion::separate_by_channel (vector< boost::shared_ptr >&) const +MidiRegion::separate_by_channel (vector< std::shared_ptr >&) const { // TODO return -1; } -boost::shared_ptr +std::shared_ptr MidiRegion::control (const Evoral::Parameter& id, bool create) { return model()->control(id, create); } -boost::shared_ptr +std::shared_ptr MidiRegion::control (const Evoral::Parameter& id) const { return model()->control(id); } -boost::shared_ptr +std::shared_ptr MidiRegion::model() { return midi_source()->model(); } -boost::shared_ptr +std::shared_ptr MidiRegion::model() const { return midi_source()->model(); } -boost::shared_ptr +std::shared_ptr MidiRegion::midi_source (uint32_t n) const { // Guaranteed to succeed (use a static cast?) - return boost::dynamic_pointer_cast(source(n)); + return std::dynamic_pointer_cast(source(n)); } /* don't use this. hopefully it will go away. currently used by headless-chicken session utility. */ void -MidiRegion::clobber_sources (boost::shared_ptr s) +MidiRegion::clobber_sources (std::shared_ptr s) { drop_sources(); @@ -452,7 +452,7 @@ MidiRegion::clobber_sources (boost::shared_ptr s) _master_sources.push_back (s); s->inc_use_count (); - s->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(s))); + s->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, std::weak_ptr(s))); } @@ -470,7 +470,7 @@ MidiRegion::model_changed () Automatable::Controls const & c = model()->controls(); for (Automatable::Controls::const_iterator i = c.begin(); i != c.end(); ++i) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); + std::shared_ptr ac = std::dynamic_pointer_cast (i->second); assert (ac); if (ac->alist()->automation_state() != Play) { _filtered_parameters.insert (ac->parameter ()); @@ -519,7 +519,7 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) { /* Update our filtered parameters list after a change to a parameter's AutoState */ - boost::shared_ptr ac = model()->automation_control (p); + std::shared_ptr ac = model()->automation_control (p); if (!ac || ac->alist()->automation_state() == Play) { /* It should be "impossible" for ac to be NULL, but if it is, don't filter the parameter so events aren't lost. */ @@ -567,10 +567,10 @@ MidiRegion::set_name (const std::string& str) } void -MidiRegion::merge (boost::shared_ptr other_region) +MidiRegion::merge (std::shared_ptr other_region) { - boost::shared_ptr other = other_region->model(); - boost::shared_ptr self = model(); + std::shared_ptr other = other_region->model(); + std::shared_ptr self = model(); Temporal::Beats other_region_start (other_region->start().beats()); Temporal::Beats other_region_end ((other_region->start() + other_region->length()).beats()); diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc index 611ae4b339..14d0ea6328 100644 --- a/libs/ardour/midi_scene_changer.cc +++ b/libs/ardour/midi_scene_changer.cc @@ -69,7 +69,7 @@ MIDISceneChanger::locations_changed () void MIDISceneChanger::gather (const Locations::LocationList& locations) { - boost::shared_ptr sc; + std::shared_ptr sc; Glib::Threads::RWLock::WriterLock lm (scene_lock); @@ -79,7 +79,7 @@ MIDISceneChanger::gather (const Locations::LocationList& locations) if ((sc = (*l)->scene_change()) != 0) { - boost::shared_ptr msc = boost::dynamic_pointer_cast (sc); + std::shared_ptr msc = std::dynamic_pointer_cast (sc); if (msc) { @@ -94,7 +94,7 @@ MIDISceneChanger::gather (const Locations::LocationList& locations) } void -MIDISceneChanger::rt_deliver (MidiBuffer& mbuf, samplepos_t when, boost::shared_ptr msc) +MIDISceneChanger::rt_deliver (MidiBuffer& mbuf, samplepos_t when, std::shared_ptr msc) { if (!msc->active()) { return; @@ -123,7 +123,7 @@ MIDISceneChanger::rt_deliver (MidiBuffer& mbuf, samplepos_t when, boost::shared_ } void -MIDISceneChanger::non_rt_deliver (boost::shared_ptr msc) +MIDISceneChanger::non_rt_deliver (std::shared_ptr msc) { if (!msc->active()) { return; @@ -131,7 +131,7 @@ MIDISceneChanger::non_rt_deliver (boost::shared_ptr msc) uint8_t buf[4]; size_t cnt; - boost::shared_ptr aport = boost::dynamic_pointer_cast(output_port); + std::shared_ptr aport = std::dynamic_pointer_cast(output_port); /* We use zero as the timestamp for these messages because we are in a non-RT/process context. Using zero means "deliver them as early as @@ -189,7 +189,7 @@ MIDISceneChanger::run (samplepos_t start, samplepos_t end) void MIDISceneChanger::locate (samplepos_t pos) { - boost::shared_ptr msc; + std::shared_ptr msc; { Glib::Threads::RWLock::ReaderLock lm (scene_lock); @@ -226,12 +226,12 @@ MIDISceneChanger::locate (samplepos_t pos) } void -MIDISceneChanger::set_input_port (boost::shared_ptr mp) +MIDISceneChanger::set_input_port (std::shared_ptr mp) { incoming_connections.drop_connections(); input_port.reset (); - boost::shared_ptr async = boost::dynamic_pointer_cast (mp); + std::shared_ptr async = std::dynamic_pointer_cast (mp); if (async) { @@ -250,7 +250,7 @@ MIDISceneChanger::set_input_port (boost::shared_ptr mp) } void -MIDISceneChanger::set_output_port (boost::shared_ptr mp) +MIDISceneChanger::set_output_port (std::shared_ptr mp) { output_port = mp; } @@ -289,7 +289,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program int bank = -1; if (have_seen_bank_changes) { - bank = boost::dynamic_pointer_cast(input_port)->channel (channel)->bank(); + bank = std::dynamic_pointer_cast(input_port)->channel (channel)->bank(); } jump_to (bank, program); @@ -320,7 +320,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program int bank = -1; if (have_seen_bank_changes) { - bank = boost::dynamic_pointer_cast(input_port)->channel (channel)->bank(); + bank = std::dynamic_pointer_cast(input_port)->channel (channel)->bank(); } MIDISceneChange* msc =new MIDISceneChange (channel, bank, program & 0x7f); @@ -330,7 +330,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program Locations::LocationList copy (locations->list()); for (Locations::LocationList::const_iterator l = copy.begin(); l != copy.end(); ++l) { - boost::shared_ptr sc = boost::dynamic_pointer_cast((*l)->scene_change()); + std::shared_ptr sc = std::dynamic_pointer_cast((*l)->scene_change()); if (sc && (*sc.get()) == *msc) { msc->set_color (sc->color ()); @@ -338,7 +338,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program } } - loc->set_scene_change (boost::shared_ptr (msc)); + loc->set_scene_change (std::shared_ptr (msc)); /* this will generate a "changed" signal to be emitted by locations, and we will call ::gather() to update our list of MIDI events. @@ -355,14 +355,14 @@ void MIDISceneChanger::jump_to (int bank, int program) { const Locations::LocationList& locations (_session.locations()->list()); - boost::shared_ptr sc; + std::shared_ptr sc; timepos_t where = timepos_t::max (Temporal::AudioTime); for (Locations::LocationList::const_iterator l = locations.begin(); l != locations.end(); ++l) { if ((sc = (*l)->scene_change()) != 0) { - boost::shared_ptr msc = boost::dynamic_pointer_cast (sc); + std::shared_ptr msc = std::dynamic_pointer_cast (sc); if (msc->bank() == bank && msc->program() == program && (*l)->start() < where) { where = (*l)->start(); diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 66ff7bb287..d3fe5bc2a6 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -401,7 +401,7 @@ MidiSource::mark_streaming_write_completed (const WriterLock& lock) } int -MidiSource::export_write_to (const ReaderLock& lock, boost::shared_ptr newsrc, Temporal::Beats begin, Temporal::Beats end) +MidiSource::export_write_to (const ReaderLock& lock, std::shared_ptr newsrc, Temporal::Beats begin, Temporal::Beats end) { WriterLock newsrc_lock (newsrc->mutex ()); @@ -418,7 +418,7 @@ MidiSource::export_write_to (const ReaderLock& lock, boost::shared_ptr newsrc, Temporal::Beats begin, Temporal::Beats end) +MidiSource::write_to (const ReaderLock& lock, std::shared_ptr newsrc, Temporal::Beats begin, Temporal::Beats end) { WriterLock newsrc_lock (newsrc->mutex ()); @@ -451,7 +451,7 @@ MidiSource::write_to (const ReaderLock& lock, boost::shared_ptr news /* this file is not removable (but since it is MIDI, it is mutable) */ - boost::dynamic_pointer_cast (newsrc)->prevent_deletion (); + std::dynamic_pointer_cast (newsrc)->prevent_deletion (); return 0; } @@ -471,7 +471,7 @@ MidiSource::session_saved() /* Temporarily drop our reference to the model so that as the model pushes its current state to us, we don't try to update it. */ - boost::shared_ptr mm = _model; + std::shared_ptr mm = _model; _model.reset (); /* Flush model contents to disk. */ @@ -494,7 +494,7 @@ MidiSource::drop_model (const WriterLock& lock) } void -MidiSource::set_model (const WriterLock& lock, boost::shared_ptr m) +MidiSource::set_model (const WriterLock& lock, std::shared_ptr m) { _model = m; invalidate(lock); @@ -565,13 +565,13 @@ MidiSource::set_automation_state_of (Evoral::Parameter const& p, AutoState s) } void -MidiSource::copy_interpolation_from (boost::shared_ptr s) +MidiSource::copy_interpolation_from (std::shared_ptr s) { copy_interpolation_from (s.get ()); } void -MidiSource::copy_automation_state_from (boost::shared_ptr s) +MidiSource::copy_automation_state_from (std::shared_ptr s) { copy_automation_state_from (s.get ()); } diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index fb4ae9f11a..5771f2ecaa 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -45,12 +45,12 @@ MidiStretch::~MidiStretch () } int -MidiStretch::run (boost::shared_ptr r, Progress*) +MidiStretch::run (std::shared_ptr r, Progress*) { SourceList nsrcs; char suffix[32]; - boost::shared_ptr region = boost::dynamic_pointer_cast(r); + std::shared_ptr region = std::dynamic_pointer_cast(r); if (!region) { return -1; } @@ -74,11 +74,11 @@ MidiStretch::run (boost::shared_ptr r, Progress*) return -1; } - boost::shared_ptr src = region->midi_source(0); + std::shared_ptr src = region->midi_source(0); Source::ReaderLock lock (src->mutex()); - boost::shared_ptr old_model = src->model(); - boost::shared_ptr new_src = boost::dynamic_pointer_cast(nsrcs[0]); + std::shared_ptr old_model = src->model(); + std::shared_ptr new_src = std::dynamic_pointer_cast(nsrcs[0]); if (!new_src) { error << _("MIDI stretch created non-MIDI source") << endmsg; @@ -88,7 +88,7 @@ MidiStretch::run (boost::shared_ptr r, Progress*) Source::WriterLock sl (new_src->mutex ()); new_src->load_model (sl, true); - boost::shared_ptr new_model = new_src->model(); + std::shared_ptr new_model = new_src->model(); new_model->start_write(); #ifdef DEBUG_MIDI_STRETCH diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 5d9c0380bf..7acb91a105 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -121,7 +121,7 @@ MidiTrack::init () } void -MidiTrack::data_recorded (boost::weak_ptr src) +MidiTrack::data_recorded (std::weak_ptr src) { DataRecorded (src); /* EMIT SIGNAL */ } @@ -267,8 +267,8 @@ MidiTrack::state(bool save_template) const root.set_property ("restore-pgm", _restore_pgm_on_load); for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { - if (boost::dynamic_pointer_cast(c->second)) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (c->second); + if (std::dynamic_pointer_cast(c->second)) { + std::shared_ptr ac = std::dynamic_pointer_cast (c->second); assert (ac); root.add_child_nocopy (ac->get_state ()); } @@ -300,14 +300,14 @@ MidiTrack::set_state_part_two () } _freeze_record.processor_info.clear (); - boost::shared_ptr freeze_pl; + std::shared_ptr freeze_pl; if ((prop = fnode->property (X_("playlist-id"))) != 0) { freeze_pl = _session.playlists()->by_id (prop->value()); } else if ((prop = fnode->property (X_("playlist"))) != 0) { freeze_pl = _session.playlists()->by_name (prop->value()); } if (freeze_pl) { - _freeze_record.playlist = boost::dynamic_pointer_cast (freeze_pl); + _freeze_record.playlist = std::dynamic_pointer_cast (freeze_pl); _freeze_record.playlist->use(); } else { _freeze_record.playlist.reset (); @@ -332,7 +332,7 @@ MidiTrack::set_state_part_two () } FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()), - boost::shared_ptr()); + std::shared_ptr()); frii->id = str; _freeze_record.processor_info.push_back (frii); } @@ -346,7 +346,7 @@ MidiTrack::restore_controls () { /* first CC (bank select) */ for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { - boost::shared_ptr mctrl = boost::dynamic_pointer_cast(c->second); + std::shared_ptr mctrl = std::dynamic_pointer_cast(c->second); if (mctrl && mctrl->parameter().type () != MidiPgmChangeAutomation) { mctrl->restore_value(); } @@ -358,7 +358,7 @@ MidiTrack::restore_controls () /* then restore PGM */ for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { - boost::shared_ptr mctrl = boost::dynamic_pointer_cast(c->second); + std::shared_ptr mctrl = std::dynamic_pointer_cast(c->second); if (mctrl && mctrl->parameter().type () == MidiPgmChangeAutomation) { mctrl->restore_value(); } @@ -372,7 +372,7 @@ MidiTrack::update_controls (BufferSet const& bufs) for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) { const Evoral::Event& ev = *e; const Evoral::Parameter param = midi_parameter(ev.buffer(), ev.size()); - const boost::shared_ptr control = automation_control (param); + const std::shared_ptr control = automation_control (param); if (control) { double old = control->get_double (); control->set_double (ev.value(), timepos_t::zero (false), false); @@ -416,13 +416,13 @@ MidiTrack::non_realtime_locate (samplepos_t spos) Track::non_realtime_locate (spos); - boost::shared_ptr playlist = _disk_writer->midi_playlist(); + std::shared_ptr playlist = _disk_writer->midi_playlist(); if (!playlist) { return; } /* Get the top unmuted region at this position. */ - boost::shared_ptr region = boost::dynamic_pointer_cast (playlist->top_unmuted_region_at (pos)); + std::shared_ptr region = std::dynamic_pointer_cast (playlist->top_unmuted_region_at (pos)); if (!region) { return; @@ -443,16 +443,16 @@ MidiTrack::non_realtime_locate (samplepos_t spos) for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (c->second); + std::shared_ptr ac = std::dynamic_pointer_cast (c->second); if (!ac->automation_playback()) { continue; } - boost::shared_ptr tcontrol; - boost::shared_ptr rcontrol; + std::shared_ptr tcontrol; + std::shared_ptr rcontrol; - if ((tcontrol = boost::dynamic_pointer_cast(c->second)) && + if ((tcontrol = std::dynamic_pointer_cast(c->second)) && (rcontrol = region->control(tcontrol->parameter()))) { @@ -525,7 +525,7 @@ int MidiTrack::export_stuff (BufferSet& buffers, samplepos_t start, samplecnt_t nframes, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, @@ -537,7 +537,7 @@ MidiTrack::export_stuff (BufferSet& buffers, Glib::Threads::RWLock::ReaderLock rlock (_processor_lock); - boost::shared_ptr mpl = _disk_writer->midi_playlist(); + std::shared_ptr mpl = _disk_writer->midi_playlist(); if (!mpl) { return -2; } @@ -572,21 +572,21 @@ MidiTrack::export_stuff (BufferSet& buffers, return 0; } -boost::shared_ptr +std::shared_ptr MidiTrack::bounce (InterThreadInfo& itt, std::string const& name) { return bounce_range (_session.current_start_sample(), _session.current_end_sample(), itt, main_outs(), false, name); } -boost::shared_ptr +std::shared_ptr MidiTrack::bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, std::string const& name) { - vector > srcs; + vector > srcs; return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false, false, name); } @@ -755,7 +755,7 @@ MidiTrack::set_step_editing (bool yn) } } -boost::shared_ptr +std::shared_ptr MidiTrack::write_source (uint32_t) { return _disk_writer->midi_write_source (); @@ -793,10 +793,10 @@ MidiTrack::set_capture_channel_mask (uint16_t mask) } } -boost::shared_ptr +std::shared_ptr MidiTrack::midi_playlist () { - return boost::dynamic_pointer_cast (_playlists[DataType::MIDI]); + return std::dynamic_pointer_cast (_playlists[DataType::MIDI]); } void @@ -841,7 +841,7 @@ MidiTrack::map_input_active (bool yn) PortSet& ports (_input->ports()); for (PortSet::iterator p = ports.begin(DataType::MIDI); p != ports.end(DataType::MIDI); ++p) { - boost::shared_ptr mp = boost::dynamic_pointer_cast (*p); + std::shared_ptr mp = std::dynamic_pointer_cast (*p); if (yn != mp->input_active()) { mp->set_input_active (yn); } @@ -856,7 +856,7 @@ MidiTrack::track_input_active (IOChange change, void* /* src */) } } -boost::shared_ptr +std::shared_ptr MidiTrack::get_gui_feed_buffer () const { return _disk_writer->get_gui_feed_buffer (); @@ -914,7 +914,7 @@ MidiTrack::monitoring_changed (bool self, Controllable::GroupControlDisposition PortSet& ports (_output->ports()); for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) { - boost::shared_ptr mp = boost::dynamic_pointer_cast (*p); + std::shared_ptr mp = std::dynamic_pointer_cast (*p); if (mp) { mp->require_resolve (); } diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index e6c3a86e62..97c4f314a1 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -84,14 +84,14 @@ MidiControlUI::do_request (MidiUIRequest* req) } bool -MidiControlUI::midi_input_handler (IOCondition ioc, boost::weak_ptr wport) +MidiControlUI::midi_input_handler (IOCondition ioc, std::weak_ptr wport) { - boost::shared_ptr port = wport.lock (); + std::shared_ptr port = wport.lock (); if (!port) { return false; } - DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happened on %1\n", boost::shared_ptr (port)->name())); + DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happened on %1\n", std::shared_ptr (port)->name())); if (ioc & ~IO_IN) { return false; @@ -100,7 +100,7 @@ MidiControlUI::midi_input_handler (IOCondition ioc, boost::weak_ptrclear (); - DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", boost::shared_ptr(port)->name())); + DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", std::shared_ptr(port)->name())); samplepos_t now = _session.engine().sample_time(); port->parse (now); } @@ -116,14 +116,14 @@ MidiControlUI::clear_ports () void MidiControlUI::reset_ports () { - vector > ports; - boost::shared_ptr p; + vector > ports; + std::shared_ptr p; - if ((p = boost::dynamic_pointer_cast (_session.mmc_input_port()))) { + if ((p = std::dynamic_pointer_cast (_session.mmc_input_port()))) { ports.push_back (p); } - if ((p = boost::dynamic_pointer_cast (_session.scene_input_port()))) { + if ((p = std::dynamic_pointer_cast (_session.scene_input_port()))) { ports.push_back (p); } @@ -131,9 +131,9 @@ MidiControlUI::reset_ports () return; } - for (vector >::const_iterator pi = ports.begin(); pi != ports.end(); ++pi) { + for (vector >::const_iterator pi = ports.begin(); pi != ports.end(); ++pi) { (*pi)->xthread().set_receive_handler (sigc::bind ( - sigc::mem_fun (this, &MidiControlUI::midi_input_handler), boost::weak_ptr(*pi))); + sigc::mem_fun (this, &MidiControlUI::midi_input_handler), std::weak_ptr(*pi))); (*pi)->xthread().attach (_main_loop->get_context()); } } diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc index df90bb256c..a6dcc2fd11 100644 --- a/libs/ardour/midiport_manager.cc +++ b/libs/ardour/midiport_manager.cc @@ -72,27 +72,27 @@ MidiPortManager::create_ports () _scene_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("Scene out"), true); _vkbd_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("x-virtual-keyboard"), true, IsTerminal); - boost::dynamic_pointer_cast(_vkbd_out)->set_flush_at_cycle_start (true); + std::dynamic_pointer_cast(_vkbd_out)->set_flush_at_cycle_start (true); /* Now register ports used to send positional sync data (MTC and MIDI Clock) */ - boost::shared_ptr p; + std::shared_ptr p; p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MTC out")); - _mtc_output_port= boost::dynamic_pointer_cast (p); + _mtc_output_port= std::dynamic_pointer_cast (p); p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI Clock out"), false, TransportGenerator); - _midi_clock_output_port= boost::dynamic_pointer_cast (p); + _midi_clock_output_port= std::dynamic_pointer_cast (p); p = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("Cue Control in")); - _trigger_input_port= boost::dynamic_pointer_cast (p); + _trigger_input_port= std::dynamic_pointer_cast (p); } void MidiPortManager::set_midi_port_states (const XMLNodeList&nodes) { XMLProperty const * prop; - typedef map > PortMap; + typedef map > PortMap; PortMap ports; const int version = 0; @@ -122,7 +122,7 @@ MidiPortManager::set_midi_port_states (const XMLNodeList&nodes) list MidiPortManager::get_midi_port_states () const { - typedef map > PortMap; + typedef map > PortMap; PortMap ports; list s; @@ -142,16 +142,16 @@ MidiPortManager::get_midi_port_states () const return s; } -boost::shared_ptr +std::shared_ptr MidiPortManager::vkbd_output_port () const { - return boost::dynamic_pointer_cast (_vkbd_out); + return std::dynamic_pointer_cast (_vkbd_out); } void MidiPortManager::set_public_latency (bool playback) { - typedef std::list > PortList; + typedef std::list > PortList; PortList pl; pl.push_back (_mtc_output_port); diff --git a/libs/ardour/mixer_scene.cc b/libs/ardour/mixer_scene.cc index 964ca87cb2..1899b7380f 100644 --- a/libs/ardour/mixer_scene.cc +++ b/libs/ardour/mixer_scene.cc @@ -64,7 +64,7 @@ MixerScene::snapshot () { _ctrl_map.clear (); for (auto const& c : Controllable::registered_controllables ()) { - if (!boost::dynamic_pointer_cast (c)) { + if (!std::dynamic_pointer_cast (c)) { continue; } if (c->flags () & Controllable::HiddenControl) { @@ -77,13 +77,13 @@ MixerScene::snapshot () } bool -MixerScene::recurse_to_master (boost::shared_ptr c, std::set & done, AutomationTypeSet const& ts) const +MixerScene::recurse_to_master (std::shared_ptr c, std::set & done, AutomationTypeSet const& ts) const { if (done.find (c->id()) != done.end ()) { return false; } - auto ac = boost::dynamic_pointer_cast (c); + auto ac = std::dynamic_pointer_cast (c); #if 1 /* ignore controls in Write, or Touch + touching() state */ if (ac && ac->automation_write ()) { done.insert (c->id ()); @@ -101,7 +101,7 @@ MixerScene::recurse_to_master (boost::shared_ptr c, std::set } } - auto sc = boost::dynamic_pointer_cast (c); + auto sc = std::dynamic_pointer_cast (c); if (sc && sc->slaved ()) { /* first set masters, then set own value */ for (auto const& m : sc->masters ()) { diff --git a/libs/ardour/monitor_control.cc b/libs/ardour/monitor_control.cc index 5f606f2845..f489e2617d 100644 --- a/libs/ardour/monitor_control.cc +++ b/libs/ardour/monitor_control.cc @@ -26,7 +26,7 @@ using namespace PBD; MonitorControl::MonitorControl (Session& session, std::string const & name, Monitorable& m, Temporal::TimeDomain td) : SlavableAutomationControl (session, MonitoringAutomation, ParameterDescriptor (MonitoringAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(MonitoringAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(MonitoringAutomation), td)), name) , _monitorable (m) diff --git a/libs/ardour/monitor_port.cc b/libs/ardour/monitor_port.cc index 4fac23e947..cc20079d22 100644 --- a/libs/ardour/monitor_port.cc +++ b/libs/ardour/monitor_port.cc @@ -84,7 +84,7 @@ MonitorPort::monitor (PortEngine& e, pframes_t n_samples) memset (_input, 0, sizeof (Sample) * _insize); _silent = true; } - boost::shared_ptr cycle_ports = _monitor_ports.reader (); + std::shared_ptr cycle_ports = _monitor_ports.reader (); for (MonitorPorts::iterator i = cycle_ports->begin (); i != cycle_ports->end(); ++i) { if (i->second->remove && i->second->gain == 0) { @@ -105,7 +105,7 @@ MonitorPort::monitor (PortEngine& e, pframes_t n_samples) } void -MonitorPort::collect (boost::shared_ptr mi, Sample* buf, pframes_t n_samples, std::string const& pn) +MonitorPort::collect (std::shared_ptr mi, Sample* buf, pframes_t n_samples, std::string const& pn) { gain_t target_gain = mi->remove ? 0.0 : 1.0; gain_t current_gain = mi->gain; @@ -183,7 +183,7 @@ MonitorPort::get_audio_buffer (pframes_t n_samples) bool MonitorPort::monitoring (std::string const& pn) const { - boost::shared_ptr mp = _monitor_ports.reader (); + std::shared_ptr mp = _monitor_ports.reader (); if (pn.empty ()) { for (MonitorPorts::iterator i = mp->begin (); i != mp->end(); ++i) { if (!i->second->remove) { @@ -202,7 +202,7 @@ MonitorPort::monitoring (std::string const& pn) const void MonitorPort::active_monitors (std::list& portlist) const { - boost::shared_ptr mp = _monitor_ports.reader (); + std::shared_ptr mp = _monitor_ports.reader (); for (MonitorPorts::iterator i = mp->begin (); i != mp->end(); ++i) { if (i->second->remove) { continue; @@ -223,7 +223,7 @@ MonitorPort::set_active_monitors (std::list const& pl) { RCUWriter mp_rcu (_monitor_ports); - boost::shared_ptr mp = mp_rcu.get_copy (); + std::shared_ptr mp = mp_rcu.get_copy (); /* clear ports not present in portlist */ for (MonitorPorts::iterator i = mp->begin (); i != mp->end (); ++i) { if (std::find (pl.begin (), pl.end (), i->first) != pl.end ()) { @@ -237,7 +237,7 @@ MonitorPort::set_active_monitors (std::list const& pl) } /* add ports */ for (std::list::const_iterator i = pl.begin (); i != pl.end (); ++i) { - std::pair it = mp->insert (make_pair (*i, boost::shared_ptr (new MonitorInfo ()))); + std::pair it = mp->insert (make_pair (*i, std::shared_ptr (new MonitorInfo ()))); if (!it.second && !it.first->second->remove) { /* already present */ continue; @@ -270,8 +270,8 @@ MonitorPort::add_port (std::string const& pn) { RCUWriter mp_rcu (_monitor_ports); - boost::shared_ptr mp = mp_rcu.get_copy (); - std::pair it = mp->insert (make_pair (pn, boost::shared_ptr (new MonitorInfo ()))); + std::shared_ptr mp = mp_rcu.get_copy (); + std::pair it = mp->insert (make_pair (pn, std::shared_ptr (new MonitorInfo ()))); if (!it.second) { if (!it.first->second->remove) { /* already present */ @@ -296,7 +296,7 @@ MonitorPort::remove_port (std::string const& pn, bool instantly) { RCUWriter mp_rcu (_monitor_ports); - boost::shared_ptr mp = mp_rcu.get_copy (); + std::shared_ptr mp = mp_rcu.get_copy (); MonitorPorts::iterator i = mp->find (pn); if (i == mp->end ()) { return; @@ -323,11 +323,11 @@ MonitorPort::clear_ports (bool instantly) if (instantly) { RCUWriter mp_rcu (_monitor_ports); - boost::shared_ptr mp = mp_rcu.get_copy (); + std::shared_ptr mp = mp_rcu.get_copy (); mp->swap (copy); assert (mp->empty ()); } else { - boost::shared_ptr mp = _monitor_ports.reader (); + std::shared_ptr mp = _monitor_ports.reader (); copy = *mp; for (MonitorPorts::iterator i = copy.begin (); i != copy.end(); ++i) { i->second->remove = true; diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc index 7782f87d28..b0bb4704ca 100644 --- a/libs/ardour/monitor_processor.cc +++ b/libs/ardour/monitor_processor.cc @@ -497,40 +497,40 @@ MonitorProcessor::update_monitor_state () } } -boost::shared_ptr +std::shared_ptr MonitorProcessor::channel_cut_control (uint32_t chn) const { if (chn < _channels.size()) { return _channels[chn]->cut_control; } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr MonitorProcessor::channel_dim_control (uint32_t chn) const { if (chn < _channels.size()) { return _channels[chn]->dim_control; } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr MonitorProcessor::channel_polarity_control (uint32_t chn) const { if (chn < _channels.size()) { return _channels[chn]->polarity_control; } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr MonitorProcessor::channel_solo_control (uint32_t chn) const { if (chn < _channels.size()) { return _channels[chn]->soloed_control; } - return boost::shared_ptr(); + return std::shared_ptr(); } MonitorProcessor::ChannelRecord::ChannelRecord (uint32_t chn) diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 615a29129e..afa9318f3b 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -83,11 +83,11 @@ MTC_TransportMaster::init () } void -MTC_TransportMaster::connection_handler (boost::weak_ptr w0, std::string n0, boost::weak_ptr w1, std::string n1, bool con) +MTC_TransportMaster::connection_handler (std::weak_ptr w0, std::string n0, std::weak_ptr w1, std::string n1, bool con) { TransportMaster::connection_handler(w0, n0, w1, n1, con); - boost::shared_ptr p = w1.lock (); + std::shared_ptr p = w1.lock (); if (p == _port) { resync_latency (false); } @@ -404,7 +404,7 @@ MTC_TransportMaster::update_mtc_time (const MIDI::byte *msg, bool was_full, samp if (was_full || outside_window (mtc_frame)) { DEBUG_TRACE (DEBUG::MTC, string_compose ("update_mtc_time: full TC %1 or outside window %2 MTC %3\n", was_full, outside_window (mtc_frame), mtc_frame)); - boost::shared_ptr c = TransportMasterManager::instance().current(); + std::shared_ptr c = TransportMasterManager::instance().current(); if (c && c.get() == this && _session->config.get_external_sync()) { _session->set_requested_return_sample (-1); _session->request_locate (mtc_frame, false, MustStop, TRS_MTC); diff --git a/libs/ardour/mute_control.cc b/libs/ardour/mute_control.cc index 8e6965c421..361238d1f4 100644 --- a/libs/ardour/mute_control.cc +++ b/libs/ardour/mute_control.cc @@ -31,7 +31,7 @@ using namespace std; MuteControl::MuteControl (Session& session, std::string const & name, Muteable& m, Temporal::TimeDomain td) : SlavableAutomationControl (session, MuteAutomation, ParameterDescriptor (MuteAutomation), - boost::shared_ptr (new AutomationList (Evoral::Parameter (MuteAutomation), td)), + std::shared_ptr (new AutomationList (Evoral::Parameter (MuteAutomation), td)), name) , _muteable (m) { @@ -41,7 +41,7 @@ MuteControl::MuteControl (Session& session, std::string const & name, Muteable& } void -MuteControl::post_add_master (boost::shared_ptr m) +MuteControl::post_add_master (std::shared_ptr m) { if (m->get_value()) { @@ -59,7 +59,7 @@ MuteControl::post_add_master (boost::shared_ptr m) } void -MuteControl::pre_remove_master (boost::shared_ptr m) +MuteControl::pre_remove_master (std::shared_ptr m) { if (!m) { /* null control ptr means we're removing all masters */ @@ -92,10 +92,10 @@ MuteControl::actually_set_value (double val, Controllable::GroupControlDispositi } bool -MuteControl::handle_master_change (boost::shared_ptr m) +MuteControl::handle_master_change (std::shared_ptr m) { bool send_signal = false; - boost::shared_ptr mc = boost::dynamic_pointer_cast (m); + std::shared_ptr mc = std::dynamic_pointer_cast (m); if (!mc) { return false; } @@ -127,7 +127,7 @@ MuteControl::get_value () const return muted_by_self() || muted_by_masters (); } - if (_list && boost::dynamic_pointer_cast(_list)->automation_playback()) { + if (_list && std::dynamic_pointer_cast(_list)->automation_playback()) { // Playing back automation, get the value from the list return AutomationControl::get_value(); } diff --git a/libs/ardour/pan_controllable.cc b/libs/ardour/pan_controllable.cc index 3037ccf706..8f0243d0e1 100644 --- a/libs/ardour/pan_controllable.cc +++ b/libs/ardour/pan_controllable.cc @@ -34,7 +34,7 @@ PanControllable::actually_set_value (double v, Controllable::GroupControlDisposi return; } - boost::shared_ptr p = owner->panner(); + std::shared_ptr p = owner->panner(); bool can_set = false; @@ -67,5 +67,5 @@ PanControllable::get_user_string () const snprintf(buf, sizeof(buf), "%.0f%%", 100.f * v); return buf; } - return owner->panner()->value_as_string (boost::dynamic_pointer_cast(shared_from_this())); + return owner->panner()->value_as_string (std::dynamic_pointer_cast(shared_from_this())); } diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index c6edc347dc..26c7ee4eb6 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -103,7 +103,7 @@ Pannable::control_auto_state_changed (AutoState new_state) } void -Pannable::set_panner (boost::shared_ptr p) +Pannable::set_panner (std::shared_ptr p) { _panner = p; } @@ -111,7 +111,7 @@ Pannable::set_panner (boost::shared_ptr p) const std::set& Pannable::what_can_be_automated() const { - boost::shared_ptr const panner = _panner.lock(); + std::shared_ptr const panner = _panner.lock(); if (panner) { return panner->what_can_be_automated (); } @@ -139,7 +139,7 @@ Pannable::set_automation_state (AutoState state) const Controls& c (controls()); for (Controls::const_iterator ci = c.begin(); ci != c.end(); ++ci) { - boost::shared_ptr ac = boost::dynamic_pointer_cast(ci->second); + std::shared_ptr ac = std::dynamic_pointer_cast(ci->second); if (ac) { ac->alist()->set_automation_state (state); } @@ -156,7 +156,7 @@ Pannable::start_touch (timepos_t const & when) const Controls& c (controls()); for (Controls::const_iterator ci = c.begin(); ci != c.end(); ++ci) { - boost::shared_ptr ac = boost::dynamic_pointer_cast(ci->second); + std::shared_ptr ac = std::dynamic_pointer_cast(ci->second); if (ac) { ac->alist()->start_touch (when); } @@ -170,7 +170,7 @@ Pannable::stop_touch (timepos_t const & when) const Controls& c (controls()); for (Controls::const_iterator ci = c.begin(); ci != c.end(); ++ci) { - boost::shared_ptr ac = boost::dynamic_pointer_cast(ci->second); + std::shared_ptr ac = std::dynamic_pointer_cast(ci->second); if (ac) { ac->alist()->stop_touch (when); } diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index e0165a5585..061f733f5b 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -29,7 +29,7 @@ using namespace std; using namespace ARDOUR; -Panner::Panner (boost::shared_ptr p) +Panner::Panner (std::shared_ptr p) : _frozen (0) { // boost_debug_shared_ptr_mark_interesting (this, "panner"); diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc index a53c75b956..b9317be5d3 100644 --- a/libs/ardour/panner_shell.cc +++ b/libs/ardour/panner_shell.cc @@ -66,7 +66,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PannerShell::PannerShell (string name, Session& s, boost::shared_ptr p, Temporal::TimeDomain td, bool is_send) +PannerShell::PannerShell (string name, Session& s, std::shared_ptr p, Temporal::TimeDomain td, bool is_send) : SessionObject (s, name) , _pannable_route (p) , _is_send (is_send) @@ -133,7 +133,7 @@ PannerShell::configure_io (ChanCount in, ChanCount out) DEBUG_TRACE (DEBUG::Panning, string_compose (_("select panner: %1\n"), pi->descriptor.name.c_str())); - boost::shared_ptr speakers = _session.get_speakers (); + std::shared_ptr speakers = _session.get_speakers (); if (nouts != speakers->size()) { /* hmm, output count doesn't match session speaker count so diff --git a/libs/ardour/parameter_descriptor.cc b/libs/ardour/parameter_descriptor.cc index 1eac7ab33f..3a0a1954d5 100644 --- a/libs/ardour/parameter_descriptor.cc +++ b/libs/ardour/parameter_descriptor.cc @@ -125,7 +125,7 @@ ParameterDescriptor::ParameterDescriptor(const Evoral::Parameter& parameter) break; case PhaseAutomation: toggled = true; - scale_points = boost::shared_ptr(new ScalePoints()); + scale_points = std::shared_ptr(new ScalePoints()); scale_points->insert (std::make_pair (_("Normal"), 0)); scale_points->insert (std::make_pair (_("Invert"), 1)); break; @@ -134,7 +134,7 @@ ParameterDescriptor::ParameterDescriptor(const Evoral::Parameter& parameter) integer_step = true; lower = MonitorAuto; upper = MonitorCue; - scale_points = boost::shared_ptr(new ScalePoints()); + scale_points = std::shared_ptr(new ScalePoints()); scale_points->insert (std::make_pair (_("Auto"), MonitorAuto)); scale_points->insert (std::make_pair (_("Input"), MonitorInput)); scale_points->insert (std::make_pair (_("Disk"), MonitorDisk)); diff --git a/libs/ardour/phase_control.cc b/libs/ardour/phase_control.cc index babbd57fe6..fd3eef7ad1 100644 --- a/libs/ardour/phase_control.cc +++ b/libs/ardour/phase_control.cc @@ -27,7 +27,7 @@ using namespace ARDOUR; PhaseControl::PhaseControl (Session& session, std::string const & name, Temporal::TimeDomain td) : AutomationControl (session, PhaseAutomation, ParameterDescriptor (PhaseAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), td)), name) { } diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index ff5e5b4641..fd0f26a848 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -66,7 +66,7 @@ namespace ARDOUR { } struct ShowMeTheList { - ShowMeTheList (boost::shared_ptr pl, const string& n) + ShowMeTheList (std::shared_ptr pl, const string& n) : playlist (pl) , name (n) {} @@ -78,7 +78,7 @@ struct ShowMeTheList { cerr << "<<<<" << name << endl << endl; }; - boost::shared_ptr playlist; + std::shared_ptr playlist; string name; }; @@ -91,13 +91,13 @@ Playlist::make_property_quarks () } RegionListProperty::RegionListProperty (Playlist& pl) - : SequenceProperty > > (Properties::regions.property_id, boost::bind (&Playlist::update, &pl, _1)) + : SequenceProperty > > (Properties::regions.property_id, boost::bind (&Playlist::update, &pl, _1)) , _playlist (pl) { } RegionListProperty::RegionListProperty (RegionListProperty const& p) - : PBD::SequenceProperty > > (p) + : PBD::SequenceProperty > > (p) , _playlist (p._playlist) { } @@ -115,7 +115,7 @@ RegionListProperty::create () const } void -RegionListProperty::get_content_as_xml (boost::shared_ptr region, XMLNode& node) const +RegionListProperty::get_content_as_xml (std::shared_ptr region, XMLNode& node) const { /* All regions (even those which are deleted) have their state * saved by other code, so we can just store ID here. @@ -124,7 +124,7 @@ RegionListProperty::get_content_as_xml (boost::shared_ptr region, XMLNod node.set_property ("id", region->id ()); } -boost::shared_ptr +std::shared_ptr RegionListProperty::get_content_from_xml (XMLNode const& node) const { PBD::ID id; @@ -132,7 +132,7 @@ RegionListProperty::get_content_from_xml (XMLNode const& node) const assert (false); } - boost::shared_ptr ret = _playlist.region_by_id (id); + std::shared_ptr ret = _playlist.region_by_id (id); if (!ret) { ret = RegionFactory::region_by_id (id); @@ -169,7 +169,7 @@ Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide /* set state called by derived class */ } -Playlist::Playlist (boost::shared_ptr other, string namestr, bool hide) +Playlist::Playlist (std::shared_ptr other, string namestr, bool hide) : SessionObject (other->_session, namestr) , regions (*this) , _type (other->_type) @@ -184,7 +184,7 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo in_set_state++; - for (list >::iterator x = tmp.begin(); x != tmp.end(); ++x) { + for (list >::iterator x = tmp.begin(); x != tmp.end(); ++x) { add_region_internal ((*x), (*x)->position(), thawlist); } thawlist.release (); @@ -202,7 +202,7 @@ Playlist::Playlist (boost::shared_ptr other, string namestr, boo _frozen = other->_frozen; } -Playlist::Playlist (boost::shared_ptr other, timepos_t const & start, timepos_t const & cnt, string str, bool hide) +Playlist::Playlist (std::shared_ptr other, timepos_t const & start, timepos_t const & cnt, string str, bool hide) : SessionObject(other->_session, str) , regions (*this) , _type (other->_type) @@ -219,8 +219,8 @@ Playlist::Playlist (boost::shared_ptr other, timepos_t const & s ThawList thawlist; for (RegionList::const_iterator i = other->regions.begin (); i != other->regions.end (); ++i) { - boost::shared_ptr region; - boost::shared_ptr new_region; + std::shared_ptr region; + std::shared_ptr new_region; timecnt_t offset; timepos_t position; timecnt_t len; @@ -356,7 +356,7 @@ Playlist::~Playlist () RegionReadLock rl (this); for (auto & r : all_regions) { - r->set_playlist (boost::shared_ptr ()); + r->set_playlist (std::shared_ptr ()); } } @@ -479,7 +479,7 @@ Playlist::notify_layering_changed () } void -Playlist::notify_region_removed (boost::shared_ptr r) +Playlist::notify_region_removed (std::shared_ptr r) { if (holding_state ()) { pending_removes.insert (r); @@ -489,13 +489,13 @@ Playlist::notify_region_removed (boost::shared_ptr r) as though it could be. */ pending_contents_change = false; - RegionRemoved (boost::weak_ptr (r)); /* EMIT SIGNAL */ + RegionRemoved (std::weak_ptr (r)); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */ } } void -Playlist::notify_region_moved (boost::shared_ptr r) +Playlist::notify_region_moved (std::shared_ptr r) { Temporal::RangeMove move (r->last_position (), r->last_length (), r->position ()); @@ -510,7 +510,7 @@ Playlist::notify_region_moved (boost::shared_ptr r) } void -Playlist::notify_region_start_trimmed (boost::shared_ptr r) +Playlist::notify_region_start_trimmed (std::shared_ptr r) { if (r->position() >= r->last_position()) { /* trimmed shorter */ @@ -530,7 +530,7 @@ Playlist::notify_region_start_trimmed (boost::shared_ptr r) } void -Playlist::notify_region_end_trimmed (boost::shared_ptr r) +Playlist::notify_region_end_trimmed (std::shared_ptr r) { if (r->length() < r->last_length()) { /* trimmed shorter */ @@ -549,7 +549,7 @@ Playlist::notify_region_end_trimmed (boost::shared_ptr r) } void -Playlist::notify_region_added (boost::shared_ptr r) +Playlist::notify_region_added (std::shared_ptr r) { /* the length change might not be true, but we have to act * as though it could be. @@ -561,7 +561,7 @@ Playlist::notify_region_added (boost::shared_ptr r) } else { r->clear_changes (); pending_contents_change = false; - RegionAdded (boost::weak_ptr (r)); /* EMIT SIGNAL */ + RegionAdded (std::weak_ptr (r)); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */ RegionFactory::CheckNewRegion (r); /* EMIT SIGNAL */ } @@ -571,7 +571,7 @@ Playlist::notify_region_added (boost::shared_ptr r) void Playlist::flush_notifications (bool from_undo) { - set >::iterator s; + set >::iterator s; bool regions_changed = false; if (in_flush) { @@ -604,11 +604,11 @@ Playlist::flush_notifications (bool from_undo) crossfade_ranges.push_back (r->range ()); } - boost::shared_ptr rl (new RegionList); + std::shared_ptr rl (new RegionList); for (s = pending_removes.begin (); s != pending_removes.end (); ++s) { crossfade_ranges.push_back ((*s)->range ()); remove_dependents (*s); - RegionRemoved (boost::weak_ptr (*s)); /* EMIT SIGNAL */ + RegionRemoved (std::weak_ptr (*s)); /* EMIT SIGNAL */ rl->push_back (*s); } if (rl->size () > 0) { @@ -634,7 +634,7 @@ Playlist::flush_notifications (bool from_undo) for (s = pending_adds.begin (); s != pending_adds.end (); ++s) { (*s)->clear_changes (); - RegionAdded (boost::weak_ptr (*s)); /* EMIT SIGNAL */ + RegionAdded (std::weak_ptr (*s)); /* EMIT SIGNAL */ RegionFactory::CheckNewRegion (*s); /* EMIT SIGNAL */ } @@ -678,7 +678,7 @@ Playlist::clear_pending () /** Note: this calls set_layer (..., DBL_MAX) so it will reset the layering index of region */ void -Playlist::add_region (boost::shared_ptr region, timepos_t const & position, float times, bool auto_partition) +Playlist::add_region (std::shared_ptr region, timepos_t const & position, float times, bool auto_partition) { if (region->whole_file ()) { region = RegionFactory::create (region, region->derive_properties ()); @@ -710,7 +710,7 @@ Playlist::add_region (boost::shared_ptr region, timepos_t const & positi */ for (int i = 0; i < itimes; ++i) { - boost::shared_ptr copy = RegionFactory::create (region, true, false, &rlock.thawlist); + std::shared_ptr copy = RegionFactory::create (region, true, false, &rlock.thawlist); add_region_internal (copy, pos, rlock.thawlist); set_layer (copy, DBL_MAX); pos += region->length(); @@ -729,7 +729,7 @@ Playlist::add_region (boost::shared_ptr region, timepos_t const & positi plist.add (Properties::length, length); plist.add (Properties::name, name); - boost::shared_ptr sub = RegionFactory::create (region, plist, true, &rlock.thawlist); + std::shared_ptr sub = RegionFactory::create (region, plist, true, &rlock.thawlist); add_region_internal (sub, pos, rlock.thawlist); set_layer (sub, DBL_MAX); @@ -742,7 +742,7 @@ Playlist::set_region_ownership () { RegionWriteLock rl (this); RegionList::iterator i; - boost::weak_ptr pl (shared_from_this ()); + std::weak_ptr pl (shared_from_this ()); for (i = regions.begin (); i != regions.end (); ++i) { (*i)->set_playlist (pl); @@ -750,7 +750,7 @@ Playlist::set_region_ownership () } bool -Playlist::add_region_internal (boost::shared_ptr region, timepos_t const & position, ThawList& thawlist) +Playlist::add_region_internal (std::shared_ptr region, timepos_t const & position, ThawList& thawlist) { if (region->data_type () != _type) { return false; @@ -764,7 +764,7 @@ Playlist::add_region_internal (boost::shared_ptr region, timepos_t const RegionSortByPosition cmp; if (!first_set_state) { - region->set_playlist (boost::weak_ptr (shared_from_this())); + region->set_playlist (std::weak_ptr (shared_from_this())); } region->set_position_unchecked (position); @@ -781,8 +781,8 @@ Playlist::add_region_internal (boost::shared_ptr region, timepos_t const notify_region_added (region); - region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, boost::weak_ptr (region))); - region->DropReferences.connect_same_thread (region_drop_references_connections, boost::bind (&Playlist::region_going_away, this, boost::weak_ptr (region))); + region->PropertyChanged.connect_same_thread (region_state_changed_connections, boost::bind (&Playlist::region_changed_proxy, this, _1, std::weak_ptr (region))); + region->DropReferences.connect_same_thread (region_drop_references_connections, boost::bind (&Playlist::region_going_away, this, std::weak_ptr (region))); /* do not handle property changes of newly added regions. * Otherwise this would trigger Playlist::notify_region_moved() @@ -794,7 +794,7 @@ Playlist::add_region_internal (boost::shared_ptr region, timepos_t const } void -Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr newr, timepos_t const & pos) +Playlist::replace_region (std::shared_ptr old, std::shared_ptr newr, timepos_t const & pos) { if (newr->whole_file ()) { newr = RegionFactory::create (newr, newr->derive_properties ()); @@ -808,20 +808,20 @@ Playlist::replace_region (boost::shared_ptr old, boost::shared_ptr region) +Playlist::remove_region (std::shared_ptr region) { RegionWriteLock rlock (this); remove_region_internal (region, rlock.thawlist); } int -Playlist::remove_region_internal (boost::shared_ptr region, ThawList& thawlist) +Playlist::remove_region_internal (std::shared_ptr region, ThawList& thawlist) { RegionList::iterator i; if (!in_set_state) { /* unset playlist */ - region->set_playlist (boost::weak_ptr ()); + region->set_playlist (std::weak_ptr ()); } /* XXX should probably freeze here .... */ @@ -895,7 +895,7 @@ Playlist::remove_gaps (timecnt_t const & gap_threshold, timecnt_t const & leave_ } void -Playlist::get_equivalent_regions (boost::shared_ptr other, vector >& results) +Playlist::get_equivalent_regions (std::shared_ptr other, vector >& results) { switch (Config->get_region_equivalence ()) { case Exact: @@ -946,8 +946,8 @@ Playlist::partition_internal (timepos_t const & start, timepos_t const & end, bo RegionList new_regions; { - boost::shared_ptr region; - boost::shared_ptr current; + std::shared_ptr region; + std::shared_ptr current; string new_name; RegionList::iterator tmp; Temporal::OverlapType overlap; @@ -1164,15 +1164,15 @@ Playlist::partition_internal (timepos_t const & start, timepos_t const & end, bo _end_space = wanted_length - _get_extent().first.distance (_get_extent().second); } -boost::shared_ptr -Playlist::cut_copy (boost::shared_ptr (Playlist::*pmf)(timepos_t const &, timecnt_t const &,bool), list& ranges, bool result_is_hidden) +std::shared_ptr +Playlist::cut_copy (std::shared_ptr (Playlist::*pmf)(timepos_t const &, timecnt_t const &,bool), list& ranges, bool result_is_hidden) { - boost::shared_ptr ret; - boost::shared_ptr pl; + std::shared_ptr ret; + std::shared_ptr pl; timepos_t start; if (ranges.empty ()) { - return boost::shared_ptr (); + return std::shared_ptr (); } start = ranges.front().start(); @@ -1196,24 +1196,24 @@ Playlist::cut_copy (boost::shared_ptr (Playlist::*pmf)(timepos_t const return ret; } -boost::shared_ptr +std::shared_ptr Playlist::cut (list& ranges, bool result_is_hidden) { - boost::shared_ptr (Playlist::*pmf) (timepos_t const & , timecnt_t const &, bool) = &Playlist::cut; + std::shared_ptr (Playlist::*pmf) (timepos_t const & , timecnt_t const &, bool) = &Playlist::cut; return cut_copy (pmf, ranges, result_is_hidden); } -boost::shared_ptr +std::shared_ptr Playlist::copy (list& ranges, bool result_is_hidden) { - boost::shared_ptr (Playlist::*pmf) (timepos_t const &, timecnt_t const &, bool) = &Playlist::copy; + std::shared_ptr (Playlist::*pmf) (timepos_t const &, timecnt_t const &, bool) = &Playlist::copy; return cut_copy (pmf, ranges, result_is_hidden); } -boost::shared_ptr +std::shared_ptr Playlist::cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden) { - boost::shared_ptr the_copy; + std::shared_ptr the_copy; char buf[32]; snprintf (buf, sizeof (buf), "%" PRIu32, ++subcnt); @@ -1222,7 +1222,7 @@ Playlist::cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hi new_name += buf; if ((the_copy = PlaylistFactory::create (shared_from_this(), start, timepos_t (cnt), new_name, result_is_hidden)) == 0) { - return boost::shared_ptr(); + return std::shared_ptr(); } { @@ -1233,7 +1233,7 @@ Playlist::cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hi return the_copy; } -boost::shared_ptr +std::shared_ptr Playlist::copy (timepos_t const & start, timecnt_t const & cnt, bool result_is_hidden) { char buf[32]; @@ -1249,7 +1249,7 @@ Playlist::copy (timepos_t const & start, timecnt_t const & cnt, bool result_is_h } int -Playlist::paste (boost::shared_ptr other, timepos_t const & position, float times) +Playlist::paste (std::shared_ptr other, timepos_t const & position, float times) { times = fabs (times); @@ -1265,7 +1265,7 @@ Playlist::paste (boost::shared_ptr other, timepos_t const & position, RegionWriteLock rl1 (this); while (itimes--) { for (auto const & r : other->regions) { - boost::shared_ptr copy_of_region = RegionFactory::create (r, true, false, &rl1.thawlist); + std::shared_ptr copy_of_region = RegionFactory::create (r, true, false, &rl1.thawlist); /* put these new regions on top of all existing ones, but preserve the ordering they had in the original playlist. @@ -1282,14 +1282,14 @@ Playlist::paste (boost::shared_ptr other, timepos_t const & position, } void -Playlist::duplicate (boost::shared_ptr region, timepos_t & position, float times) +Playlist::duplicate (std::shared_ptr region, timepos_t & position, float times) { duplicate(region, position, region->length(), times); } /** @param gap from the beginning of the region to the next beginning */ void -Playlist::duplicate (boost::shared_ptr region, timepos_t & position, timecnt_t const & gap, float times) +Playlist::duplicate (std::shared_ptr region, timepos_t & position, timecnt_t const & gap, float times) { times = fabs (times); @@ -1297,7 +1297,7 @@ Playlist::duplicate (boost::shared_ptr region, timepos_t & position, tim int itimes = (int)floor (times); while (itimes--) { - boost::shared_ptr copy = RegionFactory::create (region, true, false, &rl.thawlist); + std::shared_ptr copy = RegionFactory::create (region, true, false, &rl.thawlist); add_region_internal (copy, position, rl.thawlist); set_layer (copy, DBL_MAX); position += gap; @@ -1312,7 +1312,7 @@ Playlist::duplicate (boost::shared_ptr region, timepos_t & position, tim PropertyList plist (region->derive_properties ()); plist.add (Properties::length, length); - boost::shared_ptr sub = RegionFactory::create (region, plist, true, &rl.thawlist); + std::shared_ptr sub = RegionFactory::create (region, plist, true, &rl.thawlist); add_region_internal (sub, position, rl.thawlist); set_layer (sub, DBL_MAX); } @@ -1322,12 +1322,12 @@ Playlist::duplicate (boost::shared_ptr region, timepos_t & position, tim /** @param gap from the beginning of the region to the next beginning */ /** @param end the first sample that does _not_ contain a duplicated sample */ void -Playlist::duplicate_until (boost::shared_ptr region, timepos_t & position, timecnt_t const & gap, timepos_t const & end) +Playlist::duplicate_until (std::shared_ptr region, timepos_t & position, timecnt_t const & gap, timepos_t const & end) { RegionWriteLock rl (this); while ((position + region->length()).decrement() < end) { - boost::shared_ptr copy = RegionFactory::create (region, true, false, &rl.thawlist); + std::shared_ptr copy = RegionFactory::create (region, true, false, &rl.thawlist); add_region_internal (copy, position, rl.thawlist); set_layer (copy, DBL_MAX); position += gap; @@ -1341,7 +1341,7 @@ Playlist::duplicate_until (boost::shared_ptr region, timepos_t & positio PropertyList plist (region->derive_properties ()); plist.add (Properties::length, length); - boost::shared_ptr sub = RegionFactory::create (region, plist, false, &rl.thawlist); + std::shared_ptr sub = RegionFactory::create (region, plist, false, &rl.thawlist); add_region_internal (sub, position, rl.thawlist); set_layer (sub, DBL_MAX); } @@ -1351,7 +1351,7 @@ Playlist::duplicate_until (boost::shared_ptr region, timepos_t & positio void Playlist::duplicate_range (TimelineRange& range, float times) { - boost::shared_ptr pl = copy (range.start(), range.length(), true); + std::shared_ptr pl = copy (range.start(), range.length(), true); paste (pl, range.end(), times); } @@ -1378,7 +1378,7 @@ Playlist::duplicate_ranges (std::list& ranges, float times) int itimes = (int)floor (times); while (itimes--) { for (list::iterator i = ranges.begin (); i != ranges.end (); ++i) { - boost::shared_ptr pl = copy ((*i).start(), (*i).length (), true); + std::shared_ptr pl = copy ((*i).start(), (*i).length (), true); paste (pl, (*i).start() + (offset.scale (count)), 1.0f); } ++count; @@ -1440,14 +1440,14 @@ Playlist::split (timepos_t const & at) } void -Playlist::split_region (boost::shared_ptr region, timepos_t const & playlist_position) +Playlist::split_region (std::shared_ptr region, timepos_t const & playlist_position) { RegionWriteLock rl (this); _split_region (region, playlist_position, rl.thawlist); } void -Playlist::_split_region (boost::shared_ptr region, timepos_t const & playlist_position, ThawList& thawlist) +Playlist::_split_region (std::shared_ptr region, timepos_t const & playlist_position, ThawList& thawlist) { if (!region->covers (playlist_position)) { return; @@ -1458,8 +1458,8 @@ Playlist::_split_region (boost::shared_ptr region, timepos_t const & pl return; } - boost::shared_ptr left; - boost::shared_ptr right; + std::shared_ptr left; + std::shared_ptr right; timecnt_t before (region->position().distance (playlist_position)); timecnt_t after (region->length() - before); @@ -1574,7 +1574,7 @@ Playlist::ripple_unlocked (timepos_t const & at, timecnt_t const & distance, Reg } void -Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shared_ptr region) +Playlist::region_bounds_changed (const PropertyChange& what_changed, std::shared_ptr region) { if (in_set_state || _rippling || _nudging || _shuffling) { return; @@ -1614,9 +1614,9 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar } void -Playlist::region_changed_proxy (const PropertyChange& what_changed, boost::weak_ptr weak_region) +Playlist::region_changed_proxy (const PropertyChange& what_changed, std::weak_ptr weak_region) { - boost::shared_ptr region (weak_region.lock ()); + std::shared_ptr region (weak_region.lock ()); if (!region) { return; @@ -1628,7 +1628,7 @@ Playlist::region_changed_proxy (const PropertyChange& what_changed, boost::weak_ } bool -Playlist::region_changed (const PropertyChange& what_changed, boost::shared_ptr region) +Playlist::region_changed (const PropertyChange& what_changed, std::shared_ptr region) { PropertyChange our_interests; PropertyChange bounds; @@ -1727,7 +1727,7 @@ Playlist::clear (bool with_signals) if (with_signals) { for (auto & r : pending_removes) { - RegionRemoved (boost::weak_ptr (r)); /* EMIT SIGNAL */ + RegionRemoved (std::weak_ptr (r)); /* EMIT SIGNAL */ } pending_removes.clear (); @@ -1740,16 +1740,16 @@ Playlist::clear (bool with_signals) FINDING THINGS **********************************************************************/ -boost::shared_ptr +std::shared_ptr Playlist::region_list () { RegionReadLock rlock (this); - boost::shared_ptr rlist (new RegionList (regions.rlist ())); + std::shared_ptr rlist (new RegionList (regions.rlist ())); return rlist; } void -Playlist::deep_sources (std::set >& sources) const +Playlist::deep_sources (std::set >& sources) const { RegionReadLock rlock (const_cast (this)); @@ -1758,7 +1758,7 @@ Playlist::deep_sources (std::set >& sources) const } } -boost::shared_ptr +std::shared_ptr Playlist::regions_at (timepos_t const & pos) { RegionReadLock rlock (this); @@ -1780,12 +1780,12 @@ Playlist::count_regions_at (timepos_t const & pos) const return cnt; } -boost::shared_ptr +std::shared_ptr Playlist::top_region_at (timepos_t const & pos) { RegionReadLock rlock (this); - boost::shared_ptr rlist = find_regions_at (pos); - boost::shared_ptr region; + std::shared_ptr rlist = find_regions_at (pos); + std::shared_ptr region; if (rlist->size ()) { RegionSortByLayer cmp; @@ -1796,11 +1796,11 @@ Playlist::top_region_at (timepos_t const & pos) return region; } -boost::shared_ptr +std::shared_ptr Playlist::top_unmuted_region_at (timepos_t const & pos) { RegionReadLock rlock (this); - boost::shared_ptr rlist = find_regions_at (pos); + std::shared_ptr rlist = find_regions_at (pos); for (RegionList::iterator i = rlist->begin (); i != rlist->end ();) { RegionList::iterator tmp = i; @@ -1814,7 +1814,7 @@ Playlist::top_unmuted_region_at (timepos_t const & pos) i = tmp; } - boost::shared_ptr region; + std::shared_ptr region; if (rlist->size ()) { RegionSortByLayer cmp; @@ -1825,11 +1825,11 @@ Playlist::top_unmuted_region_at (timepos_t const & pos) return region; } -boost::shared_ptr +std::shared_ptr Playlist::audible_regions_at (timepos_t const& pos) { - boost::shared_ptr rv (new RegionList); - boost::shared_ptr rlist; + std::shared_ptr rv (new RegionList); + std::shared_ptr rlist; { RegionReadLock rlock (this); rlist = find_regions_at (pos); @@ -1856,9 +1856,9 @@ Playlist::audible_regions_at (timepos_t const& pos) } bool -Playlist::region_is_audible_at (boost::shared_ptr r, timepos_t const& pos) +Playlist::region_is_audible_at (std::shared_ptr r, timepos_t const& pos) { - boost::shared_ptr rlist; + std::shared_ptr rlist; { RegionReadLock rlock (this); rlist = find_regions_at (pos); @@ -1885,12 +1885,12 @@ Playlist::region_is_audible_at (boost::shared_ptr r, timepos_t const& po return false; } -boost::shared_ptr +std::shared_ptr Playlist::find_regions_at (timepos_t const & pos) { /* Caller must hold lock */ - boost::shared_ptr rlist (new RegionList); + std::shared_ptr rlist (new RegionList); for (auto & r : regions) { if (r->covers (pos)) { @@ -1901,11 +1901,11 @@ Playlist::find_regions_at (timepos_t const & pos) return rlist; } -boost::shared_ptr +std::shared_ptr Playlist::regions_with_start_within (Temporal::Range range) { RegionReadLock rlock (this); - boost::shared_ptr rlist (new RegionList); + std::shared_ptr rlist (new RegionList); for (auto & r : regions) { if (r->position() >= range.start() && r->position() < range.end()) { @@ -1916,11 +1916,11 @@ Playlist::regions_with_start_within (Temporal::Range range) return rlist; } -boost::shared_ptr +std::shared_ptr Playlist::regions_with_end_within (Temporal::Range range) { RegionReadLock rlock (this); - boost::shared_ptr rlist (new RegionList); + std::shared_ptr rlist (new RegionList); for (auto & r : regions) { if (r->nt_last() >= range.start() && r->nt_last() < range.end()) { @@ -1931,17 +1931,17 @@ Playlist::regions_with_end_within (Temporal::Range range) return rlist; } -boost::shared_ptr +std::shared_ptr Playlist::regions_touched (timepos_t const & start, timepos_t const & end) { RegionReadLock rlock (this); return regions_touched_locked (start, end); } -boost::shared_ptr +std::shared_ptr Playlist::regions_touched_locked (timepos_t const & start, timepos_t const & end) { - boost::shared_ptr rlist (new RegionList); + std::shared_ptr rlist (new RegionList); for (auto & r : regions) { if (r->coverage (start, end) != Temporal::OverlapNone) { @@ -2010,11 +2010,11 @@ Playlist::find_next_transient (timepos_t const & from, int dir) return -1; } -boost::shared_ptr +std::shared_ptr Playlist::find_next_region (timepos_t const & pos, RegionPoint point, int dir) { RegionReadLock rlock (this); - boost::shared_ptr ret; + std::shared_ptr ret; timecnt_t closest = timecnt_t::max (pos.time_domain()); bool end_iter = false; @@ -2078,7 +2078,7 @@ Playlist::find_prev_region_start (timepos_t const & at) timepos_t ret = timepos_t::max (at.time_domain());; for (RegionList::reverse_iterator i = regions.rbegin (); i != regions.rend (); ++i) { - boost::shared_ptr r = (*i); + std::shared_ptr r = (*i); timecnt_t distance; const timepos_t first_sample = r->position(); @@ -2119,7 +2119,7 @@ Playlist::find_next_region_boundary (timepos_t const & pos, int dir) if (dir > 0) { for (RegionList::iterator i = regions.begin (); i != regions.end (); ++i) { - boost::shared_ptr r = (*i); + std::shared_ptr r = (*i); timecnt_t distance; if (r->position() > pos) { @@ -2145,7 +2145,7 @@ Playlist::find_next_region_boundary (timepos_t const & pos, int dir) } else { for (RegionList::reverse_iterator i = regions.rbegin (); i != regions.rend (); ++i) { - boost::shared_ptr r = (*i); + std::shared_ptr r = (*i); timecnt_t distance; if (r->nt_last() < pos) { @@ -2238,7 +2238,7 @@ Playlist::set_state (const XMLNode& node, int version) XMLNode* child; XMLNodeList nlist; XMLNodeConstIterator niter; - boost::shared_ptr region; + std::shared_ptr region; string region_name; bool seen_region_nodes = false; int ret = 0; @@ -2493,7 +2493,7 @@ Playlist::top_layer () const } struct RelayerSort { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) + bool operator() (std::shared_ptr a, std::shared_ptr b) { return a->layering_index () < b->layering_index (); } @@ -2504,7 +2504,7 @@ struct RelayerSort { * place. The actual layering will be fixed up when relayer() happens. */ void -Playlist::set_layer (boost::shared_ptr region, double new_layer) +Playlist::set_layer (std::shared_ptr region, double new_layer) { /* Remove the layer we are setting from our region list, and sort it * using the layer indeces. @@ -2539,7 +2539,7 @@ Playlist::setup_layering_indices (RegionList const& regions) } struct LaterHigherSort { - bool operator () (boost::shared_ptr a, boost::shared_ptr b) { + bool operator () (std::shared_ptr a, std::shared_ptr b) { return a->position() < b->position(); } }; @@ -2680,28 +2680,28 @@ Playlist::relayer () } void -Playlist::raise_region (boost::shared_ptr region) +Playlist::raise_region (std::shared_ptr region) { set_layer (region, region->layer () + 1.5); relayer (); } void -Playlist::lower_region (boost::shared_ptr region) +Playlist::lower_region (std::shared_ptr region) { set_layer (region, region->layer () - 1.5); relayer (); } void -Playlist::raise_region_to_top (boost::shared_ptr region) +Playlist::raise_region_to_top (std::shared_ptr region) { set_layer (region, DBL_MAX); relayer (); } void -Playlist::lower_region_to_bottom (boost::shared_ptr region) +Playlist::lower_region_to_bottom (std::shared_ptr region) { set_layer (region, -0.5); relayer (); @@ -2755,7 +2755,7 @@ Playlist::nudge_after (timepos_t const & start, timecnt_t const & distance, bool } bool -Playlist::uses_source (boost::shared_ptr src, bool shallow) const +Playlist::uses_source (std::shared_ptr src, bool shallow) const { RegionReadLock rlock (const_cast (this)); @@ -2774,7 +2774,7 @@ Playlist::uses_source (boost::shared_ptr src, bool shallow) const return false; } -boost::shared_ptr +std::shared_ptr Playlist::find_region (const ID& id) const { RegionReadLock rlock (const_cast (this)); @@ -2787,11 +2787,11 @@ Playlist::find_region (const ID& id) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } uint32_t -Playlist::region_use_count (boost::shared_ptr r) const +Playlist::region_use_count (std::shared_ptr r) const { RegionReadLock rlock (const_cast (this)); uint32_t cnt = 0; @@ -2816,7 +2816,7 @@ Playlist::region_use_count (boost::shared_ptr r) const */ const SourceList& sl = r->sources (); for (SourceList::const_iterator s = sl.begin (); s != sl.end (); ++s) { - boost::shared_ptr ps = boost::dynamic_pointer_cast (*s); + std::shared_ptr ps = std::dynamic_pointer_cast (*s); if (!ps) continue; if (ps->playlist ()->region_use_count (it->first)) { @@ -2829,7 +2829,7 @@ Playlist::region_use_count (boost::shared_ptr r) const return cnt; } -boost::shared_ptr +std::shared_ptr Playlist::region_by_id (const ID& id) const { /* searches all regions ever added to this playlist */ @@ -2839,13 +2839,13 @@ Playlist::region_by_id (const ID& id) const return r; } } - return boost::shared_ptr (); + return std::shared_ptr (); } void Playlist::dump () const { - boost::shared_ptr r; + std::shared_ptr r; cerr << "Playlist \"" << _name << "\" " << endl << regions.size () << " regions " @@ -2869,7 +2869,7 @@ Playlist::set_frozen (bool yn) } void -Playlist::shuffle (boost::shared_ptr region, int dir) +Playlist::shuffle (std::shared_ptr region, int dir) { bool moved = false; @@ -2981,7 +2981,7 @@ Playlist::shuffle (boost::shared_ptr region, int dir) } bool -Playlist::region_is_shuffle_constrained (boost::shared_ptr) +Playlist::region_is_shuffle_constrained (std::shared_ptr) { RegionReadLock rlock (const_cast (this)); @@ -3017,7 +3017,7 @@ Playlist::update_after_tempo_map_change () } void -Playlist::foreach_region (boost::function)> func) +Playlist::foreach_region (boost::function)> func) { RegionReadLock rl (this); for (auto & r : regions) { @@ -3062,11 +3062,11 @@ Playlist::find_next_top_layer_position (timepos_t const & t) const return timepos_t::max (t.time_domain()); } -boost::shared_ptr -Playlist::combine (const RegionList& rl, boost::shared_ptr) +std::shared_ptr +Playlist::combine (const RegionList& rl, std::shared_ptr) { if (rl.empty()) { - return boost::shared_ptr(); + return std::shared_ptr(); } ThawList thawlist; @@ -3075,8 +3075,8 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) uint32_t layer = 0; timepos_t earliest_position = timepos_t::max (rl.front()->position().time_domain()); vector old_and_new_regions; - vector > originals; - vector > copies; + vector > originals; + vector > copies; string parent_name; string child_name; uint32_t max_level = 0; @@ -3090,7 +3090,7 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) parent_name = RegionFactory::compound_region_name (name(), combine_ops(), max_level, true); child_name = RegionFactory::compound_region_name (name(), combine_ops(), max_level, false); - boost::shared_ptr pl = PlaylistFactory::create (_type, _session, parent_name, true); + std::shared_ptr pl = PlaylistFactory::create (_type, _session, parent_name, true); for (auto const & r : rl) { earliest_position = min (earliest_position, r->position()); @@ -3113,7 +3113,7 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) /* copy the region */ - boost::shared_ptr copied_region = RegionFactory::create (original_region, false, false, &thawlist); + std::shared_ptr copied_region = RegionFactory::create (original_region, false, false, &thawlist); old_and_new_regions.push_back (TwoRegions (original_region,copied_region)); originals.push_back (original_region); @@ -3157,7 +3157,7 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) plist.add (Properties::name, parent_name); plist.add (Properties::whole_file, true); - boost::shared_ptr parent_region = RegionFactory::create (sources, plist, true, &thawlist); + std::shared_ptr parent_region = RegionFactory::create (sources, plist, true, &thawlist); /* now the non-whole-file region that we will actually use in the playlist */ @@ -3167,10 +3167,10 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) plist.add (Properties::name, child_name); plist.add (Properties::layer, layer+1); - boost::shared_ptr compound_region = RegionFactory::create (parent_region, plist, true, &thawlist); + std::shared_ptr compound_region = RegionFactory::create (parent_region, plist, true, &thawlist); for (auto src : sources) { - boost::dynamic_pointer_cast(src)->set_owner (compound_region->id()); + std::dynamic_pointer_cast(src)->set_owner (compound_region->id()); } /* remove all the selected regions from the current playlist */ @@ -3198,16 +3198,16 @@ Playlist::combine (const RegionList& rl, boost::shared_ptr) } void -Playlist::uncombine (boost::shared_ptr target) +Playlist::uncombine (std::shared_ptr target) { - boost::shared_ptr pls; - boost::shared_ptr pl; - vector > originals; + std::shared_ptr pls; + std::shared_ptr pl; + vector > originals; vector old_and_new_regions; /* (1) check that its really a compound region */ - if ((pls = boost::dynamic_pointer_cast (target->source (0))) == 0) { + if ((pls = std::dynamic_pointer_cast (target->source (0))) == 0) { return; } @@ -3246,7 +3246,7 @@ Playlist::uncombine (boost::shared_ptr target) the original regions, and add them instead. */ - const bool need_copies = (boost::dynamic_pointer_cast (pls)->owner() != target->id()) || + const bool need_copies = (std::dynamic_pointer_cast (pls)->owner() != target->id()) || (pls->original() != id()); @@ -3260,7 +3260,7 @@ Playlist::uncombine (boost::shared_ptr target) continue; } - boost::shared_ptr original (ca->second); + std::shared_ptr original (ca->second); bool modified_region; @@ -3351,7 +3351,7 @@ Playlist::uncombine (boost::shared_ptr target) // (4) add the constituent regions - for (vector >::iterator i = originals.begin(); i != originals.end(); ++i) { + for (vector >::iterator i = originals.begin(); i != originals.end(); ++i) { add_region ((*i), (*i)->position()); set_layer((*i), (*i)->layer()); if (!RegionFactory::region_by_id((*i)->id())) { diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc index f5dbc41a1b..d1a018bdba 100644 --- a/libs/ardour/playlist_factory.cc +++ b/libs/ardour/playlist_factory.cc @@ -32,20 +32,20 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal2, bool> PlaylistFactory::PlaylistCreated; +PBD::Signal2, bool> PlaylistFactory::PlaylistCreated; -boost::shared_ptr +std::shared_ptr PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unused) { XMLProperty const * type = node.property("type"); - boost::shared_ptr pl; + std::shared_ptr pl; try { if (!type || type->value() == "audio") { - pl = boost::shared_ptr (new AudioPlaylist (s, node, hidden)); + pl = std::shared_ptr (new AudioPlaylist (s, node, hidden)); } else if (type->value() == "midi") { - pl = boost::shared_ptr (new MidiPlaylist (s, node, hidden)); + pl = std::shared_ptr (new MidiPlaylist (s, node, hidden)); } pl->set_region_ownership (); @@ -56,20 +56,20 @@ PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden, bool unus return pl; } catch (...) { - return boost::shared_ptr (); + return std::shared_ptr (); } } -boost::shared_ptr +std::shared_ptr PlaylistFactory::create (DataType type, Session& s, string name, bool hidden) { - boost::shared_ptr pl; + std::shared_ptr pl; try { if (type == DataType::AUDIO) - pl = boost::shared_ptr (new AudioPlaylist (s, name, hidden)); + pl = std::shared_ptr (new AudioPlaylist (s, name, hidden)); else if (type == DataType::MIDI) - pl = boost::shared_ptr (new MidiPlaylist (s, name, hidden)); + pl = std::shared_ptr (new MidiPlaylist (s, name, hidden)); if (pl && !hidden) { PlaylistCreated (pl, false); @@ -77,24 +77,24 @@ PlaylistFactory::create (DataType type, Session& s, string name, bool hidden) return pl; } catch (...) { - return boost::shared_ptr (); + return std::shared_ptr (); } } -boost::shared_ptr -PlaylistFactory::create (boost::shared_ptr old, string name, bool hidden) +std::shared_ptr +PlaylistFactory::create (std::shared_ptr old, string name, bool hidden) { - boost::shared_ptr pl; - boost::shared_ptr apl; - boost::shared_ptr mpl; + std::shared_ptr pl; + std::shared_ptr apl; + std::shared_ptr mpl; try { - if ((apl = boost::dynamic_pointer_cast (old)) != 0) { - pl = boost::shared_ptr (new AudioPlaylist (apl, name, hidden)); + if ((apl = std::dynamic_pointer_cast (old)) != 0) { + pl = std::shared_ptr (new AudioPlaylist (apl, name, hidden)); pl->set_region_ownership (); - } else if ((mpl = boost::dynamic_pointer_cast (old)) != 0) { - pl = boost::shared_ptr (new MidiPlaylist (mpl, name, hidden)); + } else if ((mpl = std::dynamic_pointer_cast (old)) != 0) { + pl = std::shared_ptr (new MidiPlaylist (mpl, name, hidden)); pl->set_region_ownership (); } @@ -104,24 +104,24 @@ PlaylistFactory::create (boost::shared_ptr old, string name, boo return pl; } catch (...) { - return boost::shared_ptr (); + return std::shared_ptr (); } } -boost::shared_ptr -PlaylistFactory::create (boost::shared_ptr old, timepos_t const & start, timepos_t const & cnt, string name, bool hidden) +std::shared_ptr +PlaylistFactory::create (std::shared_ptr old, timepos_t const & start, timepos_t const & cnt, string name, bool hidden) { - boost::shared_ptr pl; - boost::shared_ptr apl; - boost::shared_ptr mpl; + std::shared_ptr pl; + std::shared_ptr apl; + std::shared_ptr mpl; try { - if ((apl = boost::dynamic_pointer_cast (old)) != 0) { - pl = boost::shared_ptr (new AudioPlaylist (apl, start, cnt, name, hidden)); + if ((apl = std::dynamic_pointer_cast (old)) != 0) { + pl = std::shared_ptr (new AudioPlaylist (apl, start, cnt, name, hidden)); pl->set_region_ownership (); - } else if ((mpl = boost::dynamic_pointer_cast (old)) != 0) { - pl = boost::shared_ptr (new MidiPlaylist (mpl, start, cnt, name, hidden)); + } else if ((mpl = std::dynamic_pointer_cast (old)) != 0) { + pl = std::shared_ptr (new MidiPlaylist (mpl, start, cnt, name, hidden)); pl->set_region_ownership (); } @@ -129,6 +129,6 @@ PlaylistFactory::create (boost::shared_ptr old, timepos_t const return pl; } catch (...) { - return boost::shared_ptr (); + return std::shared_ptr (); } } diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc index 837dd4f1f6..b1ccd7f1d5 100644 --- a/libs/ardour/playlist_source.cc +++ b/libs/ardour/playlist_source.cc @@ -42,7 +42,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PlaylistSource::PlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr p, DataType type, +PlaylistSource::PlaylistSource (Session& s, const ID& orig, const std::string& name, std::shared_ptr p, DataType type, timepos_t const & begin, timepos_t const & len, Source::Flag /*flags*/) : Source (s, type, name) , _playlist (p) diff --git a/libs/ardour/plug_insert_base.cc b/libs/ardour/plug_insert_base.cc index 1ae0694f17..047db3835c 100644 --- a/libs/ardour/plug_insert_base.cc +++ b/libs/ardour/plug_insert_base.cc @@ -85,11 +85,11 @@ PlugInsertBase::parse_plugin_type (XMLNode const& node, PluginType& type, std::s return true; } -boost::shared_ptr +std::shared_ptr PlugInsertBase::find_and_load_plugin (Session& s, XMLNode const& node, PluginType& type, std::string const& unique_id, bool& any_vst) { /* Find and load plugin module */ - boost::shared_ptr plugin = find_plugin (s, unique_id, type); + std::shared_ptr plugin = find_plugin (s, unique_id, type); /* treat VST plugins equivalent if they have the same uniqueID * allow to move sessions windows <> linux */ @@ -124,7 +124,7 @@ PlugInsertBase::find_and_load_plugin (Session& s, XMLNode const& node, PluginTyp * load the plugin from the serialized version in the * session-file instead. */ - boost::shared_ptr lp (new LuaProc (s.engine(), s, "")); + std::shared_ptr lp (new LuaProc (s.engine(), s, "")); XMLNode *ls = node.child (lp->state_node_name().c_str()); if (ls && lp) { if (0 == lp->set_script_from_state (*ls)) { @@ -139,7 +139,7 @@ PlugInsertBase::find_and_load_plugin (Session& s, XMLNode const& node, PluginTyp "Perhaps it was removed or moved since it was last used."), unique_id) << endmsg; - return boost::shared_ptr (); + return std::shared_ptr (); } return plugin; } @@ -156,7 +156,7 @@ PlugInsertBase::set_control_ids (const XMLNode& node, int version) uint32_t p = (uint32_t)-1; std::string str; if ((*iter)->get_property (X_("symbol"), str)) { - boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (plugin ()); + std::shared_ptr lv2plugin = std::dynamic_pointer_cast (plugin ()); if (lv2plugin) { p = lv2plugin->port_index(str.c_str()); } @@ -170,12 +170,12 @@ PlugInsertBase::set_control_ids (const XMLNode& node, int version) } /* this may create the new controllable */ - boost::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, p)); + std::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, p)); if (!c) { continue; } - boost::shared_ptr ac = boost::dynamic_pointer_cast (c); + std::shared_ptr ac = std::dynamic_pointer_cast (c); if (ac) { ac->set_state (**iter, version); } @@ -185,7 +185,7 @@ PlugInsertBase::set_control_ids (const XMLNode& node, int version) void PlugInsertBase::preset_load_set_value (uint32_t p, float v) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (Evoral::ControlSet::control (Evoral::Parameter(PluginAutomation, 0, p), false)); + std::shared_ptr ac = std::dynamic_pointer_cast (Evoral::ControlSet::control (Evoral::Parameter(PluginAutomation, 0, p), false)); if (!ac) { return; } diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 53455f04b7..cf110af79b 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -76,7 +76,7 @@ using namespace PBD; const string PluginInsert::port_automation_node_name = "PortAutomation"; -PluginInsert::PluginInsert (Session& s, Temporal::TimeDomain td, boost::shared_ptr plug) +PluginInsert::PluginInsert (Session& s, Temporal::TimeDomain td, std::shared_ptr plug) : Processor (s, (plug ? plug->name() : string ("toBeRenamed")), td) , _sc_playback_latency (0) , _sc_capture_latency (0) @@ -109,7 +109,7 @@ PluginInsert::PluginInsert (Session& s, Temporal::TimeDomain td, boost::shared_p PluginInsert::~PluginInsert () { for (CtrlOutMap::const_iterator i = _control_outputs.begin(); i != _control_outputs.end(); ++i) { - boost::dynamic_pointer_cast(i->second)->drop_references (); + std::dynamic_pointer_cast(i->second)->drop_references (); } } @@ -133,7 +133,7 @@ PluginInsert::drop_references () { Glib::Threads::Mutex::Lock lm (_control_lock); for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { - boost::dynamic_pointer_cast(li->second)->drop_references (); + std::dynamic_pointer_cast(li->second)->drop_references (); } _controls.clear (); } @@ -176,7 +176,7 @@ PluginInsert::set_count (uint32_t num) uint32_t diff = num - _plugins.size(); for (uint32_t n = 0; n < diff; ++n) { - boost::shared_ptr p = plugin_factory (_plugins[0]); + std::shared_ptr p = plugin_factory (_plugins[0]); add_plugin (p); if (require_state) { @@ -314,8 +314,8 @@ PluginInsert::control_list_automation_state_changed (Evoral::Parameter which, Au if (which.type() != PluginAutomation) return; - boost::shared_ptr c - = boost::dynamic_pointer_cast(control (which)); + std::shared_ptr c + = std::dynamic_pointer_cast(control (which)); if (c && s != Off) { _plugins[0]->set_parameter (which.id(), c->list()->eval (timepos_t (_session.transport_sample())), 0); @@ -516,7 +516,7 @@ PluginInsert::create_automatable_parameters () { assert (!_plugins.empty()); - boost::shared_ptr plugin = _plugins.front(); + std::shared_ptr plugin = _plugins.front(); set a = _plugins.front()->automatable (); const uint32_t limit_automatables = Config->get_limit_n_automatables (); @@ -530,15 +530,15 @@ PluginInsert::create_automatable_parameters () plugin->get_parameter_descriptor(i, desc); if (!plugin->parameter_is_input (i)) { - _control_outputs[i] = boost::shared_ptr (new ReadOnlyControl (plugin, desc, i)); + _control_outputs[i] = std::shared_ptr (new ReadOnlyControl (plugin, desc, i)); continue; } Evoral::Parameter param (PluginAutomation, 0, i); const bool automatable = a.find(param) != a.end(); - boost::shared_ptr list(new AutomationList(param, desc, time_domain())); - boost::shared_ptr c (new PluginControl(this, param, desc, list)); + std::shared_ptr list(new AutomationList(param, desc, time_domain())); + std::shared_ptr c (new PluginControl(this, param, desc, list)); if (!automatable || (limit_automatables > 0 && what_can_be_automated ().size() > limit_automatables)) { c->set_flag (Controllable::NotAutomatable); } @@ -555,11 +555,11 @@ PluginInsert::create_automatable_parameters () Evoral::Parameter param (PluginPropertyAutomation, 0, p->first); const ParameterDescriptor& desc = plugin->get_property_descriptor(param.id()); if (desc.datatype != Variant::NOTHING) { - boost::shared_ptr list; + std::shared_ptr list; if (Variant::type_is_numeric(desc.datatype)) { - list = boost::shared_ptr(new AutomationList(param, desc, time_domain())); + list = std::shared_ptr(new AutomationList(param, desc, time_domain())); } - boost::shared_ptr c (new PluginPropertyControl(this, param, desc, list)); + std::shared_ptr c (new PluginPropertyControl(this, param, desc, list)); if (!Variant::type_is_numeric(desc.datatype)) { c->set_flag (Controllable::NotAutomatable); } @@ -580,15 +580,15 @@ PluginInsert::create_automatable_parameters () desc.lower = 0; desc.upper = 1; - boost::shared_ptr list(new AutomationList(param, desc, time_domain())); - boost::shared_ptr c (new PluginControl(this, param, desc, list)); + std::shared_ptr list(new AutomationList(param, desc, time_domain())); + std::shared_ptr c (new PluginControl(this, param, desc, list)); add_control (c); } if (_bypass_port != UINT32_MAX) { _inverted_bypass_enable = type () == VST3; - boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); + std::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); if (0 == (ac->flags () & Controllable::NotAutomatable)) { ac->alist()->automation_state_changed.connect_same_thread (*this, boost::bind (&PluginInsert::bypassable_changed, this)); ac->Changed.connect_same_thread (*this, boost::bind (&PluginInsert::enable_changed, this)); @@ -612,7 +612,7 @@ PluginInsert::create_automatable_parameters () void PluginInsert::parameter_changed_externally (uint32_t which, float val) { - boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, which)); + std::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, which)); /* First propagation: alter the underlying value of the control, * without telling the plugin(s) that own/use it to set it. @@ -622,7 +622,7 @@ PluginInsert::parameter_changed_externally (uint32_t which, float val) return; } - boost::shared_ptr pc = boost::dynamic_pointer_cast (ac); + std::shared_ptr pc = std::dynamic_pointer_cast (ac); if (pc) { pc->catch_up_with_external_value (val); @@ -644,7 +644,7 @@ PluginInsert::parameter_changed_externally (uint32_t which, float val) (*i)->set_parameter (which, val, 0); } } - boost::shared_ptr iasp = _impulseAnalysisPlugin.lock(); + std::shared_ptr iasp = _impulseAnalysisPlugin.lock(); if (iasp) { iasp->set_parameter (which, val, 0); } @@ -764,7 +764,7 @@ PluginInsert::enable (bool yn) if (!_pending_active) { activate (); } - boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); + std::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port)); const double val = yn ^ _inverted_bypass_enable ? 1.0 : 0.0; ac->set_value (val, Controllable::NoGroup); @@ -796,7 +796,7 @@ PluginInsert::enabled () const if (_bypass_port == UINT32_MAX) { return Processor::enabled (); } else { - boost::shared_ptr ac = boost::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); + std::shared_ptr ac = std::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); return ((ac->get_value () > 0) ^ _inverted_bypass_enable) && _pending_active; } } @@ -807,7 +807,7 @@ PluginInsert::bypassable () const if (_bypass_port == UINT32_MAX) { return true; } else { - boost::shared_ptr ac = boost::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); + std::shared_ptr ac = std::const_pointer_cast (automation_control (Evoral::Parameter (PluginAutomation, 0, _bypass_port))); return !ac->automation_playback (); } @@ -923,10 +923,10 @@ PluginInsert::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t e bufs.set_count(ChanCount::max(bufs.count(), _configured_out)); if (with_auto) { - boost::shared_ptr cl = _automated_controls.reader (); + std::shared_ptr cl = _automated_controls.reader (); for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { AutomationControl& c = *(ci->get()); - boost::shared_ptr clist (c.list()); + std::shared_ptr clist (c.list()); /* we still need to check for Touch and Latch */ if (clist && (static_cast (*clist)).automation_playback ()) { /* 1. Set value at [sub]cycle start */ @@ -1454,7 +1454,7 @@ PluginInsert::can_reset_all_parameters () continue; } - boost::shared_ptr ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid)); + std::shared_ptr ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid)); if (!ac) { continue; } @@ -1488,7 +1488,7 @@ PluginInsert::reset_parameters_to_default () continue; } - boost::shared_ptr ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid)); + std::shared_ptr ac = automation_control (Evoral::Parameter(PluginAutomation, 0, cid)); if (!ac) { continue; } @@ -1503,53 +1503,53 @@ PluginInsert::reset_parameters_to_default () return all; } -boost::shared_ptr -PluginInsert::plugin_factory (boost::shared_ptr other) +std::shared_ptr +PluginInsert::plugin_factory (std::shared_ptr other) { - boost::shared_ptr lp; - boost::shared_ptr lua; - boost::shared_ptr lv2p; + std::shared_ptr lp; + std::shared_ptr lua; + std::shared_ptr lv2p; #ifdef WINDOWS_VST_SUPPORT - boost::shared_ptr vp; + std::shared_ptr vp; #endif #ifdef LXVST_SUPPORT - boost::shared_ptr lxvp; + std::shared_ptr lxvp; #endif #ifdef MACVST_SUPPORT - boost::shared_ptr mvp; + std::shared_ptr mvp; #endif #ifdef VST3_SUPPORT - boost::shared_ptr vst3; + std::shared_ptr vst3; #endif #ifdef AUDIOUNIT_SUPPORT - boost::shared_ptr ap; + std::shared_ptr ap; #endif - if ((lp = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new LadspaPlugin (*lp)); - } else if ((lua = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new LuaProc (*lua)); - } else if ((lv2p = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new LV2Plugin (*lv2p)); + if ((lp = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new LadspaPlugin (*lp)); + } else if ((lua = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new LuaProc (*lua)); + } else if ((lv2p = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new LV2Plugin (*lv2p)); #ifdef WINDOWS_VST_SUPPORT - } else if ((vp = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new WindowsVSTPlugin (*vp)); + } else if ((vp = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new WindowsVSTPlugin (*vp)); #endif #ifdef LXVST_SUPPORT - } else if ((lxvp = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new LXVSTPlugin (*lxvp)); + } else if ((lxvp = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new LXVSTPlugin (*lxvp)); #endif #ifdef MACVST_SUPPORT - } else if ((mvp = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new MacVSTPlugin (*mvp)); + } else if ((mvp = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new MacVSTPlugin (*mvp)); #endif #ifdef VST3_SUPPORT - } else if ((vst3 = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new VST3Plugin (*vst3)); + } else if ((vst3 = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new VST3Plugin (*vst3)); #endif #ifdef AUDIOUNIT_SUPPORT - } else if ((ap = boost::dynamic_pointer_cast (other)) != 0) { - return boost::shared_ptr (new AUPlugin (*ap)); + } else if ((ap = std::dynamic_pointer_cast (other)) != 0) { + return std::shared_ptr (new AUPlugin (*ap)); #endif } @@ -1557,7 +1557,7 @@ PluginInsert::plugin_factory (boost::shared_ptr other) X_("unknown plugin type in PluginInsert::plugin_factory")) << endmsg; abort(); /*NOTREACHED*/ - return boost::shared_ptr ((Plugin*) 0); + return std::shared_ptr ((Plugin*) 0); } void @@ -2645,7 +2645,7 @@ PluginInsert::state () const node.add_child_nocopy (_plugins[0]->get_state()); for (Controls::const_iterator c = controls().begin(); c != controls().end(); ++c) { - boost::shared_ptr ac = boost::dynamic_pointer_cast ((*c).second); + std::shared_ptr ac = std::dynamic_pointer_cast ((*c).second); if (ac) { node.add_child_nocopy (ac->get_state()); } @@ -2672,7 +2672,7 @@ PluginInsert::update_control_values (const XMLNode& node, int version) std::string str; if ((*iter)->get_property (X_("symbol"), str)) { - boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (_plugins[0]); + std::shared_ptr lv2plugin = std::dynamic_pointer_cast (_plugins[0]); if (lv2plugin) { p = lv2plugin->port_index(str.c_str()); } @@ -2687,11 +2687,11 @@ PluginInsert::update_control_values (const XMLNode& node, int version) } /* lookup controllable */ - boost::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, p), false); + std::shared_ptr c = control (Evoral::Parameter (PluginAutomation, 0, p), false); if (!c) { continue; } - boost::shared_ptr ac = boost::dynamic_pointer_cast (c); + std::shared_ptr ac = std::dynamic_pointer_cast (c); if (ac) { ac->set_value (val, Controllable::NoGroup); } @@ -2716,7 +2716,7 @@ PluginInsert::set_state(const XMLNode& node, int version) node.get_property ("count", count); if (_plugins.empty()) { - boost::shared_ptr plugin = find_and_load_plugin (_session, node, type, unique_id, any_vst); + std::shared_ptr plugin = find_and_load_plugin (_session, node, type, unique_id, any_vst); if (!plugin) { return -1; } @@ -2792,7 +2792,7 @@ PluginInsert::set_state(const XMLNode& node, int version) /* when copying plugin state, notify UI */ for (Controls::const_iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr c = boost::dynamic_pointer_cast (li->second); + std::shared_ptr c = std::dynamic_pointer_cast (li->second); if (c) { c->Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */ } @@ -2957,7 +2957,7 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) continue; } - boost::shared_ptr c = boost::dynamic_pointer_cast( + std::shared_ptr c = std::dynamic_pointer_cast( control(Evoral::Parameter(PluginAutomation, 0, port_id), true)); if (c && c->alist()) { @@ -2975,12 +2975,12 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version) } } -boost::shared_ptr +std::shared_ptr PluginInsert::control_output (uint32_t num) const { CtrlOutMap::const_iterator i = _control_outputs.find (num); if (i == _control_outputs.end ()) { - return boost::shared_ptr (); + return std::shared_ptr (); } else { return (*i).second; } @@ -2992,7 +2992,7 @@ PluginInsert::describe_parameter (Evoral::Parameter param) if (param.type() == PluginAutomation) { return _plugins[0]->describe_parameter (param); } else if (param.type() == PluginPropertyAutomation) { - boost::shared_ptr c(automation_control(param)); + std::shared_ptr c(automation_control(param)); if (c && !c->desc().label.empty()) { return c->desc().label; } @@ -3018,7 +3018,7 @@ PluginInsert::type () const PluginInsert::PluginControl::PluginControl (PluginInsert* p, const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr list) + std::shared_ptr list) : AutomationControl (p->session(), param, desc, list, p->describe_parameter(param)) , _plugin (p) { @@ -3040,7 +3040,7 @@ PluginInsert::PluginControl::actually_set_value (double user_val, PBD::Controlla (*i)->set_parameter (_list->parameter().id(), user_val, 0); } - boost::shared_ptr iasp = _plugin->_impulseAnalysisPlugin.lock(); + std::shared_ptr iasp = _plugin->_impulseAnalysisPlugin.lock(); if (iasp) { iasp->set_parameter (_list->parameter().id(), user_val, 0); } @@ -3060,7 +3060,7 @@ PluginInsert::PluginControl::get_state () const XMLNode& node (AutomationControl::get_state()); node.set_property (X_("parameter"), parameter().id()); - boost::shared_ptr lv2plugin = boost::dynamic_pointer_cast (_plugin->_plugins[0]); + std::shared_ptr lv2plugin = std::dynamic_pointer_cast (_plugin->_plugins[0]); if (lv2plugin) { node.set_property (X_("symbol"), lv2plugin->port_symbol (parameter().id())); } @@ -3072,7 +3072,7 @@ PluginInsert::PluginControl::get_state () const double PluginInsert::PluginControl::get_value () const { - boost::shared_ptr plugin = _plugin->plugin (0); + std::shared_ptr plugin = _plugin->plugin (0); if (!plugin) { return 0.0; @@ -3084,7 +3084,7 @@ PluginInsert::PluginControl::get_value () const std::string PluginInsert::PluginControl::get_user_string () const { - boost::shared_ptr plugin = _plugin->plugin (0); + std::shared_ptr plugin = _plugin->plugin (0); if (plugin) { std::string pp; if (plugin->print_parameter (parameter().id(), pp) && pp.size () > 0) { @@ -3097,7 +3097,7 @@ PluginInsert::PluginControl::get_user_string () const PluginInsert::PluginPropertyControl::PluginPropertyControl (PluginInsert* p, const Evoral::Parameter& param, const ParameterDescriptor& desc, - boost::shared_ptr list) + std::shared_ptr list) : AutomationControl (p->session(), param, desc, list) , _plugin (p) { @@ -3140,10 +3140,10 @@ PluginInsert::PluginPropertyControl::get_value () const return _value.to_double(); } -boost::shared_ptr +std::shared_ptr PluginInsert::get_impulse_analysis_plugin() { - boost::shared_ptr ret; + std::shared_ptr ret; if (_impulseAnalysisPlugin.expired()) { // LV2 in particular uses various _session params // during init() -- most notably block_size.. @@ -3193,7 +3193,7 @@ PluginInsert::collect_signal_for_analysis (samplecnt_t nframes) /** Add a plugin to our list */ void -PluginInsert::add_plugin (boost::shared_ptr plugin) +PluginInsert::add_plugin (std::shared_ptr plugin) { plugin->set_insert_id (this->id()); plugin->set_owner (_owner); @@ -3224,14 +3224,14 @@ PluginInsert::add_plugin (boost::shared_ptr plugin) if (_plugins.size() > 1) { _plugins[0]->add_slave (plugin, true); - plugin->DropReferences.connect_same_thread (*this, boost::bind (&PluginInsert::plugin_removed, this, boost::weak_ptr (plugin))); + plugin->DropReferences.connect_same_thread (*this, boost::bind (&PluginInsert::plugin_removed, this, std::weak_ptr (plugin))); } } void -PluginInsert::plugin_removed (boost::weak_ptr wp) +PluginInsert::plugin_removed (std::weak_ptr wp) { - boost::shared_ptr plugin = wp.lock(); + std::shared_ptr plugin = wp.lock(); if (_plugins.size () == 0 || !plugin) { return; } @@ -3280,7 +3280,7 @@ PluginInsert::load_preset (ARDOUR::Plugin::PresetRecord pr) } } - boost::shared_ptr iasp = _impulseAnalysisPlugin.lock(); + std::shared_ptr iasp = _impulseAnalysisPlugin.lock(); if (iasp) { iasp->load_preset (pr); } @@ -3328,7 +3328,7 @@ PluginInsert::latency_changed () void PluginInsert::start_touch (uint32_t param_id) { - boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); + std::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); if (ac) { // ToDo subtract _plugin_signal_latency from audible_sample() when rolling, assert > 0 ac->start_touch (timepos_t (session().audible_sample())); @@ -3338,7 +3338,7 @@ PluginInsert::start_touch (uint32_t param_id) void PluginInsert::end_touch (uint32_t param_id) { - boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); + std::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); if (ac) { // ToDo subtract _plugin_signal_latency from audible_sample() when rolling, assert > 0 ac->stop_touch (timepos_t (session().audible_sample())); diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 3d1befb552..464ce601a9 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -1238,7 +1238,7 @@ PluginManager::auv2_plugin (CAComponentDescription const& desc, AUv2Info const& { PSLEPtr psle (scan_log_entry (AudioUnit, auv2_stringify_descriptor (desc))); - AUPluginInfoPtr info (new AUPluginInfo (boost::shared_ptr (new CAComponentDescription (desc)))); + AUPluginInfoPtr info (new AUPluginInfo (std::shared_ptr (new CAComponentDescription (desc)))); psle->msg (PluginScanLogEntry::OK); info->unique_id = nfo.id; @@ -3319,7 +3319,7 @@ PluginManager::rescan_faulty () /* ****************************************************************************/ void -PluginManager::scan_log (std::vector >& l) const +PluginManager::scan_log (std::vector >& l) const { for (PluginScanLog::const_iterator i = _plugin_scan_log.begin(); i != _plugin_scan_log.end(); ++i) { l.push_back (*i); diff --git a/libs/ardour/polarity_processor.cc b/libs/ardour/polarity_processor.cc index e807081489..cac6d9539f 100644 --- a/libs/ardour/polarity_processor.cc +++ b/libs/ardour/polarity_processor.cc @@ -27,7 +27,7 @@ using namespace ARDOUR; using namespace PBD; -PolarityProcessor::PolarityProcessor (Session& s, boost::shared_ptr control) +PolarityProcessor::PolarityProcessor (Session& s, std::shared_ptr control) : Processor(s, "Polarity", Temporal::AudioTime) , _control (control) { diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index 492a3ea3a1..2885e94188 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -160,12 +160,12 @@ Port::drop () } void -Port::port_connected_or_disconnected (boost::weak_ptr w0, boost::weak_ptr w1, bool con) +Port::port_connected_or_disconnected (std::weak_ptr w0, std::weak_ptr w1, bool con) { - boost::shared_ptr p0 = w0.lock (); - boost::shared_ptr p1 = w1.lock (); + std::shared_ptr p0 = w0.lock (); + std::shared_ptr p1 = w1.lock (); /* a cheaper, less hacky way to do boost::shared_from_this() ... */ - boost::shared_ptr pself = AudioEngine::instance()->get_port_by_name (name()); + std::shared_ptr pself = AudioEngine::instance()->get_port_by_name (name()); if (p0 == pself) { ConnectedOrDisconnected (p0, p1, con); // emit signal @@ -198,9 +198,9 @@ Port::disconnect_all () /* a cheaper, less hacky way to do boost::shared_from_this() ... */ - boost::shared_ptr pself = port_manager->get_port_by_name (name()); + std::shared_ptr pself = port_manager->get_port_by_name (name()); for (vector::const_iterator c = connections.begin(); c != connections.end() && pself; ++c) { - boost::shared_ptr pother = AudioEngine::instance()->get_port_by_name (*c); + std::shared_ptr pother = AudioEngine::instance()->get_port_by_name (*c); if (pother) { pother->_connections.erase (_name); ConnectedOrDisconnected (pself, pother, false); // emit signal @@ -276,7 +276,7 @@ Port::connect (std::string const & other) */ _connections.insert (other); - boost::shared_ptr pother = AudioEngine::instance()->get_port_by_name (other); + std::shared_ptr pother = AudioEngine::instance()->get_port_by_name (other); if (pother) { pother->_connections.insert (_name); } @@ -304,8 +304,8 @@ Port::disconnect (std::string const & other) } /* a cheaper, less hacky way to do boost::shared_from_this() ... */ - boost::shared_ptr pself = AudioEngine::instance()->get_port_by_name (name()); - boost::shared_ptr pother = AudioEngine::instance()->get_port_by_name (other); + std::shared_ptr pself = AudioEngine::instance()->get_port_by_name (name()); + std::shared_ptr pother = AudioEngine::instance()->get_port_by_name (other); if (r == 0 && pother) { pother->_connections.erase (_name); @@ -564,7 +564,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const * latency compensation. */ - boost::shared_ptr remote_port = AudioEngine::instance()->get_port_by_name (*c); + std::shared_ptr remote_port = AudioEngine::instance()->get_port_by_name (*c); if (remote_port) { lr = remote_port->private_latency_range (playback); DEBUG_TRACE (DEBUG::LatencyIO, string_compose ( diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc index 183086dfce..29f376eded 100644 --- a/libs/ardour/port_engine_shared.cc +++ b/libs/ardour/port_engine_shared.cc @@ -296,7 +296,7 @@ PortEngineSharedImpl::get_ports ( } } - boost::shared_ptr p = _ports.reader (); + std::shared_ptr p = _ports.reader (); for (PortIndex::const_iterator i = p->begin (); i != p->end (); ++i) { BackendPortPtr port = *i; @@ -318,17 +318,17 @@ PortEngineSharedImpl::get_ports ( bool PortEngineSharedImpl::port_is_physical (PortEngine::PortHandle port) const { - if (!valid_port (boost::dynamic_pointer_cast(port))) { + if (!valid_port (std::dynamic_pointer_cast(port))) { PBD::warning << _("BackendPort::port_is_physical (): invalid port.") << endmsg; return false; } - return boost::dynamic_pointer_cast(port)->is_physical (); + return std::dynamic_pointer_cast(port)->is_physical (); } void PortEngineSharedImpl::get_physical_outputs (DataType type, std::vector& port_names) { - boost::shared_ptr p = _ports.reader(); + std::shared_ptr p = _ports.reader(); for (PortIndex::iterator i = p->begin (); i != p->end (); ++i) { BackendPortPtr port = *i; @@ -341,7 +341,7 @@ PortEngineSharedImpl::get_physical_outputs (DataType type, std::vector& port_names) { - boost::shared_ptr p = _ports.reader(); + std::shared_ptr p = _ports.reader(); for (PortIndex::iterator i = p->begin (); i != p->end (); ++i) { BackendPortPtr port = *i; @@ -357,7 +357,7 @@ PortEngineSharedImpl::n_physical_outputs () const int n_midi = 0; int n_audio = 0; - boost::shared_ptr p = _ports.reader(); + std::shared_ptr p = _ports.reader(); for (PortIndex::const_iterator i = p->begin (); i != p->end (); ++i) { BackendPortPtr port = *i; @@ -381,7 +381,7 @@ PortEngineSharedImpl::n_physical_inputs () const int n_midi = 0; int n_audio = 0; - boost::shared_ptr p = _ports.reader(); + std::shared_ptr p = _ports.reader(); for (PortIndex::const_iterator i = p->begin (); i != p->end (); ++i) { BackendPortPtr port = *i; @@ -420,9 +420,9 @@ PortEngineSharedImpl::add_port (const std::string& name, ARDOUR::DataType type, RCUWriter map_writer (_portmap); RCUWriter registry_writer (_portregistry); - boost::shared_ptr ps = index_writer.get_copy (); - boost::shared_ptr pm = map_writer.get_copy (); - boost::shared_ptr pr = registry_writer.get_copy (); + std::shared_ptr ps = index_writer.get_copy (); + std::shared_ptr pm = map_writer.get_copy (); + std::shared_ptr pr = registry_writer.get_copy (); ps->insert (port); pr->insert (port); @@ -435,18 +435,18 @@ PortEngineSharedImpl::add_port (const std::string& name, ARDOUR::DataType type, void PortEngineSharedImpl::unregister_port (PortEngine::PortHandle port_handle) { - BackendPortPtr port = boost::dynamic_pointer_cast(port_handle); + BackendPortPtr port = std::dynamic_pointer_cast(port_handle); { RCUWriter index_writer (_ports); RCUWriter map_writer (_portmap); RCUWriter registry_writer (_portregistry); - boost::shared_ptr ps = index_writer.get_copy (); - boost::shared_ptr pm = map_writer.get_copy (); - boost::shared_ptr pr = registry_writer.get_copy (); + std::shared_ptr ps = index_writer.get_copy (); + std::shared_ptr pm = map_writer.get_copy (); + std::shared_ptr pr = registry_writer.get_copy (); - PortIndex::iterator i = std::find (ps->begin(), ps->end(), boost::dynamic_pointer_cast (port_handle)); + PortIndex::iterator i = std::find (ps->begin(), ps->end(), std::dynamic_pointer_cast (port_handle)); if (i == ps->end ()) { PBD::error << string_compose (_("%1::unregister_port: Failed to find port"), _instance_name) << endmsg; @@ -479,9 +479,9 @@ PortEngineSharedImpl::unregister_ports (bool system_only) RCUWriter map_writer (_portmap); RCUWriter registry_writer (_portregistry); - boost::shared_ptr ps = index_writer.get_copy (); - boost::shared_ptr pm = map_writer.get_copy (); - boost::shared_ptr pr = registry_writer.get_copy (); + std::shared_ptr ps = index_writer.get_copy (); + std::shared_ptr pm = map_writer.get_copy (); + std::shared_ptr pr = registry_writer.get_copy (); for (PortIndex::iterator i = ps->begin (); i != ps->end ();) { PortIndex::iterator cur = i++; @@ -508,9 +508,9 @@ PortEngineSharedImpl::clear_ports () RCUWriter map_writer (_portmap); RCUWriter registry_writer (_portregistry); - boost::shared_ptr ps = index_writer.get_copy (); - boost::shared_ptr pm = map_writer.get_copy (); - boost::shared_ptr pr = registry_writer.get_copy (); + std::shared_ptr ps = index_writer.get_copy (); + std::shared_ptr pm = map_writer.get_copy (); + std::shared_ptr pr = registry_writer.get_copy (); if (ps->size () || pm->size () || pr->size ()) { PBD::warning << _("PortEngineSharedImpl: recovering from unclean shutdown, port registry is not empty.") << endmsg; @@ -544,7 +544,7 @@ int PortEngineSharedImpl::set_port_name (PortEngine::PortHandle port_handle, const std::string& name) { std::string newname (_instance_name + ":" + name); - BackendPortPtr port = boost::dynamic_pointer_cast(port_handle); + BackendPortPtr port = std::dynamic_pointer_cast(port_handle); if (!valid_port (port)) { PBD::error << string_compose (_("%1::set_port_name: Invalid Port"), _instance_name) << endmsg; @@ -565,8 +565,8 @@ PortEngineSharedImpl::set_port_name (PortEngine::PortHandle port_handle, const s RCUWriter index_writer (_ports); RCUWriter map_writer (_portmap); - boost::shared_ptr ps = index_writer.get_copy (); - boost::shared_ptr pm = map_writer.get_copy (); + std::shared_ptr ps = index_writer.get_copy (); + std::shared_ptr pm = map_writer.get_copy (); ps->erase (port); int ret = port->set_name (newname); @@ -583,7 +583,7 @@ PortEngineSharedImpl::set_port_name (PortEngine::PortHandle port_handle, const s std::string PortEngineSharedImpl::get_port_name (PortEngine::PortHandle port_handle) const { - BackendPortPtr port = boost::dynamic_pointer_cast(port_handle); + BackendPortPtr port = std::dynamic_pointer_cast(port_handle); if (!valid_port (port)) { PBD::warning << string_compose (_("%1::get_port_name: invalid port"), _instance_name) << endmsg; @@ -596,27 +596,27 @@ PortEngineSharedImpl::get_port_name (PortEngine::PortHandle port_handle) const PortFlags PortEngineSharedImpl::get_port_flags (PortEngine::PortHandle port) const { - if (!valid_port (boost::dynamic_pointer_cast(port))) { + if (!valid_port (std::dynamic_pointer_cast(port))) { PBD::warning << string_compose (_("%1::get_port_flags: invalid port"), _instance_name) << endmsg; return PortFlags (0); } - return boost::static_pointer_cast(port)->flags (); + return std::static_pointer_cast(port)->flags (); } int PortEngineSharedImpl::get_port_property (PortEngine::PortHandle port, const std::string& key, std::string& value, std::string& type) const { - if (!valid_port (boost::dynamic_pointer_cast(port))) { + if (!valid_port (std::dynamic_pointer_cast(port))) { PBD::warning << string_compose (_("%1::get_port_property: invalid port"), _instance_name) << endmsg; return -1; } if (key == "http://jackaudio.org/metadata/pretty-name") { type = ""; - value = boost::static_pointer_cast(port)->pretty_name (); + value = std::static_pointer_cast(port)->pretty_name (); if (!value.empty()) { return 0; } - value = boost::static_pointer_cast(port)->hw_port_name (); + value = std::static_pointer_cast(port)->hw_port_name (); if (!value.empty()) { return 0; } @@ -627,12 +627,12 @@ PortEngineSharedImpl::get_port_property (PortEngine::PortHandle port, const std: int PortEngineSharedImpl::set_port_property (PortEngine::PortHandle port, const std::string& key, const std::string& value, const std::string& type) { - if (!valid_port (boost::dynamic_pointer_cast(port))) { + if (!valid_port (std::dynamic_pointer_cast(port))) { PBD::warning << string_compose (_("%1::set_port_property: invalid port"), _instance_name) << endmsg; return -1; } if (key == "http://jackaudio.org/metadata/pretty-name" && type.empty ()) { - boost::static_pointer_cast(port)->set_pretty_name (value); + std::static_pointer_cast(port)->set_pretty_name (value); return 0; } return -1; @@ -647,7 +647,7 @@ PortEngineSharedImpl::get_port_by_name (const std::string& name) const DataType PortEngineSharedImpl::port_data_type (PortEngine::PortHandle port) const { - BackendPortPtr p = boost::dynamic_pointer_cast (port); + BackendPortPtr p = std::dynamic_pointer_cast (port); if (!valid_port (p)) { return DataType::NIL; @@ -703,7 +703,7 @@ PortEngineSharedImpl::disconnect (const std::string& src, const std::string& dst int PortEngineSharedImpl::connect (PortEngine::PortHandle src, const std::string& dst) { - BackendPortPtr src_port = boost::dynamic_pointer_cast (src); + BackendPortPtr src_port = std::dynamic_pointer_cast (src); if (!valid_port (src_port)) { PBD::error << string_compose (_("%1::connect: Invalid Source Port Handle"), _instance_name) << endmsg; @@ -725,7 +725,7 @@ PortEngineSharedImpl::connect (PortEngine::PortHandle src, const std::string& ds int PortEngineSharedImpl::disconnect (PortEngine::PortHandle src, const std::string& dst) { - BackendPortPtr src_port = boost::dynamic_pointer_cast(src); + BackendPortPtr src_port = std::dynamic_pointer_cast(src); BackendPortPtr dst_port = find_port (dst); if (!valid_port (src_port) || !dst_port) { @@ -738,7 +738,7 @@ PortEngineSharedImpl::disconnect (PortEngine::PortHandle src, const std::string& int PortEngineSharedImpl::disconnect_all (PortEngine::PortHandle port_handle) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { PBD::warning << string_compose (_("%1::disconnect_all: invalid port"), _instance_name) << endmsg; @@ -753,7 +753,7 @@ PortEngineSharedImpl::disconnect_all (PortEngine::PortHandle port_handle) bool PortEngineSharedImpl::connected (PortEngine::PortHandle port_handle, bool /* process_callback_safe*/) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { PBD::error << string_compose (_("%1::disconnect_all: Invalid Port"), _instance_name) << endmsg; @@ -765,7 +765,7 @@ PortEngineSharedImpl::connected (PortEngine::PortHandle port_handle, bool /* pro bool PortEngineSharedImpl::connected_to (PortEngine::PortHandle src, const std::string& dst, bool process_callback_safe) { - BackendPortPtr src_port = boost::dynamic_pointer_cast (src); + BackendPortPtr src_port = std::dynamic_pointer_cast (src); BackendPortPtr dst_port = find_port (dst); #ifndef NDEBUG if (!process_callback_safe && (!valid_port (src_port) || !dst_port)) { @@ -773,13 +773,13 @@ PortEngineSharedImpl::connected_to (PortEngine::PortHandle src, const std::strin return false; } #endif - return boost::static_pointer_cast(src)->is_connected (dst_port); + return std::static_pointer_cast(src)->is_connected (dst_port); } bool PortEngineSharedImpl::physically_connected (PortEngine::PortHandle port_handle, bool /*process_callback_safe*/) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { PBD::error << string_compose (_("%1::physically_connected: Invalid Port"), _instance_name) << endmsg; @@ -791,7 +791,7 @@ PortEngineSharedImpl::physically_connected (PortEngine::PortHandle port_handle, int PortEngineSharedImpl::get_connections (PortEngine::PortHandle port_handle, std::vector& names, bool /*process_callback_safe*/) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { PBD::error << string_compose (_("%1::get_connections: Invalid Port"), _instance_name) << endmsg; @@ -831,7 +831,7 @@ PortEngineSharedImpl::update_system_port_latencies () void PortEngineSharedImpl::list_ports () const { - boost::shared_ptr p = _ports.reader (); + std::shared_ptr p = _ports.reader (); for (PortIndex::const_iterator i = p->begin (); i != p->end (); ++i) { std::cout << (*i)->name () << "\n"; } diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index 2e597b692e..4590b486c1 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -46,7 +46,7 @@ PortInsert::name_and_id_new_insert (Session& s, uint32_t& bitslot) return string_compose (_("insert %1"), bitslot); } -PortInsert::PortInsert (Session& s, boost::shared_ptr pannable, boost::shared_ptr mm) +PortInsert::PortInsert (Session& s, std::shared_ptr pannable, std::shared_ptr mm) : IOProcessor (s, true, true, name_and_id_new_insert (s, _bitslot), "", DataType::AUDIO, true) , _out (new Delivery (s, _output, pannable, mm, _name, Delivery::Insert)) , _metering (false) @@ -57,13 +57,13 @@ PortInsert::PortInsert (Session& s, boost::shared_ptr pannable, boost: , _measured_latency (0) { /* Send */ - _out->set_gain_control (boost::shared_ptr (new GainControl (_session, Evoral::Parameter(BusSendLevel), boost::shared_ptr (new AutomationList (Evoral::Parameter (BusSendLevel), time_domain()))))); + _out->set_gain_control (std::shared_ptr (new GainControl (_session, Evoral::Parameter(BusSendLevel), std::shared_ptr (new AutomationList (Evoral::Parameter (BusSendLevel), time_domain()))))); - _out->set_polarity_control (boost::shared_ptr (new AutomationControl (_session, PhaseAutomation, ParameterDescriptor (PhaseAutomation), boost::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), time_domain())), "polarity-invert"))); + _out->set_polarity_control (std::shared_ptr (new AutomationControl (_session, PhaseAutomation, ParameterDescriptor (PhaseAutomation), std::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), time_domain())), "polarity-invert"))); _send_meter.reset (new PeakMeter (_session, name())); /* Return */ - _gain_control = boost::shared_ptr (new GainControl (_session, Evoral::Parameter(InsertReturnLevel), boost::shared_ptr (new AutomationList (Evoral::Parameter (InsertReturnLevel), time_domain())))); + _gain_control = std::shared_ptr (new GainControl (_session, Evoral::Parameter(InsertReturnLevel), std::shared_ptr (new AutomationList (Evoral::Parameter (InsertReturnLevel), time_domain())))); _amp.reset (new Amp (_session, _("Return"), _gain_control, true)); _return_meter.reset (new PeakMeter (_session, name())); diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index dc48f0d781..5f53b25436 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -179,7 +179,7 @@ PortManager::MIDIInputPort::process_event (uint8_t const* buf, size_t size) monitor->write (buf, size); } -PortManager::PortID::PortID (boost::shared_ptr b, DataType dt, bool in, std::string const& pn) +PortManager::PortID::PortID (std::shared_ptr b, DataType dt, bool in, std::string const& pn) : backend (b->name ()) , port_name (pn) , data_type (dt) @@ -287,7 +287,7 @@ PortManager::remove_all_ports () { RCUWriter writer (_ports); - boost::shared_ptr ps = writer.get_copy (); + std::shared_ptr ps = writer.get_copy (); ps->clear (); } @@ -482,19 +482,19 @@ PortManager::n_physical_inputs () const /** @param name Full or short name of port * @return Corresponding Port or 0. */ -boost::shared_ptr +std::shared_ptr PortManager::get_port_by_name (const string& portname) { if (!_backend) { - return boost::shared_ptr (); + return std::shared_ptr (); } if (!port_is_mine (portname)) { /* not an ardour port */ - return boost::shared_ptr (); + return std::shared_ptr (); } - boost::shared_ptr pr = _ports.reader (); + std::shared_ptr pr = _ports.reader (); std::string rel = make_port_name_relative (portname); Ports::iterator x = pr->find (rel); @@ -511,18 +511,18 @@ PortManager::get_port_by_name (const string& portname) return x->second; } - return boost::shared_ptr (); + return std::shared_ptr (); } void PortManager::port_renamed (const std::string& old_relative_name, const std::string& new_relative_name) { RCUWriter writer (_ports); - boost::shared_ptr p = writer.get_copy (); + std::shared_ptr p = writer.get_copy (); Ports::iterator x = p->find (old_relative_name); if (x != p->end ()) { - boost::shared_ptr port = x->second; + std::shared_ptr port = x->second; p->erase (x); p->insert (make_pair (new_relative_name, port)); } @@ -531,7 +531,7 @@ PortManager::port_renamed (const std::string& old_relative_name, const std::stri int PortManager::get_ports (DataType type, PortList& pl) { - boost::shared_ptr plist = _ports.reader (); + std::shared_ptr plist = _ports.reader (); for (Ports::iterator p = plist->begin (); p != plist->end (); ++p) { if (p->second->type () == type) { pl.push_back (p->second); @@ -595,10 +595,10 @@ struct PortDeleter { } }; -boost::shared_ptr +std::shared_ptr PortManager::register_port (DataType dtype, const string& portname, bool input, bool async, PortFlags flags) { - boost::shared_ptr newport; + std::shared_ptr newport; /* limit the possible flags that can be set */ @@ -630,7 +630,7 @@ PortManager::register_port (DataType dtype, const string& portname, bool input, newport->set_buffer_size (AudioEngine::instance ()->samples_per_cycle ()); RCUWriter writer (_ports); - boost::shared_ptr ps = writer.get_copy (); + std::shared_ptr ps = writer.get_copy (); ps->insert (make_pair (make_port_name_relative (portname), newport)); /* writer goes out of scope, forces update */ @@ -648,20 +648,20 @@ PortManager::register_port (DataType dtype, const string& portname, bool input, return newport; } -boost::shared_ptr +std::shared_ptr PortManager::register_input_port (DataType type, const string& portname, bool async, PortFlags extra_flags) { return register_port (type, portname, true, async, extra_flags); } -boost::shared_ptr +std::shared_ptr PortManager::register_output_port (DataType type, const string& portname, bool async, PortFlags extra_flags) { return register_port (type, portname, false, async, extra_flags); } int -PortManager::unregister_port (boost::shared_ptr port) +PortManager::unregister_port (std::shared_ptr port) { /* This is a little subtle. We do not call the backend's port * unregistration code from here. That is left for the Port @@ -673,7 +673,7 @@ PortManager::unregister_port (boost::shared_ptr port) { RCUWriter writer (_ports); - boost::shared_ptr ps = writer.get_copy (); + std::shared_ptr ps = writer.get_copy (); Ports::iterator x = ps->find (make_port_name_relative (port->name ())); if (x != ps->end ()) { @@ -747,8 +747,8 @@ PortManager::connect (const string& source, const string& destination) string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); - boost::shared_ptr src = get_port_by_name (s); - boost::shared_ptr dst = get_port_by_name (d); + std::shared_ptr src = get_port_by_name (s); + std::shared_ptr dst = get_port_by_name (d); if (src) { ret = src->connect (d); @@ -783,8 +783,8 @@ PortManager::disconnect (const string& source, const string& destination) string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); - boost::shared_ptr src = get_port_by_name (s); - boost::shared_ptr dst = get_port_by_name (d); + std::shared_ptr src = get_port_by_name (s); + std::shared_ptr dst = get_port_by_name (d); if (src) { ret = src->disconnect (d); @@ -803,7 +803,7 @@ PortManager::disconnect (const string& source, const string& destination) } int -PortManager::disconnect (boost::shared_ptr port) +PortManager::disconnect (std::shared_ptr port) { return port->disconnect_all (); } @@ -823,7 +823,7 @@ PortManager::reestablish_ports () { Ports::iterator i; _midi_info_dirty = true; - boost::shared_ptr p = _ports.reader (); + std::shared_ptr p = _ports.reader (); DEBUG_TRACE (DEBUG::Ports, string_compose ("reestablish %1 ports\n", p->size ())); for (i = p->begin (); i != p->end (); ++i) { @@ -891,7 +891,7 @@ PortManager::set_pretty_names (std::vector const& port_names, DataT int PortManager::reconnect_ports () { - boost::shared_ptr p = _ports.reader (); + std::shared_ptr p = _ports.reader (); /* re-establish connections */ @@ -899,7 +899,7 @@ PortManager::reconnect_ports () for (Ports::iterator i = p->begin (); i != p->end (); ++i) { if (i->second->reconnect ()) { - PortConnectedOrDisconnected (i->second, i->first, boost::weak_ptr (), "", false); + PortConnectedOrDisconnected (i->second, i->first, std::weak_ptr (), "", false); } } @@ -926,10 +926,10 @@ PortManager::connect_callback (const string& a, const string& b, bool conn) { DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose (X_("connect callback %1 + %2 connected ? %3\n"), a, b, conn)); - boost::shared_ptr port_a; - boost::shared_ptr port_b; + std::shared_ptr port_a; + std::shared_ptr port_b; Ports::iterator x; - boost::shared_ptr pr = _ports.reader (); + std::shared_ptr pr = _ports.reader (); x = pr->find (make_port_name_relative (a)); if (x != pr->end ()) { @@ -1021,7 +1021,7 @@ PortManager::update_input_ports (bool clear) new_midi = midi_ports; _monitor_port.clear_ports (true); } else { - boost::shared_ptr aip = _audio_input_ports.reader (); + std::shared_ptr aip = _audio_input_ports.reader (); /* find new audio ports */ for (std::vector::iterator p = audio_ports.begin (); p != audio_ports.end (); ++p) { if (port_is_mine (*p) || !_backend->get_port_by_name (*p)) { @@ -1039,7 +1039,7 @@ PortManager::update_input_ports (bool clear) } } - boost::shared_ptr mip = _midi_input_ports.reader (); + std::shared_ptr mip = _midi_input_ports.reader (); /* find new MIDI ports */ for (std::vector::iterator p = midi_ports.begin (); p != midi_ports.end (); ++p) { if (port_is_mine (*p) || !_backend->get_port_by_name (*p)) { @@ -1065,7 +1065,7 @@ PortManager::update_input_ports (bool clear) if (!new_audio.empty () || !old_audio.empty () || clear) { RCUWriter apwr (_audio_input_ports); - boost::shared_ptr apw = apwr.get_copy (); + std::shared_ptr apw = apwr.get_copy (); if (clear) { apw->clear (); } else { @@ -1086,7 +1086,7 @@ PortManager::update_input_ports (bool clear) if (!new_midi.empty () || !old_midi.empty () || clear) { RCUWriter mpwr (_midi_input_ports); - boost::shared_ptr mpw = mpwr.get_copy (); + std::shared_ptr mpw = mpwr.get_copy (); if (clear) { mpw->clear (); } else { @@ -1245,7 +1245,7 @@ PortManager::cycle_start (pframes_t nframes, Session* s) * A single external source-port may be connected to many ardour * input-ports. Currently re-sampling is per input. */ - boost::shared_ptr tl; + std::shared_ptr tl; if (s) { tl = s->rt_tasklist (); } @@ -1271,7 +1271,7 @@ void PortManager::cycle_end (pframes_t nframes, Session* s) { // see optimzation note in ::cycle_start() - boost::shared_ptr tl; + std::shared_ptr tl; if (s) { tl = s->rt_tasklist (); } @@ -1314,7 +1314,7 @@ PortManager::silence (pframes_t nframes, Session* s) if (s && i->second == s->ltc_output_port ()) { continue; } - if (boost::dynamic_pointer_cast (i->second)) { + if (std::dynamic_pointer_cast (i->second)) { continue; } if (i->second->sends_output ()) { @@ -1390,7 +1390,7 @@ void PortManager::cycle_end_fade_out (gain_t base_gain, gain_t gain_step, pframes_t nframes, Session* s) { // see optimzation note in ::cycle_start() - boost::shared_ptr tl; + std::shared_ptr tl; if (s) { tl = s->rt_tasklist (); } @@ -1413,7 +1413,7 @@ PortManager::cycle_end_fade_out (gain_t base_gain, gain_t gain_step, pframes_t n p->second->flush_buffers (nframes); if (p->second->sends_output ()) { - boost::shared_ptr ap = boost::dynamic_pointer_cast (p->second); + std::shared_ptr ap = std::dynamic_pointer_cast (p->second); if (ap) { Sample* s = ap->engine_get_whole_audio_buffer (); gain_t g = base_gain; @@ -1867,7 +1867,7 @@ PortManager::fill_midi_port_info_locked () void PortManager::set_port_buffer_sizes (pframes_t n) { - boost::shared_ptr all = _ports.reader (); + std::shared_ptr all = _ports.reader (); for (Ports::iterator p = all->begin (); p != all->end (); ++p) { p->second->set_buffer_size (n); @@ -1879,14 +1879,14 @@ bool PortManager::check_for_ambiguous_latency (bool log) const { bool rv = false; - boost::shared_ptr plist = _ports.reader (); + std::shared_ptr plist = _ports.reader (); for (Ports::iterator pi = plist->begin (); pi != plist->end (); ++pi) { - boost::shared_ptr const& p (pi->second); + std::shared_ptr const& p (pi->second); /* check one to many connections */ if (!p->sends_output () || (p->flags () & IsTerminal) || !p->connected ()) { continue; } - if (boost::dynamic_pointer_cast (p)) { + if (std::dynamic_pointer_cast (p)) { continue; } assert (port_is_mine (p->name ())); @@ -1916,14 +1916,14 @@ PortManager::reset_input_meters () PortManager::AudioInputPorts PortManager::audio_input_ports () const { - boost::shared_ptr p = _audio_input_ports.reader (); + std::shared_ptr p = _audio_input_ports.reader (); return *p; } PortManager::MIDIInputPorts PortManager::midi_input_ports () const { - boost::shared_ptr p = _midi_input_ports.reader (); + std::shared_ptr p = _midi_input_ports.reader (); return *p; } @@ -1939,7 +1939,7 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate) _monitor_port.monitor (port_engine (), n_samples); /* calculate peak of all physical inputs (readable ports) */ - boost::shared_ptr aip = _audio_input_ports.reader (); + std::shared_ptr aip = _audio_input_ports.reader (); for (AudioInputPorts::iterator p = aip->begin (); p != aip->end (); ++p) { assert (!port_is_mine (p->first)); @@ -1963,7 +1963,7 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate) } /* MIDI */ - boost::shared_ptr mip = _midi_input_ports.reader (); + std::shared_ptr mip = _midi_input_ports.reader (); for (MIDIInputPorts::iterator p = mip->begin (); p != mip->end (); ++p) { assert (!port_is_mine (p->first)); @@ -1992,7 +1992,7 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate) void PortManager::list_all_ports () const { - boost::shared_ptr plist = _ports.reader (); + std::shared_ptr plist = _ports.reader (); for (Ports::iterator p = plist->begin (); p != plist->end (); ++p) { std::cout << p->first << "\n"; } diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc index 3edab336f2..c811558b9f 100644 --- a/libs/ardour/port_set.cc +++ b/libs/ardour/port_set.cc @@ -36,7 +36,7 @@ PortSet::PortSet() _ports.push_back( PortVec() ); } -static bool sort_ports_by_name (boost::shared_ptr a, boost::shared_ptr b) +static bool sort_ports_by_name (std::shared_ptr a, std::shared_ptr b) { string aname (a->name()); string bname (b->name()); @@ -76,7 +76,7 @@ static bool sort_ports_by_name (boost::shared_ptr a, boost::shared_ptr a, boost::shared_ptr b) +static bool sort_ports_by_type_and_name (std::shared_ptr a, std::shared_ptr b) { if (a->type() != b->type()) { return a->type() < b->type(); @@ -86,7 +86,7 @@ static bool sort_ports_by_type_and_name (boost::shared_ptr a, boost::share } void -PortSet::add (boost::shared_ptr port) +PortSet::add (std::shared_ptr port) { PortVec& v = _ports[port->type()]; @@ -101,7 +101,7 @@ PortSet::add (boost::shared_ptr port) } bool -PortSet::remove (boost::shared_ptr port) +PortSet::remove (std::shared_ptr port) { PortVec::iterator i = find(_all_ports.begin(), _all_ports.end(), port); if (i != _all_ports.end()) { @@ -129,19 +129,19 @@ PortSet::num_ports() const } bool -PortSet::contains (boost::shared_ptr port) const +PortSet::contains (std::shared_ptr port) const { return find(_all_ports.begin(), _all_ports.end(), port) != _all_ports.end(); } -boost::shared_ptr +std::shared_ptr PortSet::port(size_t n) const { assert(n < _all_ports.size()); return _all_ports[n]; } -boost::shared_ptr +std::shared_ptr PortSet::port(DataType type, size_t n) const { if (type == DataType::NIL) { @@ -152,19 +152,19 @@ PortSet::port(DataType type, size_t n) const return v[n]; } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr PortSet::nth_audio_port(size_t n) const { - return boost::dynamic_pointer_cast (port (DataType::AUDIO, n)); + return std::dynamic_pointer_cast (port (DataType::AUDIO, n)); } -boost::shared_ptr +std::shared_ptr PortSet::nth_midi_port(size_t n) const { - return boost::dynamic_pointer_cast (port (DataType::MIDI, n)); + return std::dynamic_pointer_cast (port (DataType::MIDI, n)); } void diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index 6c64070754..2aa6bbbd7d 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -18,6 +18,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include #include #include "pbd/basename.h" @@ -117,7 +119,7 @@ swing_position (Temporal::Beats pos, Temporal::Beats grid, double swing_strength } Command* -Quantize::operator () (boost::shared_ptr model, +Quantize::operator () (std::shared_ptr model, Temporal::Beats position, std::vector::Notes>& seqs) { diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 69e70ee4f2..df668d9748 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -65,9 +65,9 @@ RBEffect::~RBEffect () } int -RBEffect::run (boost::shared_ptr r, Progress* progress) +RBEffect::run (std::shared_ptr r, Progress* progress) { - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); if (!region) { error << "RBEffect::run() passed a non-audio region! WTF?" << endmsg; @@ -289,7 +289,7 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) this_read = stretcher.retrieve (buffers, this_read); for (uint32_t i = 0; i < nsrcs.size (); ++i) { - boost::shared_ptr asrc = boost::dynamic_pointer_cast (nsrcs[i]); + std::shared_ptr asrc = std::dynamic_pointer_cast (nsrcs[i]); if (!asrc) { continue; } @@ -317,7 +317,7 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) this_read = stretcher.retrieve (buffers, this_read); for (uint32_t i = 0; i < nsrcs.size (); ++i) { - boost::shared_ptr asrc = boost::dynamic_pointer_cast (nsrcs[i]); + std::shared_ptr asrc = std::dynamic_pointer_cast (nsrcs[i]); if (!asrc) { continue; } @@ -353,7 +353,7 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) /* now reset ancestral data for each new region */ - for (vector >::iterator x = results.begin (); x != results.end (); ++x) { + for (vector >::iterator x = results.begin (); x != results.end (); ++x) { (*x)->set_ancestral_data (timepos_t (read_start), timecnt_t (read_duration, timepos_t (read_start)), stretch, @@ -370,7 +370,7 @@ RBEffect::run (boost::shared_ptr r, Progress* progress) /* XXX: assuming we've only processed one input region into one result here */ if (ret == 0 && !tsr.time_fraction.is_unity()) { - boost::shared_ptr result = boost::dynamic_pointer_cast (results.front ()); + std::shared_ptr result = std::dynamic_pointer_cast (results.front ()); assert (result); result->envelope ()->x_scale (tsr.time_fraction); } diff --git a/libs/ardour/readable.cc b/libs/ardour/readable.cc index b24e40edbb..1f75129087 100644 --- a/libs/ardour/readable.cc +++ b/libs/ardour/readable.cc @@ -30,10 +30,10 @@ using namespace ARDOUR; -std::vector > +std::vector > AudioReadable::load (Session& session, std::string const& path) { - std::vector > readables; + std::vector > readables; ARDOUR::SoundFileInfo sf_info; std::string error_msg; @@ -45,14 +45,14 @@ AudioReadable::load (Session& session, std::string const& path) for (unsigned int n = 0; n < sf_info.channels; ++n) { try { - boost::shared_ptr afs; - afs = boost::dynamic_pointer_cast ( + std::shared_ptr afs; + afs = std::dynamic_pointer_cast ( SourceFactory::createExternal (DataType::AUDIO, session, path, n, Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false)); if (afs->sample_rate() != session.nominal_sample_rate()) { - boost::shared_ptr sfs (new SrcFileSource(session, afs, ARDOUR::SrcBest)); + std::shared_ptr sfs (new SrcFileSource(session, afs, ARDOUR::SrcBest)); readables.push_back(sfs); } else { readables.push_back (afs); diff --git a/libs/ardour/readonly_control.cc b/libs/ardour/readonly_control.cc index 93d6603e45..304b720c82 100644 --- a/libs/ardour/readonly_control.cc +++ b/libs/ardour/readonly_control.cc @@ -23,8 +23,8 @@ using namespace ARDOUR; -ReadOnlyControl::ReadOnlyControl (boost::shared_ptr p, const ParameterDescriptor& desc, uint32_t pnum) - : _plugin (boost::weak_ptr (p)) +ReadOnlyControl::ReadOnlyControl (std::shared_ptr p, const ParameterDescriptor& desc, uint32_t pnum) + : _plugin (std::weak_ptr (p)) , _desc (desc) , _parameter_num (pnum) { } @@ -32,7 +32,7 @@ ReadOnlyControl::ReadOnlyControl (boost::shared_ptr p, const ParameterDe double ReadOnlyControl::get_parameter () const { - boost::shared_ptr p = _plugin.lock(); + std::shared_ptr p = _plugin.lock(); if (p) { return p->get_parameter (_parameter_num); } @@ -42,7 +42,7 @@ ReadOnlyControl::get_parameter () const std::string ReadOnlyControl::describe_parameter () { - boost::shared_ptr p = _plugin.lock(); + std::shared_ptr p = _plugin.lock(); if (p) { return p->describe_parameter (Evoral::Parameter (ARDOUR::PluginAutomation, 0, _parameter_num)); } diff --git a/libs/ardour/record_enable_control.cc b/libs/ardour/record_enable_control.cc index b36a49ceee..faccdfd5fe 100644 --- a/libs/ardour/record_enable_control.cc +++ b/libs/ardour/record_enable_control.cc @@ -26,7 +26,7 @@ using namespace PBD; RecordEnableControl::RecordEnableControl (Session& session, std::string const & name, Recordable& r, Temporal::TimeDomain td) : SlavableAutomationControl (session, RecEnableAutomation, ParameterDescriptor (RecEnableAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(RecEnableAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(RecEnableAutomation), td)), name) , _recordable (r) { diff --git a/libs/ardour/record_safe_control.cc b/libs/ardour/record_safe_control.cc index 979e8900b4..ea71dbf162 100644 --- a/libs/ardour/record_safe_control.cc +++ b/libs/ardour/record_safe_control.cc @@ -26,7 +26,7 @@ using namespace PBD; RecordSafeControl::RecordSafeControl (Session& session, std::string const & name, Recordable& r, Temporal::TimeDomain td) : SlavableAutomationControl (session, RecSafeAutomation, ParameterDescriptor (RecSafeAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(RecSafeAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(RecSafeAutomation), td)), name) , _recordable (r) { diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index ca19235c9b..241ca249b1 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -89,7 +89,7 @@ namespace ARDOUR { } } -PBD::Signal2,const PropertyChange&> Region::RegionsPropertyChanged; +PBD::Signal2,const PropertyChange&> Region::RegionsPropertyChanged; void Region::make_property_quarks () @@ -280,7 +280,7 @@ Region::Region (const SourceList& srcs) } /** Create a new Region from an existing one */ -Region::Region (boost::shared_ptr other) +Region::Region (std::shared_ptr other) : SessionObject(other->session(), other->name()) , _type (other->data_type()) , REGION_COPY_STATE (other) @@ -338,7 +338,7 @@ Region::Region (boost::shared_ptr other) * the start within \a other is given by \a offset * (i.e. relative to the start of \a other's sources, the start is \a offset + \a other.start() */ -Region::Region (boost::shared_ptr other, timecnt_t const & offset) +Region::Region (std::shared_ptr other, timecnt_t const & offset) : SessionObject(other->session(), other->name()) , _type (other->data_type()) , REGION_COPY_STATE (other) @@ -383,7 +383,7 @@ Region::Region (boost::shared_ptr other, timecnt_t const & offset) } /** Create a copy of @p other but with different sources. Used by filters */ -Region::Region (boost::shared_ptr other, const SourceList& srcs) +Region::Region (std::shared_ptr other, const SourceList& srcs) : SessionObject (other->session(), other->name()) , _type (srcs.front()->type()) , REGION_COPY_STATE (other) @@ -416,7 +416,7 @@ Region::~Region () } void -Region::set_playlist (boost::weak_ptr wpl) +Region::set_playlist (std::weak_ptr wpl) { _playlist = wpl.lock(); } @@ -439,7 +439,7 @@ Region::set_selected_for_solo(bool yn) { if (_soloSelected != yn) { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl){ if (yn) { pl->AddToSoloSelectedList(this); @@ -521,7 +521,7 @@ Region::maybe_uncopy () void Region::first_edit () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (_first_edit != EditChangesNothing && pl) { @@ -537,13 +537,13 @@ Region::first_edit () bool Region::at_natural_position () const { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (!pl) { return false; } - boost::shared_ptr whole_file_region = get_parent(); + std::shared_ptr whole_file_region = get_parent(); if (whole_file_region) { if (position() == whole_file_region->position() + _start) { @@ -557,13 +557,13 @@ Region::at_natural_position () const void Region::move_to_natural_position () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (!pl) { return; } - boost::shared_ptr whole_file_region = get_parent(); + std::shared_ptr whole_file_region = get_parent(); if (whole_file_region) { set_position (whole_file_region->position() + _start); @@ -626,7 +626,7 @@ Region::recompute_position_from_time_domain () void Region::update_after_tempo_map_change (bool send) { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (!pl) { return; @@ -1220,7 +1220,7 @@ Region::sync_position() const void Region::raise () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl) { pl->raise_region (shared_from_this ()); } @@ -1229,7 +1229,7 @@ Region::raise () void Region::lower () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl) { pl->lower_region (shared_from_this ()); } @@ -1239,7 +1239,7 @@ Region::lower () void Region::raise_to_top () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl) { pl->raise_region_to_top (shared_from_this()); } @@ -1248,7 +1248,7 @@ Region::raise_to_top () void Region::lower_to_bottom () { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl) { pl->lower_region_to_bottom (shared_from_this()); } @@ -1500,11 +1500,11 @@ Region::send_change (const PropertyChange& what_changed) */ try { - boost::shared_ptr rptr = shared_from_this(); + std::shared_ptr rptr = shared_from_this(); if (_changemap) { (*_changemap)[what_changed].push_back (rptr); } else { - boost::shared_ptr rl (new RegionList); + std::shared_ptr rl (new RegionList); rl->push_back (rptr); RegionsPropertyChanged (rl, what_changed); } @@ -1515,20 +1515,20 @@ Region::send_change (const PropertyChange& what_changed) } bool -Region::overlap_equivalent (boost::shared_ptr other) const +Region::overlap_equivalent (std::shared_ptr other) const { return coverage (other->position(), other->nt_last()) != Temporal::OverlapNone; } bool -Region::enclosed_equivalent (boost::shared_ptr other) const +Region::enclosed_equivalent (std::shared_ptr other) const { return ((position() >= other->position() && end() <= other->end()) || (position() <= other->position() && end() >= other->end())); } bool -Region::layer_and_time_equivalent (boost::shared_ptr other) const +Region::layer_and_time_equivalent (std::shared_ptr other) const { return _layer == other->_layer && position() == other->position() && @@ -1536,7 +1536,7 @@ Region::layer_and_time_equivalent (boost::shared_ptr other) const } bool -Region::exact_equivalent (boost::shared_ptr other) const +Region::exact_equivalent (std::shared_ptr other) const { return _start == other->_start && position() == other->position() && @@ -1544,14 +1544,14 @@ Region::exact_equivalent (boost::shared_ptr other) const } bool -Region::size_equivalent (boost::shared_ptr other) const +Region::size_equivalent (std::shared_ptr other) const { return _start == other->_start && _length == other->_length; } void -Region::source_deleted (boost::weak_ptr) +Region::source_deleted (std::weak_ptr) { drop_sources (); @@ -1597,7 +1597,7 @@ Region::set_master_sources (const SourceList& srcs) } bool -Region::source_equivalent (boost::shared_ptr other) const +Region::source_equivalent (std::shared_ptr other) const { if (!other) return false; @@ -1626,7 +1626,7 @@ Region::source_equivalent (boost::shared_ptr other) const } bool -Region::any_source_equivalent (boost::shared_ptr other) const +Region::any_source_equivalent (std::shared_ptr other) const { if (!other) { return false; @@ -1666,11 +1666,11 @@ Region::source_string () const } void -Region::deep_sources (std::set > & sources) const +Region::deep_sources (std::set > & sources) const { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + std::shared_ptr ps = std::dynamic_pointer_cast (*i); if (ps) { if (sources.find (ps) == sources.end()) { @@ -1687,7 +1687,7 @@ Region::deep_sources (std::set > & sources) const for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) { - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + std::shared_ptr ps = std::dynamic_pointer_cast (*i); if (ps) { if (sources.find (ps) == sources.end()) { @@ -1704,7 +1704,7 @@ Region::deep_sources (std::set > & sources) const } bool -Region::uses_source (boost::shared_ptr source, bool shallow) const +Region::uses_source (std::shared_ptr source, bool shallow) const { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { if (*i == source) { @@ -1712,7 +1712,7 @@ Region::uses_source (boost::shared_ptr source, bool shallow) const } if (!shallow) { - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + std::shared_ptr ps = std::dynamic_pointer_cast (*i); if (ps) { if (ps->playlist()->uses_source (source)) { @@ -1728,7 +1728,7 @@ Region::uses_source (boost::shared_ptr source, bool shallow) const } if (!shallow) { - boost::shared_ptr ps = boost::dynamic_pointer_cast (*i); + std::shared_ptr ps = std::dynamic_pointer_cast (*i); if (ps) { if (ps->playlist()->uses_source (source)) { @@ -1803,21 +1803,21 @@ Region::verify_start (timepos_t const & pos) return true; } -boost::shared_ptr +std::shared_ptr Region::get_parent() const { - boost::shared_ptr pl (playlist()); + std::shared_ptr pl (playlist()); if (pl) { - boost::shared_ptr r; - boost::shared_ptr grrr2 = boost::dynamic_pointer_cast (shared_from_this()); + std::shared_ptr r; + std::shared_ptr grrr2 = std::dynamic_pointer_cast (shared_from_this()); if (grrr2 && (r = _session.find_whole_file_parent (grrr2))) { - return boost::static_pointer_cast (r); + return std::static_pointer_cast (r); } } - return boost::shared_ptr(); + return std::shared_ptr(); } int @@ -1958,7 +1958,7 @@ Region::drop_sources () void Region::use_sources (SourceList const & s) { - set > unique_srcs; + set > unique_srcs; for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { @@ -1972,7 +1972,7 @@ Region::use_sources (SourceList const & s) if (unique_srcs.find (*i) == unique_srcs.end ()) { unique_srcs.insert (*i); - (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); + (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, std::weak_ptr(*i))); } } } @@ -2156,7 +2156,7 @@ Region::region_relative_position (timepos_t const & p) const Temporal::TimeDomain Region::time_domain() const { - boost::shared_ptr pl (_playlist.lock()); + std::shared_ptr pl (_playlist.lock()); if (pl) { return pl->time_domain (); diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 3215ca93ae..df1fea06bd 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -42,7 +42,7 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -PBD::Signal1 > RegionFactory::CheckNewRegion; +PBD::Signal1 > RegionFactory::CheckNewRegion; Glib::Threads::Mutex RegionFactory::region_map_lock; RegionFactory::RegionMap RegionFactory::region_map; PBD::ScopedConnectionList* RegionFactory::region_list_connections = 0; @@ -51,17 +51,17 @@ std::map RegionFactory::region_name_number std::map RegionFactory::region_name_map; RegionFactory::CompoundAssociations RegionFactory::_compound_associations; -boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, bool announce, bool fork, ThawList* tl) +std::shared_ptr +RegionFactory::create (std::shared_ptr region, bool announce, bool fork, ThawList* tl) { - boost::shared_ptr ret; - boost::shared_ptr ar; - boost::shared_ptr mr; + std::shared_ptr ret; + std::shared_ptr ar; + std::shared_ptr mr; - if ((ar = boost::dynamic_pointer_cast (region)) != 0) { - ret = boost::shared_ptr (new AudioRegion (ar, timecnt_t::from_superclock (0))); + if ((ar = std::dynamic_pointer_cast (region)) != 0) { + ret = std::shared_ptr (new AudioRegion (ar, timecnt_t::from_superclock (0))); - } else if ((mr = boost::dynamic_pointer_cast (region)) != 0) { + } else if ((mr = std::dynamic_pointer_cast (region)) != 0) { if (mr->session ().config.get_midi_copy_is_fork () || fork) { /* What we really want to do here is what Editor::fork_region() does via Session::create_midi_source_by_stealing_name(), but we @@ -71,11 +71,11 @@ RegionFactory::create (boost::shared_ptr region, bool announce, bo const std::string ancestor_name = mr->sources ().front ()->ancestor_name (); const std::string base = PBD::basename_nosuffix (ancestor_name); - boost::shared_ptr source = mr->session ().create_midi_source_for_session (base); + std::shared_ptr source = mr->session ().create_midi_source_for_session (base); source->set_ancestor_name (mr->sources ().front ()->name ()); ret = mr->clone (source, tl); } else { - ret = boost::shared_ptr (new MidiRegion (mr, timecnt_t (Temporal::Beats (), timepos_t (Temporal::Beats())))); + ret = std::shared_ptr (new MidiRegion (mr, timecnt_t (Temporal::Beats (), timepos_t (Temporal::Beats())))); } } else { @@ -106,24 +106,24 @@ RegionFactory::create (boost::shared_ptr region, bool announce, bo return ret; } -boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, const PropertyList& plist, bool announce, ThawList* tl) +std::shared_ptr +RegionFactory::create (std::shared_ptr region, const PropertyList& plist, bool announce, ThawList* tl) { - boost::shared_ptr ret; - boost::shared_ptr other_a; - boost::shared_ptr other_m; + std::shared_ptr ret; + std::shared_ptr other_a; + std::shared_ptr other_m; - if ((other_a = boost::dynamic_pointer_cast (region)) != 0) { - ret = boost::shared_ptr (new AudioRegion (other_a)); + if ((other_a = std::dynamic_pointer_cast (region)) != 0) { + ret = std::shared_ptr (new AudioRegion (other_a)); - } else if ((other_m = boost::dynamic_pointer_cast (region)) != 0) { - ret = boost::shared_ptr (new MidiRegion (other_m)); + } else if ((other_m = std::dynamic_pointer_cast (region)) != 0) { + ret = std::shared_ptr (new MidiRegion (other_m)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") << endmsg; abort (); /*NOTREACHED*/ - return boost::shared_ptr (); + return std::shared_ptr (); } if (ret) { @@ -147,24 +147,24 @@ RegionFactory::create (boost::shared_ptr region, const PropertyList& pli return ret; } -boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, timecnt_t const & offset, const PropertyList& plist, bool announce, ThawList* tl) +std::shared_ptr +RegionFactory::create (std::shared_ptr region, timecnt_t const & offset, const PropertyList& plist, bool announce, ThawList* tl) { - boost::shared_ptr ret; - boost::shared_ptr other_a; - boost::shared_ptr other_m; + std::shared_ptr ret; + std::shared_ptr other_a; + std::shared_ptr other_m; - if ((other_a = boost::dynamic_pointer_cast (region)) != 0) { - ret = boost::shared_ptr (new AudioRegion (other_a, offset)); + if ((other_a = std::dynamic_pointer_cast (region)) != 0) { + ret = std::shared_ptr (new AudioRegion (other_a, offset)); - } else if ((other_m = boost::dynamic_pointer_cast (region)) != 0) { - ret = boost::shared_ptr (new MidiRegion (other_m, offset)); + } else if ((other_m = std::dynamic_pointer_cast (region)) != 0) { + ret = std::shared_ptr (new MidiRegion (other_m, offset)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") << endmsg; abort (); /*NOTREACHED*/ - return boost::shared_ptr (); + return std::shared_ptr (); } if (ret) { @@ -187,20 +187,20 @@ RegionFactory::create (boost::shared_ptr region, timecnt_t const & offse return ret; } -boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, const PropertyList& plist, bool announce, ThawList* tl) +std::shared_ptr +RegionFactory::create (std::shared_ptr region, const SourceList& srcs, const PropertyList& plist, bool announce, ThawList* tl) { - boost::shared_ptr ret; - boost::shared_ptr other; + std::shared_ptr ret; + std::shared_ptr other; /* used by AudioFilter when constructing a new region that is intended to have nearly identical settings to an original, but using different sources. */ - if ((other = boost::dynamic_pointer_cast (region)) != 0) { + if ((other = std::dynamic_pointer_cast (region)) != 0) { // XXX use me in caller where plist is setup, this is start i think srcs.front()->length (srcs.front()->natural_position()) - ret = boost::shared_ptr (new AudioRegion (other, srcs)); + ret = std::shared_ptr (new AudioRegion (other, srcs)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") @@ -229,26 +229,26 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, return ret; } -boost::shared_ptr -RegionFactory::create (boost::shared_ptr src, const PropertyList& plist, bool announce, ThawList* tl) +std::shared_ptr +RegionFactory::create (std::shared_ptr src, const PropertyList& plist, bool announce, ThawList* tl) { SourceList srcs; srcs.push_back (src); return create (srcs, plist, announce, tl); } -boost::shared_ptr +std::shared_ptr RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool announce, ThawList* tl) { - boost::shared_ptr ret; - boost::shared_ptr as; - boost::shared_ptr ms; + std::shared_ptr ret; + std::shared_ptr as; + std::shared_ptr ms; - if ((as = boost::dynamic_pointer_cast (srcs[0])) != 0) { - ret = boost::shared_ptr (new AudioRegion (srcs)); + if ((as = std::dynamic_pointer_cast (srcs[0])) != 0) { + ret = std::shared_ptr (new AudioRegion (srcs)); - } else if ((ms = boost::dynamic_pointer_cast (srcs[0])) != 0) { - ret = boost::shared_ptr (new MidiRegion (srcs)); + } else if ((ms = std::dynamic_pointer_cast (srcs[0])) != 0) { + ret = std::shared_ptr (new MidiRegion (srcs)); } if (ret) { @@ -272,26 +272,26 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a return ret; } -boost::shared_ptr +std::shared_ptr RegionFactory::create (Session& session, XMLNode& node, bool yn) { return session.XMLRegionFactory (node, yn); } -boost::shared_ptr +std::shared_ptr RegionFactory::create (SourceList& srcs, const XMLNode& node) { - boost::shared_ptr ret; + std::shared_ptr ret; if (srcs.empty ()) { return ret; } if (srcs[0]->type () == DataType::AUDIO) { - ret = boost::shared_ptr (new AudioRegion (srcs)); + ret = std::shared_ptr (new AudioRegion (srcs)); } else if (srcs[0]->type () == DataType::MIDI) { - ret = boost::shared_ptr (new MidiRegion (srcs)); + ret = std::shared_ptr (new MidiRegion (srcs)); } if (ret) { @@ -313,9 +313,9 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) } void -RegionFactory::map_add (boost::shared_ptr r) +RegionFactory::map_add (std::shared_ptr r) { - pair > p; + pair > p; p.first = r->id (); p.second = r; @@ -328,16 +328,16 @@ RegionFactory::map_add (boost::shared_ptr r) region_list_connections = new ScopedConnectionList; } - r->DropReferences.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::map_remove, boost::weak_ptr (r))); - r->PropertyChanged.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr (r))); + r->DropReferences.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::map_remove, std::weak_ptr (r))); + r->PropertyChanged.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::region_changed, _1, std::weak_ptr (r))); add_to_region_name_maps (r); } void -RegionFactory::map_remove (boost::weak_ptr w) +RegionFactory::map_remove (std::weak_ptr w) { - boost::shared_ptr r = w.lock (); + std::shared_ptr r = w.lock (); if (!r) { return; } @@ -351,19 +351,19 @@ RegionFactory::map_remove (boost::weak_ptr w) } } -boost::shared_ptr +std::shared_ptr RegionFactory::region_by_id (const PBD::ID& id) { RegionMap::iterator i = region_map.find (id); if (i == region_map.end ()) { - return boost::shared_ptr (); + return std::shared_ptr (); } return i->second; } -boost::shared_ptr +std::shared_ptr RegionFactory::wholefile_region_by_name (const std::string& name) { for (RegionMap::iterator i = region_map.begin (); i != region_map.end (); ++i) { @@ -371,10 +371,10 @@ RegionFactory::wholefile_region_by_name (const std::string& name) return i->second; } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr RegionFactory::region_by_name (const std::string& name) { for (RegionMap::iterator i = region_map.begin (); i != region_map.end (); ++i) { @@ -382,7 +382,7 @@ RegionFactory::region_by_name (const std::string& name) return i->second; } } - return boost::shared_ptr (); + return std::shared_ptr (); } void @@ -433,7 +433,7 @@ RegionFactory::nregions () /** Add a region to the two region name maps */ void -RegionFactory::add_to_region_name_maps (boost::shared_ptr region) +RegionFactory::add_to_region_name_maps (std::shared_ptr region) { update_region_name_number_map (region); @@ -443,7 +443,7 @@ RegionFactory::add_to_region_name_maps (boost::shared_ptr region) /** Account for a region rename in the two region name maps */ void -RegionFactory::rename_in_region_name_maps (boost::shared_ptr region) +RegionFactory::rename_in_region_name_maps (std::shared_ptr region) { update_region_name_number_map (region); @@ -473,7 +473,7 @@ RegionFactory::remove_from_region_name_map (string n) /** Update a region's entry in the region_name_number_map */ void -RegionFactory::update_region_name_number_map (boost::shared_ptr region) +RegionFactory::update_region_name_number_map (std::shared_ptr region) { string::size_type const last_period = region->name ().find_last_of ('.'); @@ -491,9 +491,9 @@ RegionFactory::update_region_name_number_map (boost::shared_ptr region) } void -RegionFactory::region_changed (PropertyChange const& what_changed, boost::weak_ptr w) +RegionFactory::region_changed (PropertyChange const& what_changed, std::weak_ptr w) { - boost::shared_ptr r = w.lock (); + std::shared_ptr r = w.lock (); if (!r) { return; } @@ -621,8 +621,8 @@ RegionFactory::new_region_name (string old) return old; } -boost::shared_ptr -RegionFactory::get_whole_region_for_source (boost::shared_ptr s) +std::shared_ptr +RegionFactory::get_whole_region_for_source (std::shared_ptr s) { Glib::Threads::Mutex::Lock lm (region_map_lock); @@ -632,11 +632,11 @@ RegionFactory::get_whole_region_for_source (boost::shared_ptr s) } } - return boost::shared_ptr (); + return std::shared_ptr (); } void -RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set >& r) +RegionFactory::get_regions_using_source (std::shared_ptr s, std::set >& r) { Glib::Threads::Mutex::Lock lm (region_map_lock); @@ -648,7 +648,7 @@ RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set src) +RegionFactory::remove_regions_using_source (std::shared_ptr src) { Glib::Threads::Mutex::Lock lm (region_map_lock); RegionList remove_regions; @@ -666,7 +666,7 @@ RegionFactory::remove_regions_using_source (boost::shared_ptr src) } void -RegionFactory::add_compound_association (boost::shared_ptr orig, boost::shared_ptr copy) +RegionFactory::add_compound_association (std::shared_ptr orig, std::shared_ptr copy) { Glib::Threads::Mutex::Lock lm (region_map_lock); _compound_associations[copy] = orig; diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc index f9fb649f93..20c6628689 100644 --- a/libs/ardour/resampled_source.cc +++ b/libs/ardour/resampled_source.cc @@ -35,7 +35,7 @@ const uint32_t ResampledImportableSource::blocksize = 524288U; const uint32_t ResampledImportableSource::blocksize = 16384U; #endif -ResampledImportableSource::ResampledImportableSource (boost::shared_ptr src, samplecnt_t rate, SrcQuality srcq) +ResampledImportableSource::ResampledImportableSource (std::shared_ptr src, samplecnt_t rate, SrcQuality srcq) : source (src) , _src_state (0) { diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index 5559428fab..350b54725b 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -51,8 +51,8 @@ Return::Return (Session& s, bool internal) { /* never muted */ - boost::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation), time_domain())); - _gain_control = boost::shared_ptr (new GainControl (_session, Evoral::Parameter (GainAutomation), gl)); + std::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation), time_domain())); + _gain_control = std::shared_ptr (new GainControl (_session, Evoral::Parameter (GainAutomation), gl)); add_control (_gain_control); _amp.reset (new Amp (_session, X_("Fader"), _gain_control, true)); diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc index 4f1afe2875..7d797006a8 100644 --- a/libs/ardour/reverse.cc +++ b/libs/ardour/reverse.cc @@ -40,7 +40,7 @@ Reverse::~Reverse () } int -Reverse::run (boost::shared_ptr r, Progress*) +Reverse::run (std::shared_ptr r, Progress*) { SourceList nsrcs; SourceList::iterator si; @@ -51,7 +51,7 @@ Reverse::run (boost::shared_ptr r, Progress*) samplecnt_t to_read; int ret = -1; - boost::shared_ptr region = boost::dynamic_pointer_cast(r); + std::shared_ptr region = std::dynamic_pointer_cast(r); if (!region) { return ret; @@ -96,7 +96,7 @@ Reverse::run (boost::shared_ptr r, Progress*) /* write it out */ - boost::shared_ptr asrc(boost::dynamic_pointer_cast(*si)); + std::shared_ptr asrc(std::dynamic_pointer_cast(*si)); if (asrc && asrc->write (buf, to_read) != to_read) { goto out; @@ -120,7 +120,7 @@ Reverse::run (boost::shared_ptr r, Progress*) if (ret) { for (si = nsrcs.begin(); si != nsrcs.end(); ++si) { - boost::shared_ptr asrc(boost::dynamic_pointer_cast(*si)); + std::shared_ptr asrc(std::dynamic_pointer_cast(*si)); asrc->mark_for_remove (); } } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 1b3af27d00..c7624e8e37 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -107,9 +107,9 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal3, boost::shared_ptr, Route::PluginSetupOptions > Route::PluginSetup; +PBD::Signal3, std::shared_ptr, Route::PluginSetupOptions > Route::PluginSetup; -PBD::Signal1 > Route::FanOut; +PBD::Signal1 > Route::FanOut; /** Base class for all routable/mixable objects (tracks and busses) */ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType default_type) @@ -146,9 +146,9 @@ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType g_atomic_int_set (&_pending_signals, 0); } -boost::weak_ptr +std::weak_ptr Route::weakroute () { - return boost::weak_ptr (boost::dynamic_pointer_cast (shared_from_this ())); + return std::weak_ptr (std::dynamic_pointer_cast (shared_from_this ())); } int @@ -559,7 +559,7 @@ Route::process_output_buffers (BufferSet& bufs, void Route::bounce_process (BufferSet& buffers, samplepos_t start, samplecnt_t nframes, - boost::shared_ptr endpoint, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) { /* If no processing is required, there's no need to go any further. */ @@ -584,7 +584,7 @@ Route::bounce_process (BufferSet& buffers, samplepos_t start, samplecnt_t nframe } if (!for_export && !seen_disk_io) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { seen_disk_io = true; buffers.set_count ((*i)->output_streams()); } @@ -611,7 +611,7 @@ Route::bounce_process (BufferSet& buffers, samplepos_t start, samplecnt_t nframe /* don't run any processors that do routing. * Also don't bother with metering. */ - if (!(*i)->does_routing() && !boost::dynamic_pointer_cast(*i)) { + if (!(*i)->does_routing() && !std::dynamic_pointer_cast(*i)) { (*i)->run (buffers, start - latency, start - latency + nframes, 1.0, nframes, true); buffers.set_count ((*i)->output_streams()); latency += (*i)->effective_latency (); @@ -624,7 +624,7 @@ Route::bounce_process (BufferSet& buffers, samplepos_t start, samplecnt_t nframe } samplecnt_t -Route::bounce_get_latency (boost::shared_ptr endpoint, +Route::bounce_get_latency (std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const { samplecnt_t latency = 0; @@ -638,7 +638,7 @@ Route::bounce_get_latency (boost::shared_ptr endpoint, break; } if (!for_export && !seen_disk_io) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { seen_disk_io = true; } continue; @@ -646,7 +646,7 @@ Route::bounce_get_latency (boost::shared_ptr endpoint, if (!for_export && !can_freeze_processor (*i, !for_freeze)) { break; } - if (!(*i)->does_routing() && !boost::dynamic_pointer_cast(*i)) { + if (!(*i)->does_routing() && !std::dynamic_pointer_cast(*i)) { latency += (*i)->effective_latency (); } if ((*i) == endpoint) { @@ -657,7 +657,7 @@ Route::bounce_get_latency (boost::shared_ptr endpoint, } ChanCount -Route::bounce_get_output_streams (ChanCount &cc, boost::shared_ptr endpoint, +Route::bounce_get_output_streams (ChanCount &cc, std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const { if (!endpoint && !include_endpoint) { @@ -673,7 +673,7 @@ Route::bounce_get_output_streams (ChanCount &cc, boost::shared_ptr en if (!for_export && !can_freeze_processor (*i, !for_freeze)) { break; } - if (!(*i)->does_routing() && !boost::dynamic_pointer_cast(*i)) { + if (!(*i)->does_routing() && !std::dynamic_pointer_cast(*i)) { cc = (*i)->output_streams(); } else if (*i == _main_outs) { cc = (*i)->output_streams(); @@ -771,7 +771,7 @@ Route::push_solo_isolate_upstream (int32_t delta) { /* forward propagate solo-isolate status to everything fed by this route, but not those via sends only */ - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i).get() == this || !(*i)->can_solo()) { @@ -788,8 +788,8 @@ void Route::push_solo_upstream (int delta) { DEBUG_TRACE (DEBUG::Solo, string_compose("\t ... INVERT push from %1\n", _name)); - for (auto const& i : _session._current_route_graph.to (boost::dynamic_pointer_cast (shared_from_this ()))) { - boost::shared_ptr r = boost::dynamic_pointer_cast (i); + for (auto const& i : _session._current_route_graph.to (std::dynamic_pointer_cast (shared_from_this ()))) { + std::shared_ptr r = std::dynamic_pointer_cast (i); if (r) { r->solo_control()->mod_solo_by_others_downstream (-delta); } @@ -798,10 +798,10 @@ Route::push_solo_upstream (int delta) #if 0 static void -dump_processors(const string& name, const list >& procs) +dump_processors(const string& name, const list >& procs) { cerr << name << " {" << endl; - for (list >::const_iterator p = procs.begin(); + for (list >::const_iterator p = procs.begin(); p != procs.end(); ++p) { cerr << "\t" << (*p)->name() << " ID = " << (*p)->id() << " @ " << (*p) << endl; } @@ -812,7 +812,7 @@ dump_processors(const string& name, const list >& p /** Supposing that we want to insert a Processor at a given Placement, return * the processor to add the new one before (or 0 to add at the end). */ -boost::shared_ptr +std::shared_ptr Route::before_processor_for_placement (Placement p) { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); @@ -827,17 +827,17 @@ Route::before_processor_for_placement (Placement p) loc = find (_processors.begin(), _processors.end(), _main_outs); } - return loc != _processors.end() ? *loc : boost::shared_ptr (); + return loc != _processors.end() ? *loc : std::shared_ptr (); } /** Supposing that we want to insert a Processor at a given index, return * the processor to add the new one before (or -1 to add at the end). */ -boost::shared_ptr +std::shared_ptr Route::before_processor_for_index (int index) { if (index == -1) { - return boost::shared_ptr (); + return std::shared_ptr (); } Glib::Threads::RWLock::ReaderLock lm (_processor_lock); @@ -852,14 +852,14 @@ Route::before_processor_for_index (int index) ++i; } - return (i != _processors.end() ? *i : boost::shared_ptr ()); + return (i != _processors.end() ? *i : std::shared_ptr ()); } /** Add a processor either pre- or post-fader * @return 0 on success, non-0 on failure. */ int -Route::add_processor (boost::shared_ptr processor, Placement placement, ProcessorStreams* err, bool activation_allowed) +Route::add_processor (std::shared_ptr processor, Placement placement, ProcessorStreams* err, bool activation_allowed) { return add_processor (processor, before_processor_for_placement (placement), err, activation_allowed); } @@ -870,7 +870,7 @@ Route::add_processor (boost::shared_ptr processor, Placement placemen * @return 0 on success, non-0 on failure. */ int -Route::add_processor_by_index (boost::shared_ptr processor, int index, ProcessorStreams* err, bool activation_allowed) +Route::add_processor_by_index (std::shared_ptr processor, int index, ProcessorStreams* err, bool activation_allowed) { return add_processor (processor, before_processor_for_index (index), err, activation_allowed); } @@ -880,7 +880,7 @@ Route::add_processor_by_index (boost::shared_ptr processor, int index * @return 0 on success, non-0 on failure. */ int -Route::add_processor (boost::shared_ptr processor, boost::shared_ptr before, ProcessorStreams* err, bool activation_allowed) +Route::add_processor (std::shared_ptr processor, std::shared_ptr before, ProcessorStreams* err, bool activation_allowed) { assert (processor != _meter); assert (processor != _main_outs); @@ -905,7 +905,7 @@ Route::add_processor (boost::shared_ptr processor, boost::shared_ptr< } void -Route::processor_selfdestruct (boost::weak_ptr wp) +Route::processor_selfdestruct (std::weak_ptr wp) { /* We cannot destruct the processor here (usually RT-thread * with various locks held - in case of sends also io_locks). @@ -921,7 +921,7 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version) XMLProperty const * prop; try { - boost::shared_ptr processor; + std::shared_ptr processor; /* bit of a hack: get the `placement' property from the tag here so that we can add the processor in the right place (pre/post-fader) @@ -966,7 +966,7 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version) } else if (node.name() == "Send") { - boost::shared_ptr sendpan (new Pannable (_session, Config->get_default_automation_time_domain())); + std::shared_ptr sendpan (new Pannable (_session, Config->get_default_automation_time_domain())); processor.reset (new Send (_session, sendpan, _mute_master)); } else { @@ -1010,10 +1010,10 @@ inline Route::PluginSetupOptions operator&= (Route::PluginSetupOptions& a, const } int -Route::add_processors (const ProcessorList& others, boost::shared_ptr before, ProcessorStreams* err) +Route::add_processors (const ProcessorList& others, std::shared_ptr before, ProcessorStreams* err) { ProcessorList::iterator loc; - boost::shared_ptr fanout; + std::shared_ptr fanout; if (g_atomic_int_get (&_pending_process_reorder) || g_atomic_int_get (&_pending_listen_change)) { /* we need to flush any pending re-order changes */ @@ -1040,20 +1040,20 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr // check if there's an instrument to replace or configure for (ProcessorList::const_iterator i = others.begin(); i != others.end(); ++i) { - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) == 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(*i)) == 0) { continue; } if (!pi->plugin ()->get_info ()->is_instrument ()) { continue; } - if (boost::dynamic_pointer_cast(*i)) { + if (std::dynamic_pointer_cast(*i)) { /* triggerbox looks a lot like an instrument, but it isn't a replacement for an instrument */ continue; } - boost::shared_ptr instrument = the_instrument (); + std::shared_ptr instrument = the_instrument (); ChanCount in (DataType::MIDI, 1); ChanCount out (DataType::AUDIO, 2); // XXX route's out?! @@ -1084,7 +1084,7 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr flags &= mask; if (flags != None) { - boost::optional rv = PluginSetup (boost::dynamic_pointer_cast(shared_from_this ()), pi, flags); /* EMIT SIGNAL */ + boost::optional rv = PluginSetup (std::dynamic_pointer_cast(shared_from_this ()), pi, flags); /* EMIT SIGNAL */ int mode = rv.value_or (0); switch (mode & 3) { case 1: @@ -1112,7 +1112,7 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr for (ProcessorList::const_iterator i = others.begin(); i != others.end(); ++i) { - boost::shared_ptr tb = boost::dynamic_pointer_cast (*i); + std::shared_ptr tb = std::dynamic_pointer_cast (*i); if (tb) { _triggerbox = tb; } @@ -1125,9 +1125,9 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr continue; } - boost::shared_ptr pi; + std::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { PluginManager::instance().stats_use_plugin (pi->plugin()->get_info()); pi->set_strict_io (_strict_io); } @@ -1170,24 +1170,24 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr (*i)->ActiveChanged.connect_same_thread (*this, boost::bind (&Session::queue_latency_recompute, &_session)); - boost::shared_ptr send; - if ((send = boost::dynamic_pointer_cast (*i))) { + std::shared_ptr send; + if ((send = std::dynamic_pointer_cast (*i))) { send->SelfDestruct.connect_same_thread (**i, - boost::bind (&Route::processor_selfdestruct, this, boost::weak_ptr (*i))); + boost::bind (&Route::processor_selfdestruct, this, std::weak_ptr (*i))); if (send->output()) { send->output()->changed.connect_same_thread (**i, boost::bind (&Route::output_change_handler, this, _1, _2)); } } - if (boost::dynamic_pointer_cast(*i)) { + if (std::dynamic_pointer_cast(*i)) { routing_processor_added = true; } } for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi; + std::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { if (pi->has_no_inputs ()) { _have_internal_generator = true; break; @@ -1202,11 +1202,11 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr if (fanout && fanout->configured () && fanout->output_streams().n_audio() > 2 - && boost::dynamic_pointer_cast (the_instrument ()) == fanout) { + && std::dynamic_pointer_cast (the_instrument ()) == fanout) { /* This adds new tracks or busses, and changes connections. * This cannot be done here, and needs to be delegated to the GUI thread. */ _instrument_fanned_out = true; - FanOut (boost::dynamic_pointer_cast(shared_from_this())); /* EMIT SIGNAL */ + FanOut (std::dynamic_pointer_cast(shared_from_this())); /* EMIT SIGNAL */ } return 0; } @@ -1268,7 +1268,7 @@ Route::disable_plugins (Placement p) placement_range(p, start, end); for (ProcessorList::iterator i = start; i != end; ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { (*i)->enable (false); } } @@ -1284,7 +1284,7 @@ Route::disable_plugins () Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { (*i)->enable (false); } } @@ -1305,13 +1305,14 @@ Route::ab_plugins (bool forward) */ for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (!boost::dynamic_pointer_cast (*i)) { + if (!std::dynamic_pointer_cast (*i)) { continue; } if (!(*i)->display_to_user () || is_internal_processor (*i)) { continue; } - if (boost::dynamic_pointer_cast (*i)->is_channelstrip()) { + if (std::dynamic_pointer_cast (*i)->is_channelstrip()) { + continue; } @@ -1328,13 +1329,13 @@ Route::ab_plugins (bool forward) /* backward = if the redirect was marked to go active on the next ab, do so */ for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (!boost::dynamic_pointer_cast (*i)) { + if (!std::dynamic_pointer_cast (*i)) { continue; } if (!(*i)->display_to_user () || is_internal_processor (*i)) { continue; } - if (boost::dynamic_pointer_cast (*i)->is_channelstrip()) { + if (std::dynamic_pointer_cast (*i)->is_channelstrip()) { continue; } @@ -1426,7 +1427,7 @@ Route::clear_processors (Placement p) } bool -Route::is_internal_processor (boost::shared_ptr p) const +Route::is_internal_processor (std::shared_ptr p) const { if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim || p == _polarity || (_volume && p == _volume) || (_triggerbox && p == _triggerbox)) { return true; @@ -1435,7 +1436,7 @@ Route::is_internal_processor (boost::shared_ptr p) const } int -Route::remove_processor (boost::shared_ptr processor, ProcessorStreams* err, bool need_process_lock) +Route::remove_processor (std::shared_ptr processor, ProcessorStreams* err, bool need_process_lock) { // TODO once the export point can be configured properly, do something smarter here if (processor == _capturing_processor) { @@ -1487,8 +1488,8 @@ Route::remove_processor (boost::shared_ptr processor, ProcessorStream /* stop redirects that send signals to JACK ports * from causing noise as a result of no longer being run */ - boost::shared_ptr iop = boost::dynamic_pointer_cast (*i); - boost::shared_ptr pi = boost::dynamic_pointer_cast(*i); + std::shared_ptr iop = std::dynamic_pointer_cast (*i); + std::shared_ptr pi = std::dynamic_pointer_cast(*i); if (pi != 0) { assert (iop == 0); @@ -1506,7 +1507,7 @@ Route::remove_processor (boost::shared_ptr processor, ProcessorStream lm.acquire (); } - if (boost::dynamic_pointer_cast(*i)) { + if (std::dynamic_pointer_cast(*i)) { routing_processor_removed = true; } @@ -1522,9 +1523,9 @@ Route::remove_processor (boost::shared_ptr processor, ProcessorStream _have_internal_generator = false; for (i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi; + std::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { if (pi->has_no_inputs ()) { _have_internal_generator = true; break; @@ -1545,7 +1546,7 @@ Route::remove_processor (boost::shared_ptr processor, ProcessorStream } int -Route::replace_processor (boost::shared_ptr old, boost::shared_ptr sub, ProcessorStreams* err) +Route::replace_processor (std::shared_ptr old, std::shared_ptr sub, ProcessorStreams* err) { /* these can never be removed */ if (is_internal_processor (old)) { @@ -1557,7 +1558,7 @@ Route::replace_processor (boost::shared_ptr old, boost::shared_ptr (old) || boost::dynamic_pointer_cast (sub)) { + if (std::dynamic_pointer_cast (old) || std::dynamic_pointer_cast (sub)) { return 1; } @@ -1603,8 +1604,8 @@ Route::replace_processor (boost::shared_ptr old, boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(sub)) != 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(sub)) != 0) { pi->set_strict_io (true); } } @@ -1618,8 +1619,8 @@ Route::replace_processor (boost::shared_ptr old, boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { if (pi->has_no_inputs ()) { _have_internal_generator = true; break; @@ -1660,7 +1661,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams* ProcessorState pstate (this); ProcessorList::iterator i; - boost::shared_ptr processor; + std::shared_ptr processor; for (i = _processors.begin(); i != _processors.end(); ) { @@ -1685,8 +1686,8 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams* run. */ - boost::shared_ptr iop = boost::dynamic_pointer_cast(processor); - boost::shared_ptr pi = boost::dynamic_pointer_cast(processor); + std::shared_ptr iop = std::dynamic_pointer_cast(processor); + std::shared_ptr pi = std::dynamic_pointer_cast(processor); if (pi != 0) { assert (iop == 0); iop = pi->sidechain(); @@ -1696,7 +1697,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams* iop->disconnect (); } - if (boost::dynamic_pointer_cast(processor)) { + if (std::dynamic_pointer_cast(processor)) { routing_processor_removed = true; } @@ -1720,9 +1721,9 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams* _have_internal_generator = false; for (i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi; + std::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { if (pi->has_no_inputs ()) { _have_internal_generator = true; break; @@ -1759,7 +1760,7 @@ Route::stop_triggers (bool now) void Route::reset_instrument_info () { - boost::shared_ptr instr = the_instrument(); + std::shared_ptr instr = the_instrument(); if (!instr) { _instrument_fanned_out = false; } @@ -1811,15 +1812,15 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err) for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++index) { - if (boost::dynamic_pointer_cast (*p)) { + if (std::dynamic_pointer_cast (*p)) { /* disk-reader has the same i/o as disk-writer */ in = max (in, disk_io); } if ((*p)->can_support_io_configuration(in, out)) { - if (boost::dynamic_pointer_cast (*p) - && boost::dynamic_pointer_cast (*p)->role() == Delivery::Main + if (std::dynamic_pointer_cast (*p) + && std::dynamic_pointer_cast (*p)->role() == Delivery::Main && !is_auditioner() && (is_monitor() || _strict_io || Profile->get_mixbus ())) { /* with strict I/O the panner + output are forced to @@ -1869,12 +1870,12 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err) */ DEBUG_TRACE (DEBUG::Processors, "Monitor: Channel configuration change.\n"); } - if (boost::dynamic_pointer_cast (*p)) { + if (std::dynamic_pointer_cast (*p)) { // internal sends make no sense, only feedback DEBUG_TRACE (DEBUG::Processors, "Monitor: No Sends allowed.\n"); return list > (); } - if (boost::dynamic_pointer_cast (*p)) { + if (std::dynamic_pointer_cast (*p)) { /* External Sends can be problematic. one can add/remove ports * there signal leaves the DAW to external monitors anyway, so there's * no real use for allowing them here anyway. @@ -1882,14 +1883,14 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err) DEBUG_TRACE (DEBUG::Processors, "Monitor: No External Sends allowed.\n"); return list > (); } - if (boost::dynamic_pointer_cast (*p)) { + if (std::dynamic_pointer_cast (*p)) { // ditto DEBUG_TRACE (DEBUG::Processors, "Monitor: No Sends allowed.\n"); return list > (); } } - if (boost::dynamic_pointer_cast (*p)) { + if (std::dynamic_pointer_cast (*p)) { assert (in == out); disk_io = out; } @@ -1983,28 +1984,28 @@ Route::configure_processors_unlocked (ProcessorStreams* err, Glib::Threads::RWLo processor_max_streams = ChanCount::max(processor_max_streams, c->first); processor_max_streams = ChanCount::max(processor_max_streams, c->second); - boost::shared_ptr iop; - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*p)) != 0) { + std::shared_ptr iop; + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(*p)) != 0) { /* plugins connected via Split or Hide Match may have more channels. * route/scratch buffers are needed for all of them * The configuration may only be a subset (both input and output) */ processor_max_streams = ChanCount::max(processor_max_streams, pi->required_buffers()); } - else if ((iop = boost::dynamic_pointer_cast(*p)) != 0) { + else if ((iop = std::dynamic_pointer_cast(*p)) != 0) { processor_max_streams = ChanCount::max(processor_max_streams, iop->natural_input_streams()); processor_max_streams = ChanCount::max(processor_max_streams, iop->natural_output_streams()); } - else if (boost::dynamic_pointer_cast(*p) != 0) { + else if (std::dynamic_pointer_cast(*p) != 0) { /* TB sidechain control input */ processor_max_streams = ChanCount::max(processor_max_streams, c->first + ChanCount (DataType::MIDI, 1)); } out = c->second; - if (boost::dynamic_pointer_cast (*p) - && boost::dynamic_pointer_cast (*p)->role() == Delivery::Main) { + if (std::dynamic_pointer_cast (*p) + && std::dynamic_pointer_cast (*p)->role() == Delivery::Main) { /* main delivery will increase port count to match input. * the Delivery::Main is usually the last processor - followed only by * 'MeterOutput'. @@ -2050,7 +2051,8 @@ Route::all_visible_processors_active (bool state) if (!(*i)->display_to_user () || is_internal_processor (*i)) { continue; } - boost::shared_ptr pi; + + std::shared_ptr pi; if (0 != (pi = boost::dynamic_pointer_cast(*i))) { if (pi->is_channelstrip ()) { continue; @@ -2191,13 +2193,13 @@ Route::apply_processor_order (const ProcessorList& new_order) */ bool need_latency_recompute = false; for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { need_latency_recompute = true; break; - } else if (boost::dynamic_pointer_cast (*i)) { + } else if (std::dynamic_pointer_cast (*i)) { need_latency_recompute = true; break; - } else if (boost::shared_ptr pi = boost::dynamic_pointer_cast (*i)) { + } else if (std::shared_ptr pi = std::dynamic_pointer_cast (*i)) { if (pi->sidechain_input ()) { need_latency_recompute = true; break; @@ -2222,9 +2224,9 @@ Route::move_instrument_down (bool postfader) { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); ProcessorList new_order; - boost::shared_ptr instrument; + std::shared_ptr instrument; for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi = boost::dynamic_pointer_cast(*i); + std::shared_ptr pi = std::dynamic_pointer_cast(*i); if (pi && pi->plugin ()->get_info ()->is_instrument ()) { instrument = *i; } else if (instrument && *i == _amp) { @@ -2314,14 +2316,14 @@ Route::reorder_processors (const ProcessorList& new_order, ProcessorStreams* err } bool -Route::add_remove_sidechain (boost::shared_ptr proc, bool add) +Route::add_remove_sidechain (std::shared_ptr proc, bool add) { if (_session.actively_recording () || _in_sidechain_setup) { return false; } - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(proc)) == 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(proc)) == 0) { return false; } @@ -2386,14 +2388,14 @@ Route::add_remove_sidechain (boost::shared_ptr proc, bool add) } bool -Route::plugin_preset_output (boost::shared_ptr proc, ChanCount outs) +Route::plugin_preset_output (std::shared_ptr proc, ChanCount outs) { if (_session.actively_recording ()) { return false; } - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(proc)) == 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(proc)) == 0) { return false; } @@ -2429,20 +2431,20 @@ Route::plugin_preset_output (boost::shared_ptr proc, ChanCount outs) } bool -Route::reset_plugin_insert (boost::shared_ptr proc) +Route::reset_plugin_insert (std::shared_ptr proc) { ChanCount unused; return customize_plugin_insert (proc, 0, unused, unused); } bool -Route::customize_plugin_insert (boost::shared_ptr proc, uint32_t count, ChanCount outs, ChanCount sinks) +Route::customize_plugin_insert (std::shared_ptr proc, uint32_t count, ChanCount outs, ChanCount sinks) { if (_session.actively_recording ()) { return false; } - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(proc)) == 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(proc)) == 0) { return false; } @@ -2500,8 +2502,8 @@ Route::set_strict_io (const bool enable) _strict_io = enable; Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p) { - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*p)) != 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(*p)) != 0) { pi->set_strict_io (_strict_io); } } @@ -2512,8 +2514,8 @@ Route::set_strict_io (const bool enable) // not possible _strict_io = !enable; // restore old value for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p) { - boost::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*p)) != 0) { + std::shared_ptr pi; + if ((pi = std::dynamic_pointer_cast(*p)) != 0) { pi->set_strict_io (_strict_io); } } @@ -2632,9 +2634,9 @@ Route::state (bool save_template) const the monitor section, because these will always be added if necessary. */ - boost::shared_ptr is; + std::shared_ptr is; - if ((is = boost::dynamic_pointer_cast (p)) != 0) { + if ((is = std::dynamic_pointer_cast (p)) != 0) { if (is->role() == Delivery::Listen) { continue; } @@ -2649,7 +2651,7 @@ Route::state (bool save_template) const } if (_custom_meter_position_noted) { - boost::shared_ptr after = _processor_after_last_custom_meter.lock (); + std::shared_ptr after = _processor_after_last_custom_meter.lock (); if (after) { node->set_property (X_("processor-after-last-custom-meter"), after->id()); } @@ -2785,7 +2787,7 @@ Route::set_state (const XMLNode& node, int version) } else { _volume->set_display_to_user (true); _volume->activate (); - main_outs()->set_gain_control (boost::shared_ptr ()); + main_outs()->set_gain_control (std::shared_ptr ()); } } @@ -2864,7 +2866,7 @@ Route::set_state (const XMLNode& node, int version) } else { Evoral::Parameter p = EventTypeMap::instance().from_symbol (control_name); if (p.type () >= MidiCCAutomation && p.type () < MidiSystemExclusiveAutomation) { - boost::shared_ptr ac = automation_control (p, true); + std::shared_ptr ac = automation_control (p, true); if (ac) { ac->set_state (*child, version); } @@ -3228,9 +3230,9 @@ Route::set_processor_state (const XMLNode& node, int version) (*i)->set_owner (this); (*i)->ActiveChanged.connect_same_thread (**i, boost::bind (&Session::queue_latency_recompute, &_session)); - boost::shared_ptr pi; + std::shared_ptr pi; - if ((pi = boost::dynamic_pointer_cast(*i)) != 0) { + if ((pi = std::dynamic_pointer_cast(*i)) != 0) { if (pi->has_no_inputs ()) { _have_internal_generator = true; break; @@ -3264,11 +3266,11 @@ Route::set_processor_state (XMLNode const& node, int version, XMLProperty const* if (o == _processors.end()) { - boost::shared_ptr processor; + std::shared_ptr processor; if (prop->value() == "intsend") { - processor.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast(shared_from_this()), boost::shared_ptr(), Delivery::Aux, true)); + processor.reset (new InternalSend (_session, _pannable, _mute_master, std::dynamic_pointer_cast(shared_from_this()), std::shared_ptr(), Delivery::Aux, true)); } else if (prop->value() == "ladspa" || prop->value() == "Ladspa" || prop->value() == "lv2" || @@ -3293,8 +3295,8 @@ Route::set_processor_state (XMLNode const& node, int version, XMLProperty const* } else if (prop->value() == "send") { processor.reset (new Send (_session, _pannable, _mute_master, Delivery::Send, true)); - boost::shared_ptr send = boost::dynamic_pointer_cast (processor); - send->SelfDestruct.connect_same_thread (*send, boost::bind (&Route::processor_selfdestruct, this, boost::weak_ptr (processor))); + std::shared_ptr send = std::dynamic_pointer_cast (processor); + send->SelfDestruct.connect_same_thread (*send, boost::bind (&Route::processor_selfdestruct, this, std::weak_ptr (processor))); if (send->output()) { send->output()->changed.connect_same_thread (*send, boost::bind (&Route::output_change_handler, this, _1, _2)); } @@ -3311,7 +3313,7 @@ Route::set_processor_state (XMLNode const& node, int version, XMLProperty const* /* set strict I/O only after loading plugin state, because * individual plugins may override this */ - boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); + std::shared_ptr pi = std::dynamic_pointer_cast (processor); if (pi && _strict_io) { pi->set_strict_io (true); } @@ -3324,7 +3326,7 @@ Route::set_processor_state (XMLNode const& node, int version, XMLProperty const* /* we have to note the monitor send here, otherwise a new one will be created and the state of this one will be lost. */ - boost::shared_ptr isend = boost::dynamic_pointer_cast (processor); + std::shared_ptr isend = std::dynamic_pointer_cast (processor); if (isend && isend->role() == Delivery::Listen) { _monitor_send = isend; } @@ -3367,9 +3369,9 @@ Route::silence_unlocked (pframes_t nframes) } for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi; + std::shared_ptr pi; - if (!_active && (pi = boost::dynamic_pointer_cast (*i)) != 0) { + if (!_active && (pi = std::dynamic_pointer_cast (*i)) != 0) { /* evaluate automated automation controls */ pi->automation_run (now, nframes); /* skip plugins, they don't need anything when we're not active */ @@ -3395,7 +3397,7 @@ Route::add_send_to_internal_return (InternalSend* send) Glib::Threads::RWLock::ReaderLock rm (_processor_lock); for (ProcessorList::const_iterator x = _processors.begin(); x != _processors.end(); ++x) { - boost::shared_ptr d = boost::dynamic_pointer_cast(*x); + std::shared_ptr d = std::dynamic_pointer_cast(*x); if (d) { return d->add_send (send); @@ -3409,7 +3411,7 @@ Route::remove_send_from_internal_return (InternalSend* send) Glib::Threads::RWLock::ReaderLock rm (_processor_lock); for (ProcessorList::const_iterator x = _processors.begin(); x != _processors.end(); ++x) { - boost::shared_ptr d = boost::dynamic_pointer_cast(*x); + std::shared_ptr d = std::dynamic_pointer_cast(*x); if (d) { return d->remove_send (send); @@ -3429,7 +3431,7 @@ Route::enable_monitor_send () /* make sure we have one */ if (!_monitor_send) { - _monitor_send.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast(shared_from_this()), _session.monitor_out(), Delivery::Listen)); + _monitor_send.reset (new InternalSend (_session, _pannable, _mute_master, std::dynamic_pointer_cast(shared_from_this()), _session.monitor_out(), Delivery::Listen)); _monitor_send->set_display_to_user (false); } @@ -3442,7 +3444,7 @@ Route::enable_monitor_send () * @param before Processor to insert before, or 0 to insert at the end. */ int -Route::add_aux_send (boost::shared_ptr route, boost::shared_ptr before) +Route::add_aux_send (std::shared_ptr route, std::shared_ptr before) { assert (route != _session.monitor_out ()); @@ -3451,7 +3453,7 @@ Route::add_aux_send (boost::shared_ptr route, boost::shared_ptr d = boost::dynamic_pointer_cast (*x); + std::shared_ptr d = std::dynamic_pointer_cast (*x); if (d && d->target_route() == route) { /* already listening via the specified IO: do nothing */ @@ -3462,11 +3464,11 @@ Route::add_aux_send (boost::shared_ptr route, boost::shared_ptr listener; + std::shared_ptr listener; { Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); - listener.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast(shared_from_this()), route, Delivery::Aux)); + listener.reset (new InternalSend (_session, _pannable, _mute_master, std::dynamic_pointer_cast(shared_from_this()), route, Delivery::Aux)); } add_processor (listener, before); @@ -3479,10 +3481,10 @@ Route::add_aux_send (boost::shared_ptr route, boost::shared_ptr route, bool post_fader) +Route::add_foldback_send (std::shared_ptr route, bool post_fader) { assert (route != _session.monitor_out ()); - boost::shared_ptr before; + std::shared_ptr before; if (post_fader) { before = before_processor_for_placement (PostFader); } else { @@ -3494,7 +3496,7 @@ Route::add_foldback_send (boost::shared_ptr route, bool post_fader) for (ProcessorList::iterator x = _processors.begin(); x != _processors.end(); ++x) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*x); + std::shared_ptr d = std::dynamic_pointer_cast (*x); if (d && d->target_route() == route) { /* already listening via the specified IO: do nothing */ @@ -3505,11 +3507,11 @@ Route::add_foldback_send (boost::shared_ptr route, bool post_fader) try { - boost::shared_ptr listener; + std::shared_ptr listener; { Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); - listener.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast(shared_from_this()), route, Delivery::Foldback)); + listener.reset (new InternalSend (_session, _pannable, _mute_master, std::dynamic_pointer_cast(shared_from_this()), route, Delivery::Foldback)); } listener->panner_shell()->set_linked_to_route (false); @@ -3557,8 +3559,8 @@ Route::all_inputs () const Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr iop = boost::dynamic_pointer_cast(*r); - boost::shared_ptr pi = boost::dynamic_pointer_cast(*r); + std::shared_ptr iop = std::dynamic_pointer_cast(*r); + std::shared_ptr pi = std::dynamic_pointer_cast(*r); if (pi != 0) { assert (iop == 0); iop = pi->sidechain(); @@ -3578,7 +3580,7 @@ Route::all_outputs () const // _output is included via Delivery Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr iop = boost::dynamic_pointer_cast(*r); + std::shared_ptr iop = std::dynamic_pointer_cast(*r); if (iop != 0 && iop->output()) { ios.push_back (iop->output()); } @@ -3587,9 +3589,9 @@ Route::all_outputs () const } bool -Route::direct_feeds_according_to_reality (boost::shared_ptr node, bool* via_send_only) +Route::direct_feeds_according_to_reality (std::shared_ptr node, bool* via_send_only) { - boost::shared_ptr other (boost::dynamic_pointer_cast (node)); + std::shared_ptr other (std::dynamic_pointer_cast (node)); assert (other); IOVector const& other_inputs (other->all_inputs()); @@ -3608,15 +3610,15 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr node, boo for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) { - boost::shared_ptr iop = boost::dynamic_pointer_cast(*r); - boost::shared_ptr pi = boost::dynamic_pointer_cast(*r); + std::shared_ptr iop = std::dynamic_pointer_cast(*r); + std::shared_ptr pi = std::dynamic_pointer_cast(*r); if (pi != 0) { assert (iop == 0); iop = pi->sidechain(); } if (iop != 0) { - boost::shared_ptr iop_out = iop->output(); + std::shared_ptr iop_out = iop->output(); if (other.get() == this && iop_out && iop->input() && iop_out->connected_to (iop->input())) { // TODO this needs a delaylines in the Insert to align connections (!) DEBUG_TRACE (DEBUG::Graph, string_compose ("\tIOP %1 does feed its own return (%2)\n", iop->name(), other->name())); @@ -3639,23 +3641,23 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr node, boo } bool -Route::direct_feeds_according_to_graph (boost::shared_ptr other, bool* via_send_only) +Route::direct_feeds_according_to_graph (std::shared_ptr other, bool* via_send_only) { - return _session._current_route_graph.has (boost::dynamic_pointer_cast (shared_from_this ()), other, via_send_only); + return _session._current_route_graph.has (std::dynamic_pointer_cast (shared_from_this ()), other, via_send_only); } bool -Route::feeds (boost::shared_ptr other) +Route::feeds (std::shared_ptr other) { - return _session._current_route_graph.feeds (boost::dynamic_pointer_cast (shared_from_this ()), other); + return _session._current_route_graph.feeds (std::dynamic_pointer_cast (shared_from_this ()), other); } -std::set> +std::set> Route::signal_sources (bool via_sends_only) { - std::set> rv; - for (auto const& i : _session._current_route_graph.to (boost::dynamic_pointer_cast (shared_from_this ()), via_sends_only)) { - boost::shared_ptr r = boost::dynamic_pointer_cast (i); + std::set> rv; + for (auto const& i : _session._current_route_graph.to (std::dynamic_pointer_cast (shared_from_this ()), via_sends_only)) { + std::shared_ptr r = std::dynamic_pointer_cast (i); if (r) { rv.insert (r); } @@ -3686,7 +3688,7 @@ Route::output_effectively_connected_real () const } /* now follow connections downstream */ - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { Route* rp = (*i).get(); if (rp == this) { @@ -3765,13 +3767,13 @@ Route::input_change_handler (IOChange change, void * /*src*/) if (_solo_control->soloed_by_others_upstream() || _solo_isolate_control->solo_isolated_by_upstream()) { int sbou = 0; int ibou = 0; - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); if (_input->connected()) { for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) { continue; } - if ((*i)->direct_feeds_according_to_reality (boost::dynamic_pointer_cast (shared_from_this()))) { + if ((*i)->direct_feeds_according_to_reality (std::dynamic_pointer_cast (shared_from_this()))) { if ((*i)->soloed()) { ++sbou; } @@ -3864,7 +3866,7 @@ Route::output_change_handler (IOChange change, void * /*src*/) * ideally the input_change_handler() of the other route * would propagate the change to us. */ - boost::shared_ptr routes = _session.get_routes (); + std::shared_ptr routes = _session.get_routes (); if (_output->connected()) { for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) { @@ -3885,7 +3887,7 @@ Route::output_change_handler (IOChange change, void * /*src*/) _solo_control->mod_solo_by_others_downstream (delta); // Session::route_solo_changed() does not propagate indirect solo-changes // propagate upstream to tracks - boost::shared_ptr shared_this = boost::dynamic_pointer_cast (shared_from_this()); + std::shared_ptr shared_this = std::dynamic_pointer_cast (shared_from_this()); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i).get() == this || !can_solo()) { continue; @@ -3924,11 +3926,11 @@ void Route::flush_processor_buffers_locked (samplecnt_t nframes) { for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*i); + std::shared_ptr d = std::dynamic_pointer_cast (*i); if (d) { d->flush_buffers (nframes); } else { - boost::shared_ptr p = boost::dynamic_pointer_cast (*i); + std::shared_ptr p = std::dynamic_pointer_cast (*i); if (p) { p->flush_buffers (nframes); } @@ -4071,7 +4073,7 @@ Route::update_send_delaylines () { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::shared_ptr snd = boost::dynamic_pointer_cast (*i)) { + if (std::shared_ptr snd = std::dynamic_pointer_cast (*i)) { snd->update_delaylines (true); } } @@ -4164,7 +4166,7 @@ Route::emit_pending_signals () while (!selfdestruct_sequence.empty ()) { Glib::Threads::Mutex::Lock lx (selfdestruct_lock); if (selfdestruct_sequence.empty ()) { break; } // re-check with lock - boost::shared_ptr proc = selfdestruct_sequence.back ().lock (); + std::shared_ptr proc = selfdestruct_sequence.back ().lock (); selfdestruct_sequence.pop_back (); lx.release (); if (proc) { @@ -4230,7 +4232,7 @@ Route::set_meter_point_unlocked () _meter->set_display_to_user (true); /* If we have a previous position for the custom meter, try to put it there */ - boost::shared_ptr after = _processor_after_last_custom_meter.lock (); + std::shared_ptr after = _processor_after_last_custom_meter.lock (); if (after) { ProcessorList::iterator i = find (_processors.begin(), _processors.end(), after); if (i != _processors.end ()) { @@ -4328,7 +4330,7 @@ Route::listen_position_changed () _session.set_dirty (); } -boost::shared_ptr +std::shared_ptr Route::add_export_point() { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); @@ -4357,10 +4359,10 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne /* mark all send are inactive, set internal-return "delay-out" to zero. */ Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::shared_ptr snd = boost::dynamic_pointer_cast (*i)) { + if (std::shared_ptr snd = std::dynamic_pointer_cast (*i)) { snd->set_delay_in (0); } - if (boost::shared_ptr rtn = boost::dynamic_pointer_cast (*i)) { + if (std::shared_ptr rtn = std::dynamic_pointer_cast (*i)) { rtn->set_playback_offset (0); } // TODO sidechain inputs?! @@ -4395,12 +4397,12 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne samplecnt_t l_in = 0; samplecnt_t l_out = 0; for (ProcessorList::reverse_iterator i = _processors.rbegin(); i != _processors.rend(); ++i) { - if (boost::shared_ptr snd = boost::dynamic_pointer_cast (*i)) { + if (std::shared_ptr snd = std::dynamic_pointer_cast (*i)) { snd->set_delay_in (l_out + _output_latency); } - if (boost::shared_ptr pi = boost::dynamic_pointer_cast (*i)) { - if (boost::shared_ptr pio = pi->sidechain_input ()) { + if (std::shared_ptr pi = std::dynamic_pointer_cast (*i)) { + if (std::shared_ptr pio = pi->sidechain_input ()) { samplecnt_t lat = l_out + _output_latency; pio->set_private_port_latencies (lat, true); pio->set_public_port_latencies (lat, true); @@ -4419,7 +4421,7 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { /* set sidechain, send and insert port latencies */ - if (boost::shared_ptr pi = boost::dynamic_pointer_cast (*i)) { + if (std::shared_ptr pi = std::dynamic_pointer_cast (*i)) { if (pi->input ()) { /* propagate playback latency from output to input */ pi->input ()->set_private_port_latencies (play_lat_out + l_in, true); @@ -4429,7 +4431,7 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne pi->output ()->set_private_port_latencies (capt_lat_in + l_in, false); } - } else if (boost::shared_ptr snd = boost::dynamic_pointer_cast (*i)) { + } else if (std::shared_ptr snd = std::dynamic_pointer_cast (*i)) { if (snd->output ()) { /* set capture latency */ snd->output ()->set_private_port_latencies (capt_lat_in + l_in, false); @@ -4442,7 +4444,7 @@ Route::update_signal_latency (bool apply_to_delayline, bool* delayline_update_ne *delayline_update_needed = true; } } - } else if (!apply_to_delayline && boost::dynamic_pointer_cast (*i)) { + } else if (!apply_to_delayline && std::dynamic_pointer_cast (*i)) { /* InternalReturn::set_playback_offset() calls set_delay_out(), requires process lock */ const samplecnt_t poff = _signal_latency + _output_latency; if (delayline_update_needed && (*i)->playback_offset () != poff) { @@ -4535,11 +4537,11 @@ Route::shift (timepos_t const & pos, timecnt_t const & distance) ControllableSet acs; automatables (acs); for (auto& ec : acs) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (ec); + std::shared_ptr ac = std::dynamic_pointer_cast (ec); if (!ac) { continue; } - boost::shared_ptr al = ac->alist(); + std::shared_ptr al = ac->alist(); if (!al || al->empty ()) { continue; } @@ -4557,17 +4559,17 @@ Route::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos_t ControllableSet acs; automatables (acs); for (auto& ec : acs) { - boost::shared_ptr ac = boost::dynamic_pointer_cast (ec); + std::shared_ptr ac = std::dynamic_pointer_cast (ec); if (!ac) { continue; } - boost::shared_ptr al = ac->alist(); + std::shared_ptr al = ac->alist(); if (!al || al->empty ()) { continue; } XMLNode &before = al->get_state (); - boost::shared_ptr cl = copy ? al->copy (start, end) : al->cut (start, end); + std::shared_ptr cl = copy ? al->copy (start, end) : al->cut (start, end); if (!copy) { /* remove time (negative distance), ripple */ al->shift (start, end.distance (start)); @@ -4582,10 +4584,10 @@ Route::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos_t } void -Route::set_plugin_state_dir (boost::weak_ptr p, const std::string& d) +Route::set_plugin_state_dir (std::weak_ptr p, const std::string& d) { - boost::shared_ptr processor (p.lock ()); - boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); + std::shared_ptr processor (p.lock ()); + std::shared_ptr pi = std::dynamic_pointer_cast (processor); if (!pi) { return; } @@ -4641,7 +4643,7 @@ Route::set_name (const string& str) SessionObject::set_name (newname); for (uint32_t n = 0 ; ; ++n) { - boost::shared_ptr pi = boost::static_pointer_cast (nth_plugin (n)); + std::shared_ptr pi = std::static_pointer_cast (nth_plugin (n)); if (!pi) { break; } @@ -4696,22 +4698,22 @@ Route::set_name_in_state (XMLNode& node, string const & name) } } -boost::shared_ptr -Route::internal_send_for (boost::shared_ptr target) const +std::shared_ptr +Route::internal_send_for (std::shared_ptr target) const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr send; + std::shared_ptr send; - if ((send = boost::dynamic_pointer_cast(*i)) != 0) { + if ((send = std::dynamic_pointer_cast(*i)) != 0) { if (send->target_route() == target) { return send; } } } - return boost::shared_ptr(); + return std::shared_ptr(); } void @@ -4754,44 +4756,44 @@ Route::set_active (bool yn, void* src) } } -boost::shared_ptr +std::shared_ptr Route::pannable() const { return _pannable; } -boost::shared_ptr +std::shared_ptr Route::panner() const { /* may be null ! */ return _main_outs->panner_shell()->panner(); } -boost::shared_ptr +std::shared_ptr Route::panner_shell() const { return _main_outs->panner_shell(); } -boost::shared_ptr +std::shared_ptr Route::gain_control() const { return _gain_control; } -boost::shared_ptr +std::shared_ptr Route::trim_control() const { return _trim_control; } -boost::shared_ptr +std::shared_ptr Route::volume_control() const { return _volume_control; } -boost::shared_ptr +std::shared_ptr Route::phase_control() const { return _phase_control; @@ -4817,18 +4819,18 @@ Route::set_volume_applies_to_output (bool en) _volume->set_display_to_user (true); add_processor (_volume, PostFader, NULL, true); _volume->activate (); - main_outs()->set_gain_control (boost::shared_ptr ()); + main_outs()->set_gain_control (std::shared_ptr ()); } _volume_applies_to_output = en; _session.set_dirty (); } -boost::shared_ptr +std::shared_ptr Route::get_control (const Evoral::Parameter& param) { /* either we own the control or .... */ - boost::shared_ptr c = boost::dynamic_pointer_cast(control (param)); + std::shared_ptr c = std::dynamic_pointer_cast(control (param)); if (!c) { @@ -4836,7 +4838,7 @@ Route::get_control (const Evoral::Parameter& param) Glib::Threads::RWLock::ReaderLock rm (_processor_lock); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - if ((c = boost::dynamic_pointer_cast((*i)->control (param))) != 0) { + if ((c = std::dynamic_pointer_cast((*i)->control (param))) != 0) { break; } } @@ -4846,38 +4848,38 @@ Route::get_control (const Evoral::Parameter& param) /* nobody does so we'll make a new one */ - c = boost::dynamic_pointer_cast(control_factory(param)); + c = std::dynamic_pointer_cast(control_factory(param)); add_control(c); } return c; } -boost::shared_ptr +std::shared_ptr Route::nth_plugin (uint32_t n) const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); ProcessorList::const_iterator i; for (i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { if (n-- == 0) { return *i; } } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr Route::nth_send (uint32_t n) const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); ProcessorList::const_iterator i; for (i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { if ((*i) == _monitor_send) { /* send to monitor section is not considered @@ -4892,7 +4894,7 @@ Route::nth_send (uint32_t n) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } bool @@ -4902,7 +4904,7 @@ Route::has_io_processor_named (const string& name) ProcessorList::iterator i; for (i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { if (0 == PBD::natcmp ((*i)->name().c_str(), name.c_str())) { return true; } @@ -4970,7 +4972,7 @@ Route::unknown_processors () const Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { p.push_back ((*i)->name ()); } } @@ -5093,7 +5095,7 @@ Route::set_public_port_latencies (samplecnt_t value, bool playback, bool with_la /* publish private latencies */ Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr iop = boost::dynamic_pointer_cast(*i); + std::shared_ptr iop = std::dynamic_pointer_cast(*i); if (!iop) { continue; } @@ -5155,11 +5157,11 @@ Route::setup_invisible_processors () /* find visible processors */ for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr auxsnd = boost::dynamic_pointer_cast ((*i)); + std::shared_ptr auxsnd = std::dynamic_pointer_cast ((*i)); #ifdef HAVE_BEATBOX /* XXX temporary hack while we decide on visibility */ - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { continue; } #endif @@ -5442,7 +5444,7 @@ Route::unpan () _pannable.reset (); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast(*i); + std::shared_ptr d = std::dynamic_pointer_cast(*i); if (d) { d->unpan (); } @@ -5477,7 +5479,7 @@ Route::maybe_note_meter_position () _processor_after_last_custom_meter = *i; break; } - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { if (!seen_trim) { _processor_after_last_custom_meter = _trim; } else { @@ -5492,7 +5494,7 @@ Route::maybe_note_meter_position () assert(_processor_after_last_custom_meter.lock()); } -boost::shared_ptr +std::shared_ptr Route::processor_by_id (PBD::ID id) const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); @@ -5502,11 +5504,11 @@ Route::processor_by_id (PBD::ID id) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } bool -Route::can_freeze_processor (boost::shared_ptr p, bool allow_routing) const +Route::can_freeze_processor (std::shared_ptr p, bool allow_routing) const { /* ignore inactive processors and obviously ignore the main * outs since everything has them and we don't care. @@ -5519,11 +5521,11 @@ Route::can_freeze_processor (boost::shared_ptr p, bool allow_routing) return allow_routing; } - if (boost::dynamic_pointer_cast(p)) { + if (std::dynamic_pointer_cast(p)) { return false; } - boost::shared_ptr pi = boost::dynamic_pointer_cast(p); + std::shared_ptr pi = std::dynamic_pointer_cast(p); if (pi && pi->has_sidechain () && pi->sidechain_input () && pi->sidechain_input ()->connected()) { return false; } @@ -5543,23 +5545,23 @@ Route::has_external_redirects () const return false; } -boost::shared_ptr +std::shared_ptr Route::the_instrument () const { Glib::Threads::RWLock::ReaderLock lm (_processor_lock); return the_instrument_unlocked (); } -boost::shared_ptr +std::shared_ptr Route::the_instrument_unlocked () const { for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr pi = boost::dynamic_pointer_cast(*i); + std::shared_ptr pi = std::dynamic_pointer_cast(*i); if (pi && pi->plugin ()->get_info ()->is_instrument ()) { return (*i); } } - return boost::shared_ptr(); + return std::shared_ptr(); } bool @@ -5594,7 +5596,7 @@ Route::non_realtime_locate (samplepos_t pos) } void -Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr io, pframes_t nframes) +Route::fill_buffers_with_input (BufferSet& bufs, std::shared_ptr io, pframes_t nframes) { size_t n_buffers; size_t i; @@ -5609,7 +5611,7 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr io, pfram for (i = 0; i < n_buffers; ++i) { - boost::shared_ptr source_port = io->midi (i); + std::shared_ptr source_port = io->midi (i); MidiBuffer& buf (bufs.get_midi (i)); if (source_port) { @@ -5636,7 +5638,7 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr io, pfram * in a round-robin fashion */ - boost::shared_ptr source_port = io->audio (i); + std::shared_ptr source_port = io->audio (i); AudioBuffer& buf (bufs.get_audio (i%n_buffers)); if (i < n_buffers) { @@ -5682,20 +5684,20 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr io, pfram } } -boost::shared_ptr +std::shared_ptr Route::pan_azimuth_control() const { if (!_pannable || !panner()) { - return boost::shared_ptr(); + return std::shared_ptr(); } return _pannable->pan_azimuth_control; } -boost::shared_ptr +std::shared_ptr Route::pan_elevation_control() const { if (Profile->get_mixbus() || !_pannable || !panner()) { - return boost::shared_ptr(); + return std::shared_ptr(); } set c = pannable()->what_can_be_automated (); @@ -5703,14 +5705,14 @@ Route::pan_elevation_control() const if (c.find (PanElevationAutomation) != c.end()) { return _pannable->pan_elevation_control; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr Route::pan_width_control() const { if (Profile->get_mixbus() || !_pannable || !panner()) { - return boost::shared_ptr(); + return std::shared_ptr(); } set c = pannable()->what_can_be_automated (); @@ -5718,14 +5720,14 @@ Route::pan_width_control() const if (c.find (PanWidthAutomation) != c.end()) { return _pannable->pan_width_control; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr Route::pan_frontback_control() const { if (Profile->get_mixbus() || !_pannable || !panner()) { - return boost::shared_ptr(); + return std::shared_ptr(); } set c = pannable()->what_can_be_automated (); @@ -5733,14 +5735,14 @@ Route::pan_frontback_control() const if (c.find (PanFrontBackAutomation) != c.end()) { return _pannable->pan_frontback_control; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr Route::pan_lfe_control() const { if (Profile->get_mixbus() || !_pannable || !panner()) { - return boost::shared_ptr(); + return std::shared_ptr(); } set c = pannable()->what_can_be_automated (); @@ -5748,7 +5750,7 @@ Route::pan_lfe_control() const if (c.find (PanLFEAutomation) != c.end()) { return _pannable->pan_lfe_control; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -5759,51 +5761,45 @@ Route::eq_band_cnt () const return 0; } -boost::shared_ptr +std::shared_ptr Route::eq_gain_controllable (uint32_t band) const { return boost::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::eq_freq_controllable (uint32_t band) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::eq_q_controllable (uint32_t band) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::eq_shape_controllable (uint32_t band) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr -Route::eq_enable_controllable () const -{ - return boost::shared_ptr(); -} - -boost::shared_ptr +std::shared_ptr Route::filter_freq_controllable (bool hpf) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::filter_slope_controllable (bool) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::filter_enable_controllable (bool) const { - return boost::shared_ptr(); + return std::shared_ptr(); } std::string @@ -5821,37 +5817,43 @@ Route::tape_drive_controllable () const boost::shared_ptr Route::tape_drive_mode_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr +Route::tape_drive_controllable () const +{ + return std::shared_ptr(); +} + +std::shared_ptr Route::tape_drive_mtr_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::master_correlation_mtr_controllable (bool mm) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::master_limiter_enable_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::master_limiter_mtr_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::master_k_mtr_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } string @@ -5860,67 +5862,68 @@ Route::eq_band_name (uint32_t band) const return string (); } -boost::shared_ptr +std::shared_ptr Route::comp_enable_controllable () const { - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_threshold_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_speed_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_mode_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_makeup_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_ratio_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_attack_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_release_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_key_filter_freq_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_lookahead_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_meter_controllable () const -{ - return boost::shared_ptr(); -} -boost::shared_ptr -Route::comp_redux_controllable () const -{ - return boost::shared_ptr(); + return std::shared_ptr(); } +std::shared_ptr +Route::comp_threshold_controllable () const +{ + return std::shared_ptr(); +} + +std::shared_ptr +Route::comp_speed_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_mode_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_makeup_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_ratio_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_attack_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_release_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_key_filter_freq_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_lookahead_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_meter_controllable () const +{ + return std::shared_ptr(); +} +std::shared_ptr +Route::comp_redux_controllable () const +{ + return std::shared_ptr(); +} string Route::comp_mode_name (uint32_t mode) const { @@ -5939,104 +5942,104 @@ Route::gate_mode_name (uint32_t mode) const return _("???"); } -boost::shared_ptr +std::shared_ptr Route::gate_enable_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_mode_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_ratio_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_knee_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_threshold_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_depth_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_hysteresis_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_hold_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_attack_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_release_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_key_listen_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_key_filter_enable_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_key_filter_freq_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_lookahead_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_meter_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::gate_redux_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::send_pan_azimuth_controllable (uint32_t n) const { - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::send_level_controllable (uint32_t n) const { - boost::shared_ptr s = boost::dynamic_pointer_cast(nth_send (n)); + std::shared_ptr s = boost::dynamic_pointer_cast(nth_send (n)); if (s) { return s->gain_control (); } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::send_enable_controllable (uint32_t n) const { /* although Ardour sends have enable/disable as part of the Processor @@ -6044,29 +6047,29 @@ Route::send_enable_controllable (uint32_t n) const * * XXX: we should fix this (make it click-free, automatable enable-control) */ - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Route::send_pan_azimuth_enable_controllable (uint32_t n) const { - return boost::shared_ptr(); + return std::shared_ptr(); } string Route::send_name (uint32_t n) const { - boost::shared_ptr p = nth_send (n); + std::shared_ptr p = nth_send (n); if (p) { return p->name(); } return string(); } -boost::shared_ptr +std::shared_ptr Route::master_send_enable_controllable () const { - return boost::shared_ptr(); + return std::shared_ptr(); } bool @@ -6080,7 +6083,7 @@ Route::slaved () const } bool -Route::slaved_to (boost::shared_ptr vca) const +Route::slaved_to (std::shared_ptr vca) const { if (!vca || !_gain_control) { return false; @@ -6107,10 +6110,10 @@ Route::clear_all_solo_state () _solo_control->clear_all_solo_state (); } -boost::shared_ptr +std::shared_ptr Route::automation_control_recurse (PBD::ID const & id) const { - boost::shared_ptr ac = Automatable::automation_control (id); + std::shared_ptr ac = Automatable::automation_control (id); if (ac) { return ac; @@ -6130,7 +6133,7 @@ Route::automation_control_recurse (PBD::ID const & id) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } void diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index 29799f0b8a..37bbd9768c 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -139,7 +139,7 @@ RouteGroup::~RouteGroup () _rec_enable_group->clear (); _monitoring_group->clear (); - boost::shared_ptr vca (group_master.lock()); + std::shared_ptr vca (group_master.lock()); for (RouteList::iterator i = routes->begin(); i != routes->end();) { RouteList::iterator tmp = i; @@ -159,7 +159,7 @@ RouteGroup::~RouteGroup () * @param r Route to add. */ int -RouteGroup::add (boost::shared_ptr r) +RouteGroup::add (std::shared_ptr r) { if (r->is_master()) { return 0; @@ -178,30 +178,30 @@ RouteGroup::add (boost::shared_ptr r) _solo_group->add_control (r->solo_control()); _mute_group->add_control (r->mute_control()); _gain_group->add_control (r->gain_control()); - boost::shared_ptr trk = boost::dynamic_pointer_cast (r); + std::shared_ptr trk = std::dynamic_pointer_cast (r); if (trk) { _rec_enable_group->add_control (trk->rec_enable_control()); _monitoring_group->add_control (trk->monitoring_control()); } r->set_route_group (this); - r->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::remove_when_going_away, this, boost::weak_ptr (r))); + r->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::remove_when_going_away, this, std::weak_ptr (r))); - boost::shared_ptr vca (group_master.lock()); + std::shared_ptr vca (group_master.lock()); if (vca) { r->assign (vca); } _session.set_dirty (); - RouteAdded (this, boost::weak_ptr (r)); /* EMIT SIGNAL */ + RouteAdded (this, std::weak_ptr (r)); /* EMIT SIGNAL */ return 0; } void -RouteGroup::remove_when_going_away (boost::weak_ptr wr) +RouteGroup::remove_when_going_away (std::weak_ptr wr) { - boost::shared_ptr r (wr.lock()); + std::shared_ptr r (wr.lock()); if (r) { remove (r); @@ -218,14 +218,14 @@ RouteGroup::unset_subgroup_bus () } int -RouteGroup::remove (boost::shared_ptr r) +RouteGroup::remove (std::shared_ptr r) { RouteList::iterator i; if ((i = find (routes->begin(), routes->end(), r)) != routes->end()) { r->set_route_group (0); - boost::shared_ptr vca = group_master.lock(); + std::shared_ptr vca = group_master.lock(); if (vca) { r->unassign (vca); @@ -234,14 +234,14 @@ RouteGroup::remove (boost::shared_ptr r) _solo_group->remove_control (r->solo_control()); _mute_group->remove_control (r->mute_control()); _gain_group->remove_control (r->gain_control()); - boost::shared_ptr trk = boost::dynamic_pointer_cast (r); + std::shared_ptr trk = std::dynamic_pointer_cast (r); if (trk) { _rec_enable_group->remove_control (trk->rec_enable_control()); _monitoring_group->remove_control (trk->monitoring_control()); } routes->erase (i); _session.set_dirty (); - RouteRemoved (this, boost::weak_ptr (r)); /* EMIT SIGNAL */ + RouteRemoved (this, std::weak_ptr (r)); /* EMIT SIGNAL */ return 0; } @@ -312,7 +312,7 @@ RouteGroup::set_state (const XMLNode& node, int version) for (vector::iterator i = ids.begin(); i != ids.end(); ++i) { PBD::ID id (*i); - boost::shared_ptr r = _session.route_by_id (id); + std::shared_ptr r = _session.route_by_id (id); if (r) { add (r); @@ -322,7 +322,7 @@ RouteGroup::set_state (const XMLNode& node, int version) PBD::ID subgroup_id (0); if (node.get_property ("subgroup-bus", subgroup_id)) { - boost::shared_ptr r = _session.route_by_id (subgroup_id); + std::shared_ptr r = _session.route_by_id (subgroup_id); if (r) { _subgroup_bus = r; _subgroup_bus->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::unset_subgroup_bus, this)); @@ -330,7 +330,7 @@ RouteGroup::set_state (const XMLNode& node, int version) } if (_group_master_number.val() > 0) { - boost::shared_ptr vca = _session.vca_manager().vca_by_number (_group_master_number.val()); + std::shared_ptr vca = _session.vca_manager().vca_by_number (_group_master_number.val()); if (vca) { /* no need to do the assignment because slaves will handle that themselves. But we can set group_master @@ -529,10 +529,10 @@ RouteGroup::set_hidden (bool yn, void* /*src*/) } void -RouteGroup::audio_track_group (set >& ats) +RouteGroup::audio_track_group (set >& ats) { for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { - boost::shared_ptr at = boost::dynamic_pointer_cast(*i); + std::shared_ptr at = std::dynamic_pointer_cast(*i); if (at) { ats.insert (at); } @@ -583,7 +583,7 @@ RouteGroup::make_subgroup (bool aux, Placement placement) } else { - boost::shared_ptr bundle = _subgroup_bus->input()->bundle (); + std::shared_ptr bundle = _subgroup_bus->input()->bundle (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { (*i)->output()->disconnect (this); @@ -657,13 +657,13 @@ RouteGroup::push_to_groups () } void -RouteGroup::assign_master (boost::shared_ptr master) +RouteGroup::assign_master (std::shared_ptr master) { if (!routes || routes->empty()) { return; } - boost::shared_ptr front = routes->front (); + std::shared_ptr front = routes->front (); if (front->slaved_to (master)) { return; @@ -681,13 +681,13 @@ RouteGroup::assign_master (boost::shared_ptr master) } void -RouteGroup::unassign_master (boost::shared_ptr master) +RouteGroup::unassign_master (std::shared_ptr master) { if (!routes || routes->empty()) { return; } - boost::shared_ptr front = routes->front (); + std::shared_ptr front = routes->front (); if (!front->slaved_to (master)) { return; diff --git a/libs/ardour/rt_tasklist.cc b/libs/ardour/rt_tasklist.cc index c5306857ee..ef45edc0b5 100644 --- a/libs/ardour/rt_tasklist.cc +++ b/libs/ardour/rt_tasklist.cc @@ -21,7 +21,7 @@ using namespace ARDOUR; -RTTaskList::RTTaskList (boost::shared_ptr process_graph) +RTTaskList::RTTaskList (std::shared_ptr process_graph) : _graph (process_graph) { _tasks.reserve (256); diff --git a/libs/ardour/scene_change.cc b/libs/ardour/scene_change.cc index f82af62c42..74c6e76273 100644 --- a/libs/ardour/scene_change.cc +++ b/libs/ardour/scene_change.cc @@ -26,16 +26,16 @@ using namespace ARDOUR; std::string SceneChange::xml_node_name = X_("SceneChange"); const uint32_t SceneChange::out_of_bound_color = 0x00000000; /* note: zero alpha means invisible, which acts as out-of-bound signal */ -boost::shared_ptr +std::shared_ptr SceneChange::factory (const XMLNode& node, int version) { XMLProperty const * prop = node.property (X_("type")); if (prop->value() == X_("MIDI")) { - return boost::shared_ptr (new MIDISceneChange (node, version)); + return std::shared_ptr (new MIDISceneChange (node, version)); } - return boost::shared_ptr(); + return std::shared_ptr(); } SceneChange::SceneChange () diff --git a/libs/ardour/selection.cc b/libs/ardour/selection.cc index 1718933630..b3237e818d 100644 --- a/libs/ardour/selection.cc +++ b/libs/ardour/selection.cc @@ -79,8 +79,8 @@ CoreSelection::select_adjacent_stripable (bool mixer_order, bool routes_only, /* fetch the current selection so that we can get the most recently selected */ StripableAutomationControls selected; get_stripables (selected); - boost::shared_ptr last_selected = - selected.empty () ? boost::shared_ptr () + std::shared_ptr last_selected = + selected.empty () ? std::shared_ptr () : selected.back ().stripable; /* Get all stripables and sort into the appropriate ordering */ @@ -92,7 +92,7 @@ CoreSelection::select_adjacent_stripable (bool mixer_order, bool routes_only, /* Check for a possible selection-affecting route group */ RouteGroup* group = 0; - boost::shared_ptr r = boost::dynamic_pointer_cast (last_selected); + std::shared_ptr r = std::dynamic_pointer_cast (last_selected); if (r && r->route_group() && r->route_group()->is_select() && r->route_group()->is_active()) { group = r->route_group(); @@ -122,7 +122,7 @@ CoreSelection::select_adjacent_stripable (bool mixer_order, bool routes_only, for (IterTypeCore s = (stripables.*begin_method)(); s != (stripables.*end_method)(); ++s) { - r = boost::dynamic_pointer_cast (*s); + r = std::dynamic_pointer_cast (*s); /* monitor is never selectable anywhere. for now, anyway */ @@ -148,9 +148,9 @@ CoreSelection::select_prev_stripable (bool mixer_order, bool routes_only) bool -CoreSelection::select_stripable_and_maybe_group (boost::shared_ptr s, bool with_group, bool routes_only, RouteGroup* not_allowed_in_group) +CoreSelection::select_stripable_and_maybe_group (std::shared_ptr s, bool with_group, bool routes_only, RouteGroup* not_allowed_in_group) { - boost::shared_ptr r; + std::shared_ptr r; StripableList sl; /* no selection of hidden stripables (though they can be selected and @@ -167,7 +167,7 @@ CoreSelection::select_stripable_and_maybe_group (boost::shared_ptr s, return false; } - if ((r = boost::dynamic_pointer_cast (s))) { + if ((r = std::dynamic_pointer_cast (s))) { /* no selection of inactive routes, though they can be selected * and made inactive. @@ -182,7 +182,7 @@ CoreSelection::select_stripable_and_maybe_group (boost::shared_ptr s, if (!not_allowed_in_group || !r->route_group() || r->route_group() != not_allowed_in_group) { if (r->route_group() && r->route_group()->is_select() && r->route_group()->is_active()) { - boost::shared_ptr rl = r->route_group()->route_list (); + std::shared_ptr rl = r->route_group()->route_list (); for (RouteList::iterator ri = rl->begin(); ri != rl->end(); ++ri) { if (*ri != r) { sl.push_back (*ri); @@ -200,12 +200,12 @@ CoreSelection::select_stripable_and_maybe_group (boost::shared_ptr s, } } else { - set (s, boost::shared_ptr()); + set (s, std::shared_ptr()); return true; } } else if (!routes_only) { - set (s, boost::shared_ptr()); + set (s, std::shared_ptr()); return true; } @@ -213,7 +213,7 @@ CoreSelection::select_stripable_and_maybe_group (boost::shared_ptr s, } void -CoreSelection::toggle (boost::shared_ptr s, boost::shared_ptr c) +CoreSelection::toggle (std::shared_ptr s, std::shared_ptr c) { DEBUG_TRACE (DEBUG::Selection, string_compose ("toggle: s %1 selected %2 c %3 selected %4\n", s, selected (s), c, selected (c))); @@ -228,9 +228,9 @@ void CoreSelection::set (StripableList& sl) { bool send = false; - boost::shared_ptr no_control; + std::shared_ptr no_control; - std::vector > removed; + std::vector > removed; { Glib::Threads::RWLock::WriterLock lm (_lock); @@ -238,7 +238,7 @@ CoreSelection::set (StripableList& sl) removed.reserve (_stripables.size()); for (SelectedStripables::const_iterator x = _stripables.begin(); x != _stripables.end(); ++x) { - boost::shared_ptr sp = session.stripable_by_id ((*x).stripable); + std::shared_ptr sp = session.stripable_by_id ((*x).stripable); if (sp) { removed.push_back (sp); } @@ -275,7 +275,7 @@ CoreSelection::set (StripableList& sl) PropertyChange pc (Properties::selected); - for (std::vector >::iterator s = removed.begin(); s != removed.end(); ++s) { + for (std::vector >::iterator s = removed.begin(); s != removed.end(); ++s) { (*s)->presentation_info().PropertyChanged (pc); } @@ -288,7 +288,7 @@ CoreSelection::set (StripableList& sl) } void -CoreSelection::add (boost::shared_ptr s, boost::shared_ptr c) +CoreSelection::add (std::shared_ptr s, std::shared_ptr c) { bool send = false; @@ -319,7 +319,7 @@ CoreSelection::add (boost::shared_ptr s, boost::shared_ptr s, boost::shared_ptr c) +CoreSelection::remove (std::shared_ptr s, std::shared_ptr c) { bool send = false; { @@ -352,7 +352,7 @@ CoreSelection::remove (boost::shared_ptr s, boost::shared_ptr s, boost::shared_ptr c) +CoreSelection::set (std::shared_ptr s, std::shared_ptr c) { { Glib::Threads::RWLock::WriterLock lm (_lock); @@ -384,7 +384,7 @@ void CoreSelection::clear_stripables () { bool send = false; - std::vector > s; + std::vector > s; DEBUG_TRACE (DEBUG::Selection, "clearing s/c selection\n"); { @@ -395,7 +395,7 @@ CoreSelection::clear_stripables () s.reserve (_stripables.size()); for (SelectedStripables::const_iterator x = _stripables.begin(); x != _stripables.end(); ++x) { - boost::shared_ptr sp = session.stripable_by_id ((*x).stripable); + std::shared_ptr sp = session.stripable_by_id ((*x).stripable); if (sp) { s.push_back (sp); } @@ -415,14 +415,14 @@ CoreSelection::clear_stripables () PropertyChange pc (Properties::selected); - for (std::vector >::iterator ss = s.begin(); ss != s.end(); ++ss) { + for (std::vector >::iterator ss = s.begin(); ss != s.end(); ++ss) { (*ss)->presentation_info().PropertyChanged (pc); } } } -boost::shared_ptr +std::shared_ptr CoreSelection::first_selected_stripable () const { Glib::Threads::RWLock::ReaderLock lm (_lock); @@ -430,7 +430,7 @@ CoreSelection::first_selected_stripable () const } bool -CoreSelection::selected (boost::shared_ptr s) const +CoreSelection::selected (std::shared_ptr s) const { if (!s) { return false; @@ -458,7 +458,7 @@ CoreSelection::selected (boost::shared_ptr s) const } bool -CoreSelection::selected (boost::shared_ptr c) const +CoreSelection::selected (std::shared_ptr c) const { if (!c) { return false; @@ -475,7 +475,7 @@ CoreSelection::selected (boost::shared_ptr c) const return false; } -CoreSelection::SelectedStripable::SelectedStripable (boost::shared_ptr s, boost::shared_ptr c, int o) +CoreSelection::SelectedStripable::SelectedStripable (std::shared_ptr s, std::shared_ptr c, int o) : stripable (s ? s->id() : PBD::ID (0)) , controllable (c ? c->id() : PBD::ID (0)) , order (o) @@ -495,8 +495,8 @@ CoreSelection::get_stripables (StripableAutomationControls& sc) const for (SelectedStripables::const_iterator x = _stripables.begin(); x != _stripables.end(); ++x) { - boost::shared_ptr s = session.stripable_by_id ((*x).stripable); - boost::shared_ptr c; + std::shared_ptr s = session.stripable_by_id ((*x).stripable); + std::shared_ptr c; if (!s) { /* some global automation control, not owned by a Stripable */ diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index cdb6471608..7881118467 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -90,15 +90,15 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_b } -Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr mm, Role r, bool ignore_bitslot) +Send::Send (Session& s, std::shared_ptr p, std::shared_ptr mm, Role r, bool ignore_bitslot) : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot, ignore_bitslot), r) , _metering (false) , _remove_on_disconnect (false) { //boost_debug_shared_ptr_mark_interesting (this, "send"); - boost::shared_ptr gl (new AutomationList (Evoral::Parameter (BusSendLevel), time_domain())); - set_gain_control (boost::shared_ptr (new GainControl (_session, Evoral::Parameter(BusSendLevel), gl))); + std::shared_ptr gl (new AutomationList (Evoral::Parameter (BusSendLevel), time_domain())); + set_gain_control (std::shared_ptr (new GainControl (_session, Evoral::Parameter(BusSendLevel), gl))); gain_control ()->set_flag (Controllable::InlineControl); add_control (gain_control ()); @@ -110,7 +110,7 @@ Send::Send (Session& s, boost::shared_ptr p, boost::shared_ptr (new AutomationControl (_session, PhaseAutomation, ParameterDescriptor (PhaseAutomation), boost::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), time_domain())), "polarity-invert"))); + set_polarity_control (std::shared_ptr (new AutomationControl (_session, PhaseAutomation, ParameterDescriptor (PhaseAutomation), std::shared_ptr(new AutomationList(Evoral::Parameter(PhaseAutomation), time_domain())), "polarity-invert"))); add_control (polarity_control ()); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 6d06a97909..c4f4f10fe0 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -166,7 +166,7 @@ PBD::Signal3 Session::MissingFile; PBD::Signal1 Session::StartTimeChanged; PBD::Signal1 Session::EndTimeChanged; PBD::Signal4 Session::Exported; -PBD::Signal1 > Session::AskAboutPlaylistDeletion; +PBD::Signal1 > Session::AskAboutPlaylistDeletion; PBD::Signal0 Session::Quit; PBD::Signal0 Session::FeedbackDetected; PBD::Signal0 Session::SuccessfulGraphSort; @@ -731,7 +731,7 @@ Session::destroy () /* unregister IO Plugin */ { RCUWriter writer (_io_plugins); - boost::shared_ptr iop = writer.get_copy (); + std::shared_ptr iop = writer.get_copy (); for (auto const& i : *iop) { i->DropReferences (); } @@ -772,7 +772,7 @@ Session::destroy () { RCUWriter writer (routes); - boost::shared_ptr r = writer.get_copy (); + std::shared_ptr r = writer.get_copy (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for route %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count())); @@ -902,8 +902,8 @@ Session::setup_click () { _clicking = false; - boost::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation), Temporal::AudioTime)); - boost::shared_ptr gain_control = boost::shared_ptr (new GainControl (*this, Evoral::Parameter(GainAutomation), gl)); + std::shared_ptr gl (new AutomationList (Evoral::Parameter (GainAutomation), Temporal::AudioTime)); + std::shared_ptr gain_control = std::shared_ptr (new GainControl (*this, Evoral::Parameter(GainAutomation), gl)); _click_io.reset (new ClickIO (*this, X_("Click"))); _click_gain.reset (new Amp (*this, _("Fader"), gain_control, true)); @@ -998,7 +998,7 @@ Session::auto_connect_master_bus () } for (uint32_t n = 0; n < limit; ++n) { - boost::shared_ptr p = _master_out->output()->nth (n); + std::shared_ptr p = _master_out->output()->nth (n); string connect_to; if (outputs[p->type()].size() > n) { connect_to = outputs[p->type()][n]; @@ -1014,13 +1014,13 @@ Session::auto_connect_master_bus () } } -boost::shared_ptr +std::shared_ptr Session::master_volume () const { if (_master_out) { return _master_out->volume_control (); } - return boost::shared_ptr (); + return std::shared_ptr (); } void @@ -1078,7 +1078,7 @@ Session::add_monitor_section () return; } - boost::shared_ptr r (new Route (*this, _("Monitor"), PresentationInfo::MonitorOut, DataType::AUDIO)); + std::shared_ptr r (new Route (*this, _("Monitor"), PresentationInfo::MonitorOut, DataType::AUDIO)); if (r->init ()) { return; @@ -1119,8 +1119,8 @@ Session::add_monitor_section () _master_out->output()->disconnect (this); for (uint32_t n = 0; n < limit; ++n) { - boost::shared_ptr p = _monitor_out->input()->ports().nth_audio_port (n); - boost::shared_ptr o = _master_out->output()->ports().nth_audio_port (n); + std::shared_ptr p = _monitor_out->input()->ports().nth_audio_port (n); + std::shared_ptr o = _master_out->output()->ports().nth_audio_port (n); if (o) { string connect_to = o->name(); @@ -1139,7 +1139,7 @@ Session::add_monitor_section () if (!Config->get_monitor_bus_preferred_bundle().empty()) { - boost::shared_ptr b = bundle_by_name (Config->get_monitor_bus_preferred_bundle()); + std::shared_ptr b = bundle_by_name (Config->get_monitor_bus_preferred_bundle()); if (b) { _monitor_out->output()->connect_ports_to_bundle (b, true, this); @@ -1166,7 +1166,7 @@ Session::add_monitor_section () for (uint32_t n = 0; n < limit; ++n) { - boost::shared_ptr p = _monitor_out->output()->ports().port(DataType::AUDIO, n); + std::shared_ptr p = _monitor_out->output()->ports().port(DataType::AUDIO, n); string connect_to; if (outputs[DataType::AUDIO].size() > (n % mod)) { connect_to = outputs[DataType::AUDIO][n % mod]; @@ -1206,7 +1206,7 @@ Session::setup_route_monitor_sends (bool enable, bool need_process_lock) lx.acquire(); } - boost::shared_ptr rls = routes.reader (); + std::shared_ptr rls = routes.reader (); ProcessorChangeBlocker pcb (this, false /* XXX */); for (RouteList::iterator x = rls->begin(); x != rls->end(); ++x) { @@ -1255,8 +1255,8 @@ Session::reset_monitor_section () _monitor_out->output()->ensure_io (mon_chn, false, this); for (uint32_t n = 0; n < limit; ++n) { - boost::shared_ptr p = _monitor_out->input()->ports().nth_audio_port (n); - boost::shared_ptr o = _master_out->output()->ports().nth_audio_port (n); + std::shared_ptr p = _monitor_out->input()->ports().nth_audio_port (n); + std::shared_ptr o = _master_out->output()->ports().nth_audio_port (n); if (o) { string connect_to = o->name(); @@ -1274,7 +1274,7 @@ Session::reset_monitor_section () if (!Config->get_monitor_bus_preferred_bundle().empty()) { - boost::shared_ptr b = bundle_by_name (Config->get_monitor_bus_preferred_bundle()); + std::shared_ptr b = bundle_by_name (Config->get_monitor_bus_preferred_bundle()); if (b) { _monitor_out->output()->connect_ports_to_bundle (b, true, this); @@ -1301,7 +1301,7 @@ Session::reset_monitor_section () for (uint32_t n = 0; n < limit; ++n) { - boost::shared_ptr p = _monitor_out->output()->ports().port(DataType::AUDIO, n); + std::shared_ptr p = _monitor_out->output()->ports().port(DataType::AUDIO, n); string connect_to; if (outputs[DataType::AUDIO].size() > (n % mod)) { connect_to = outputs[DataType::AUDIO][n % mod]; @@ -1333,7 +1333,7 @@ Session::add_master_bus (ChanCount const& count) RouteList rl; - boost::shared_ptr r (new Route (*this, _("Master"), PresentationInfo::MasterOut, DataType::AUDIO)); + std::shared_ptr r (new Route (*this, _("Master"), PresentationInfo::MasterOut, DataType::AUDIO)); if (r->init ()) { return -1; } @@ -1367,7 +1367,7 @@ Session::hookup_io () */ try { - boost::shared_ptr a (new Auditioner (*this)); + std::shared_ptr a (new Auditioner (*this)); if (a->init()) { throw failed_constructor (); } @@ -1413,14 +1413,14 @@ Session::hookup_io () } void -Session::track_playlist_changed (boost::weak_ptr wp) +Session::track_playlist_changed (std::weak_ptr wp) { - boost::shared_ptr track = wp.lock (); + std::shared_ptr track = wp.lock (); if (!track) { return; } - boost::shared_ptr playlist; + std::shared_ptr playlist; if ((playlist = track->playlist()) != 0) { playlist->RegionAdded.connect_same_thread (*this, boost::bind (&Session::playlist_region_added, this, _1)); @@ -1441,10 +1441,10 @@ Session::record_enabling_legal () const void Session::set_track_monitor_input_status (bool yn) { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->rec_enable_control()->get_value()) { tr->request_input_monitoring (yn); } @@ -1957,7 +1957,7 @@ Session::enable_record () void Session::set_all_tracks_record_enabled (bool enable ) { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), enable, Controllable::NoGroup); } @@ -2159,7 +2159,7 @@ Session::set_block_size (pframes_t nframes) foreach_route (&Route::set_block_size, nframes); - boost::shared_ptr iop (_io_plugins.reader ()); + std::shared_ptr iop (_io_plugins.reader ()); for (auto const& i : *iop) { i->set_block_size (nframes); } @@ -2193,7 +2193,7 @@ Session::resort_routes () { RCUWriter writer (routes); - boost::shared_ptr r = writer.get_copy (); + std::shared_ptr r = writer.get_copy (); resort_routes_using (r); /* writer goes out of scope and forces update */ } @@ -2218,7 +2218,7 @@ Session::resort_routes () */ void -Session::resort_routes_using (boost::shared_ptr r) +Session::resort_routes_using (std::shared_ptr r) { #ifndef NDEBUG Timing t; @@ -2235,14 +2235,14 @@ Session::resort_routes_using (boost::shared_ptr r) /* Update routelist for single-threaded processing, use topologically sorted nodelist */ r->clear (); for (auto const& nd : gnl) { - r->push_back (boost::dynamic_pointer_cast (nd)); + r->push_back (std::dynamic_pointer_cast (nd)); } } else { ok = false; } /* now create IOPlugs graph-chains */ - boost::shared_ptr io_plugins (_io_plugins.reader ()); + std::shared_ptr io_plugins (_io_plugins.reader ()); GraphNodeList gnl_pre; GraphNodeList gnl_post; for (auto const& p : *io_plugins) { @@ -2325,7 +2325,7 @@ Session::rechain_process_graph (GraphNodeList& g) * However, the graph-chain may be in use (session process), and the last reference * be helf by the process-callback. So we delegate deletion to the butler thread. */ - _graph_chain = boost::shared_ptr (new GraphChain (g, edges), boost::bind (&rt_safe_delete, this, _1)); + _graph_chain = std::shared_ptr (new GraphChain (g, edges), boost::bind (&rt_safe_delete, this, _1)); } else { _graph_chain.reset (); } @@ -2341,7 +2341,7 @@ Session::rechain_process_graph (GraphNodeList& g) bool Session::rechain_ioplug_graph (bool pre) { - boost::shared_ptr io_plugins (_io_plugins.reader ()); + std::shared_ptr io_plugins (_io_plugins.reader ()); if (io_plugins->empty ()) { _io_graph_chain[pre ? 0 : 1].reset (); @@ -2358,7 +2358,7 @@ Session::rechain_ioplug_graph (bool pre) GraphEdges edges; if (topological_sort (gnl, edges)) { - _io_graph_chain[pre ? 0 : 1] = boost::shared_ptr (new GraphChain (gnl, edges), boost::bind (&rt_safe_delete, this, _1)); + _io_graph_chain[pre ? 0 : 1] = std::shared_ptr (new GraphChain (gnl, edges), boost::bind (&rt_safe_delete, this, _1)); return true; } return false; @@ -2429,10 +2429,10 @@ Session::count_existing_track_channels (ChanCount& in, ChanCount& out) in = ChanCount::ZERO; out = ChanCount::ZERO; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; } @@ -2461,9 +2461,9 @@ Session::default_track_name_pattern (DataType t) * @param name_template string to use for the start of the name, or "" to use "MIDI". * @param instrument plugin info for the instrument to insert pre-fader, if any */ -list > +list > Session::new_midi_track (const ChanCount& input, const ChanCount& output, bool strict_io, - boost::shared_ptr instrument, Plugin::PresetRecord* pset, + std::shared_ptr instrument, Plugin::PresetRecord* pset, RouteGroup* route_group, uint32_t how_many, string name_template, PresentationInfo::order_t order, TrackMode mode, bool input_auto_connect, @@ -2473,7 +2473,7 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, bool s uint32_t track_id = 0; string port; RouteList new_routes; - list > ret; + list > ret; const string name_pattern = default_track_name_pattern (DataType::MIDI); bool const use_number = (how_many != 1) || name_template.empty () || (name_template == name_pattern); @@ -2484,7 +2484,7 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, bool s goto failed; } - boost::shared_ptr track; + std::shared_ptr track; try { track.reset (new MidiTrack (*this, track_name, mode)); @@ -2551,7 +2551,7 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, bool s RouteList Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name_template, bool strict_io, - boost::shared_ptr instrument, Plugin::PresetRecord* pset, + std::shared_ptr instrument, Plugin::PresetRecord* pset, PresentationInfo::Flag flag, PresentationInfo::order_t order) { string bus_name; @@ -2568,7 +2568,7 @@ Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name } try { - boost::shared_ptr bus (new Route (*this, bus_name, flag, DataType::AUDIO)); // XXX Editor::add_routes is not ready for ARDOUR::DataType::MIDI + std::shared_ptr bus (new Route (*this, bus_name, flag, DataType::AUDIO)); // XXX Editor::add_routes is not ready for ARDOUR::DataType::MIDI if (bus->init ()) { goto failure; @@ -2632,9 +2632,9 @@ Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name void -Session::midi_output_change_handler (IOChange change, void * /*src*/, boost::weak_ptr wr) +Session::midi_output_change_handler (IOChange change, void * /*src*/, std::weak_ptr wr) { - boost::shared_ptr midi_route (wr.lock()); + std::shared_ptr midi_route (wr.lock()); if (!midi_route) { return; @@ -2668,7 +2668,7 @@ Session::ensure_stripable_sort_order () PresentationInfo::order_t order = 0; for (StripableList::iterator si = sl.begin(); si != sl.end(); ++si) { - boost::shared_ptr s (*si); + std::shared_ptr s (*si); assert (!s->is_auditioner ()); // XXX remove me if (s->is_monitor ()) { continue; @@ -2699,7 +2699,7 @@ Session::ensure_route_presentation_info_gap (PresentationInfo::order_t first_new get_stripables (sl); for (StripableList::iterator si = sl.begin(); si != sl.end(); ++si) { - boost::shared_ptr s (*si); + std::shared_ptr s (*si); if (s->presentation_info().special (false)) { continue; @@ -2718,7 +2718,7 @@ Session::ensure_route_presentation_info_gap (PresentationInfo::order_t first_new /** Caller must not hold process lock * @param name_template string to use for the start of the name, or "" to use "Audio". */ -list< boost::shared_ptr > +list< std::shared_ptr > Session::new_audio_track (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, string name_template, PresentationInfo::order_t order, TrackMode mode, bool input_auto_connect, @@ -2728,7 +2728,7 @@ Session::new_audio_track (int input_channels, int output_channels, RouteGroup* r uint32_t track_id = 0; string port; RouteList new_routes; - list > ret; + list > ret; const string name_pattern = default_track_name_pattern (DataType::AUDIO); bool const use_number = (how_many != 1) || name_template.empty () || (name_template == name_pattern); @@ -2740,7 +2740,7 @@ Session::new_audio_track (int input_channels, int output_channels, RouteGroup* r goto failed; } - boost::shared_ptr track; + std::shared_ptr track; try { track.reset (new AudioTrack (*this, track_name, mode)); @@ -2828,7 +2828,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r } try { - boost::shared_ptr bus (new Route (*this, bus_name, flags, DataType::AUDIO)); + std::shared_ptr bus (new Route (*this, bus_name, flags, DataType::AUDIO)); if (bus->init ()) { goto failure; @@ -2933,7 +2933,7 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i */ XMLNode node_copy (node); - std::vector > shared_playlists; + std::vector > shared_playlists; try { string name; @@ -2971,14 +2971,14 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i PBD::ID playlist_id; if (node_copy.get_property (X_("audio-playlist"), playlist_id)) { - boost::shared_ptr playlist = _playlists->by_id (playlist_id); + std::shared_ptr playlist = _playlists->by_id (playlist_id); playlist = PlaylistFactory::create (playlist, string_compose ("%1.1", name)); playlist->reset_shares (); node_copy.set_property (X_("audio-playlist"), playlist->id()); } if (node_copy.get_property (X_("midi-playlist"), playlist_id)) { - boost::shared_ptr playlist = _playlists->by_id (playlist_id); + std::shared_ptr playlist = _playlists->by_id (playlist_id); playlist = PlaylistFactory::create (playlist, string_compose ("%1.1", name)); playlist->reset_shares (); node_copy.set_property (X_("midi-playlist"), playlist->id()); @@ -2988,12 +2988,12 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i PBD::ID playlist_id; if (node_copy.get_property (X_("audio-playlist"), playlist_id)) { - boost::shared_ptr playlist = _playlists->by_id (playlist_id); + std::shared_ptr playlist = _playlists->by_id (playlist_id); shared_playlists.push_back (playlist); } if (node_copy.get_property (X_("midi-playlist"), playlist_id)) { - boost::shared_ptr playlist = _playlists->by_id (playlist_id); + std::shared_ptr playlist = _playlists->by_id (playlist_id); shared_playlists.push_back (playlist); } @@ -3004,12 +3004,12 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i node.get_property(X_("default-type"), default_type); if (node_copy.get_property (X_("audio-playlist"), pid) || (version < 5000 && default_type == "audio")) { - boost::shared_ptr playlist = PlaylistFactory::create (DataType::AUDIO, *this, name, false); + std::shared_ptr playlist = PlaylistFactory::create (DataType::AUDIO, *this, name, false); node_copy.set_property (X_("audio-playlist"), playlist->id()); } if (node_copy.get_property (X_("midi-playlist"), pid) || (version < 5000 && default_type == "midi")) { - boost::shared_ptr playlist = PlaylistFactory::create (DataType::MIDI, *this, name, false); + std::shared_ptr playlist = PlaylistFactory::create (DataType::MIDI, *this, name, false); node_copy.set_property (X_("midi-playlist"), playlist->id()); } } @@ -3036,8 +3036,8 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i (*i)->set_property ("type", "dangling-aux-send"); continue; } - boost::shared_ptr r = route_by_id (target->value()); - if (!r || boost::dynamic_pointer_cast(r)) { + std::shared_ptr r = route_by_id (target->value()); + if (!r || std::dynamic_pointer_cast(r)) { (*i)->set_property ("type", "dangling-aux-send"); continue; } @@ -3090,7 +3090,7 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i */ node_copy.remove_node_and_delete (X_("Controllable"), X_("name"), X_("solo")); - boost::shared_ptr route; + std::shared_ptr route; if (version < 3000) { route = XMLRouteFactory_2X (node_copy, version); @@ -3112,11 +3112,11 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i /* Fix up sharing of playlists with the new Route/Track */ - for (vector >::iterator sp = shared_playlists.begin(); sp != shared_playlists.end(); ++sp) { + for (vector >::iterator sp = shared_playlists.begin(); sp != shared_playlists.end(); ++sp) { (*sp)->share_with (route->id()); } - if (boost::dynamic_pointer_cast(route)) { + if (std::dynamic_pointer_cast(route)) { /* force input/output change signals so that the new diskstream picks up the configuration of the route. During session loading this normally happens in a different way. @@ -3170,7 +3170,7 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i } /* reconnect ports using information from state */ for (auto const& wio : (*x)->all_inputs ()) { - boost::shared_ptr io = wio.lock(); + std::shared_ptr io = wio.lock(); if (!io) { continue; } @@ -3179,7 +3179,7 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i } } for (auto const& wio : (*x)->all_outputs ()) { - boost::shared_ptr io = wio.lock(); + std::shared_ptr io = wio.lock(); if (!io) { continue; } @@ -3235,7 +3235,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool { RCUWriter writer (routes); - boost::shared_ptr r = writer.get_copy (); + std::shared_ptr r = writer.get_copy (); n_routes = r->size(); r->insert (r->end(), new_routes.begin(), new_routes.end()); @@ -3262,8 +3262,8 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x, ++added) { - boost::weak_ptr wpr (*x); - boost::shared_ptr r (*x); + std::weak_ptr wpr (*x); + std::shared_ptr r (*x); r->solo_control()->Changed.connect_same_thread (*this, boost::bind (&Session::route_solo_changed, this, _1, _2,wpr)); r->solo_isolate_control()->Changed.connect_same_thread (*this, boost::bind (&Session::route_solo_isolated_changed, this, wpr)); @@ -3280,16 +3280,16 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool _monitor_out = r; } - boost::shared_ptr tr = boost::dynamic_pointer_cast (r); + std::shared_ptr tr = std::dynamic_pointer_cast (r); if (tr) { - tr->PlaylistChanged.connect_same_thread (*this, boost::bind (&Session::track_playlist_changed, this, boost::weak_ptr (tr))); - track_playlist_changed (boost::weak_ptr (tr)); + tr->PlaylistChanged.connect_same_thread (*this, boost::bind (&Session::track_playlist_changed, this, std::weak_ptr (tr))); + track_playlist_changed (std::weak_ptr (tr)); tr->rec_enable_control()->Changed.connect_same_thread (*this, boost::bind (&Session::update_route_record_state, this)); - boost::shared_ptr mt = boost::dynamic_pointer_cast (tr); + std::shared_ptr mt = std::dynamic_pointer_cast (tr); if (mt) { mt->StepEditStatusChange.connect_same_thread (*this, boost::bind (&Session::step_edit_status_change, this, _1)); - mt->presentation_info().PropertyChanged.connect_same_thread (*this, boost::bind (&Session::midi_track_presentation_info_changed, this, _1, boost::weak_ptr(mt))); + mt->presentation_info().PropertyChanged.connect_same_thread (*this, boost::bind (&Session::midi_track_presentation_info_changed, this, _1, std::weak_ptr(mt))); } } @@ -3351,7 +3351,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool } void -Session::load_and_connect_instruments (RouteList& new_routes, bool strict_io, boost::shared_ptr instrument, Plugin::PresetRecord* pset, ChanCount& existing_outputs) +Session::load_and_connect_instruments (RouteList& new_routes, bool strict_io, std::shared_ptr instrument, Plugin::PresetRecord* pset, ChanCount& existing_outputs) { if (instrument) { for (RouteList::iterator r = new_routes.begin(); r != new_routes.end(); ++r) { @@ -3363,7 +3363,7 @@ Session::load_and_connect_instruments (RouteList& new_routes, bool strict_io, bo if (pset) { plugin->load_preset (*pset); } - boost::shared_ptr pi (new PluginInsert (*this, (*r)->time_domain(), plugin)); + std::shared_ptr pi (new PluginInsert (*this, (*r)->time_domain(), plugin)); if (strict_io) { pi->set_strict_io (true); } @@ -3383,15 +3383,15 @@ Session::load_and_connect_instruments (RouteList& new_routes, bool strict_io, bo } } for (RouteList::iterator r = new_routes.begin(); r != new_routes.end(); ++r) { - (*r)->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, boost::weak_ptr(*r))); + (*r)->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, std::weak_ptr(*r))); } } void -Session::globally_set_send_gains_to_zero (boost::shared_ptr dest) +Session::globally_set_send_gains_to_zero (std::shared_ptr dest) { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr s; + std::shared_ptr r = routes.reader (); + std::shared_ptr s; for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((s = (*i)->internal_send_for (dest)) != 0) { @@ -3401,10 +3401,10 @@ Session::globally_set_send_gains_to_zero (boost::shared_ptr dest) } void -Session::globally_set_send_gains_to_unity (boost::shared_ptr dest) +Session::globally_set_send_gains_to_unity (std::shared_ptr dest) { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr s; + std::shared_ptr r = routes.reader (); + std::shared_ptr s; for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((s = (*i)->internal_send_for (dest)) != 0) { @@ -3414,10 +3414,10 @@ Session::globally_set_send_gains_to_unity (boost::shared_ptr dest) } void -Session::globally_set_send_gains_from_track(boost::shared_ptr dest) +Session::globally_set_send_gains_from_track(std::shared_ptr dest) { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr s; + std::shared_ptr r = routes.reader (); + std::shared_ptr s; for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((s = (*i)->internal_send_for (dest)) != 0) { @@ -3428,14 +3428,14 @@ Session::globally_set_send_gains_from_track(boost::shared_ptr dest) /** @param include_buses true to add sends to buses and tracks, false for just tracks */ void -Session::globally_add_internal_sends (boost::shared_ptr dest, Placement p, bool include_buses) +Session::globally_add_internal_sends (std::shared_ptr dest, Placement p, bool include_buses) { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr t (new RouteList); + std::shared_ptr r = routes.reader (); + std::shared_ptr t (new RouteList); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { /* no MIDI sends because there are no MIDI busses yet */ - if (include_buses || boost::dynamic_pointer_cast(*i)) { + if (include_buses || std::dynamic_pointer_cast(*i)) { t->push_back (*i); } } @@ -3444,7 +3444,7 @@ Session::globally_add_internal_sends (boost::shared_ptr dest, Placement p } void -Session::add_internal_sends (boost::shared_ptr dest, Placement p, boost::shared_ptr senders) +Session::add_internal_sends (std::shared_ptr dest, Placement p, std::shared_ptr senders) { for (RouteList::iterator i = senders->begin(); i != senders->end(); ++i) { add_internal_send (dest, (*i)->before_processor_for_placement (p), *i); @@ -3452,13 +3452,13 @@ Session::add_internal_sends (boost::shared_ptr dest, Placement p, boost:: } void -Session::add_internal_send (boost::shared_ptr dest, int index, boost::shared_ptr sender) +Session::add_internal_send (std::shared_ptr dest, int index, std::shared_ptr sender) { add_internal_send (dest, sender->before_processor_for_index (index), sender); } void -Session::add_internal_send (boost::shared_ptr dest, boost::shared_ptr before, boost::shared_ptr sender) +Session::add_internal_send (std::shared_ptr dest, std::shared_ptr before, std::shared_ptr sender) { if (sender->is_monitor() || sender->is_master() || sender == dest || dest->is_monitor() || dest->is_master()) { return; @@ -3472,7 +3472,7 @@ Session::add_internal_send (boost::shared_ptr dest, boost::shared_ptr routes_to_remove) +Session::remove_routes (std::shared_ptr routes_to_remove) { bool mute_changed = false; bool send_selected = false; @@ -3480,7 +3480,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) { // RCU Writer scope PBD::Unwinder uw_flag (_route_deletion_in_progress, true); RCUWriter writer (routes); - boost::shared_ptr rs = writer.get_copy (); + std::shared_ptr rs = writer.get_copy (); for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { @@ -3509,7 +3509,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) */ if (*iter == _master_out) { - _master_out = boost::shared_ptr (); + _master_out = std::shared_ptr (); } if (*iter == _monitor_out) { @@ -3525,9 +3525,9 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) if (!deletion_in_progress () && (*iter)->internal_return()) { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr s = (*i)->internal_send_for (*iter); + std::shared_ptr s = (*i)->internal_send_for (*iter); if (s) { (*i)->remove_processor (s); } @@ -3541,7 +3541,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) (*iter)->remove_monitor_send (); } - boost::shared_ptr mt = boost::dynamic_pointer_cast (*iter); + std::shared_ptr mt = std::dynamic_pointer_cast (*iter); if (mt && mt->step_editing()) { if (_step_editors > 0) { _step_editors--; @@ -3606,9 +3606,9 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) } void -Session::remove_route (boost::shared_ptr route) +Session::remove_route (std::shared_ptr route) { - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (route); remove_routes (rl); } @@ -3621,9 +3621,9 @@ Session::route_mute_changed () } void -Session::route_listen_changed (Controllable::GroupControlDisposition group_override, boost::weak_ptr wpr) +Session::route_listen_changed (Controllable::GroupControlDisposition group_override, std::weak_ptr wpr) { - boost::shared_ptr route (wpr.lock()); + std::shared_ptr route (wpr.lock()); if (!route) { return; @@ -3640,7 +3640,7 @@ Session::route_listen_changed (Controllable::GroupControlDisposition group_overr RouteGroup* rg = route->route_group (); const bool group_already_accounted_for = (group_override == Controllable::ForGroup); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i) == route) { @@ -3674,9 +3674,9 @@ Session::route_listen_changed (Controllable::GroupControlDisposition group_overr } void -Session::route_solo_isolated_changed (boost::weak_ptr wpr) +Session::route_solo_isolated_changed (std::weak_ptr wpr) { - boost::shared_ptr route (wpr.lock()); + std::shared_ptr route (wpr.lock()); if (!route) { return; @@ -3702,11 +3702,11 @@ Session::route_solo_isolated_changed (boost::weak_ptr wpr) } void -Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlDisposition group_override, boost::weak_ptr wpr) +Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlDisposition group_override, std::weak_ptr wpr) { DEBUG_TRACE (DEBUG::Solo, string_compose ("route solo change, self = %1, update\n", self_solo_changed)); - boost::shared_ptr route (wpr.lock()); + std::shared_ptr route (wpr.lock()); if (!route) { return; @@ -3727,7 +3727,7 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD return; } - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); int32_t delta = route->solo_control()->transitioned_into_solo (); /* the route may be a member of a group that has shared-solo @@ -3864,7 +3864,7 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD } void -Session::update_route_solo_state (boost::shared_ptr r) +Session::update_route_solo_state (std::shared_ptr r) { /* now figure out if anything that matters is soloed (or is "listening")*/ @@ -3934,11 +3934,11 @@ Session::muted () const if ((*i)->is_monitor()) { continue; } - boost::shared_ptr r = boost::dynamic_pointer_cast(*i); + std::shared_ptr r = std::dynamic_pointer_cast(*i); if (r && !r->active()) { continue; } - boost::shared_ptr mc = (*i)->mute_control(); + std::shared_ptr mc = (*i)->mute_control(); if (mc && mc->muted ()) { muted = true; break; @@ -3947,26 +3947,26 @@ Session::muted () const return muted; } -std::vector > +std::vector > Session::cancel_all_mute () { StripableList all; get_stripables (all); - std::vector > muted; - boost::shared_ptr cl (new ControlList); + std::vector > muted; + std::shared_ptr cl (new ControlList); for (StripableList::const_iterator i = all.begin(); i != all.end(); ++i) { assert (!(*i)->is_auditioner()); if ((*i)->is_monitor()) { continue; } - boost::shared_ptr r = boost::dynamic_pointer_cast (*i); + std::shared_ptr r = std::dynamic_pointer_cast (*i); if (r && !r->active()) { continue; } - boost::shared_ptr ac = (*i)->mute_control(); + std::shared_ptr ac = (*i)->mute_control(); if (ac && ac->get_value () > 0) { cl->push_back (ac); - muted.push_back (boost::weak_ptr(ac)); + muted.push_back (std::weak_ptr(ac)); } } if (!cl->empty ()) { @@ -3978,7 +3978,7 @@ Session::cancel_all_mute () void Session::get_stripables (StripableList& sl, PresentationInfo::Flag fl) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator it = r->begin(); it != r->end(); ++it) { if ((*it)->presentation_info ().flags () & fl) { sl.push_back (*it); @@ -4004,7 +4004,7 @@ Session::get_stripables () const RouteList Session::get_routelist (bool mixer_order, PresentationInfo::Flag fl) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); RouteList rv; for (RouteList::iterator it = r->begin(); it != r->end(); ++it) { if ((*it)->presentation_info ().flags () & fl) { @@ -4015,11 +4015,11 @@ Session::get_routelist (bool mixer_order, PresentationInfo::Flag fl) const return rv; } -boost::shared_ptr +std::shared_ptr Session::get_routes_with_internal_returns() const { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr rl (new RouteList); + std::shared_ptr r = routes.reader (); + std::shared_ptr rl (new RouteList); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->internal_return ()) { @@ -4032,7 +4032,7 @@ Session::get_routes_with_internal_returns() const bool Session::io_name_is_legal (const std::string& name) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (map::const_iterator reserved = reserved_io_names.begin(); reserved != reserved_io_names.end(); ++reserved) { if (name == reserved->first) { @@ -4055,7 +4055,7 @@ Session::io_name_is_legal (const std::string& name) const } } - boost::shared_ptr iop (_io_plugins.reader ()); + std::shared_ptr iop (_io_plugins.reader ()); for (auto const& i : *iop) { if (i->io_name () == name) { return false; @@ -4066,7 +4066,7 @@ Session::io_name_is_legal (const std::string& name) const } void -Session::set_exclusive_input_active (boost::shared_ptr rl, bool onoff, bool flip_others) +Session::set_exclusive_input_active (std::shared_ptr rl, bool onoff, bool flip_others) { RouteList rl2; vector connections; @@ -4076,7 +4076,7 @@ Session::set_exclusive_input_active (boost::shared_ptr rl, bool onoff */ if (flip_others == false && rl->size() == 1) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (rl->front()); + std::shared_ptr mt = std::dynamic_pointer_cast (rl->front()); if (mt) { mt->set_input_active (onoff); return; @@ -4101,7 +4101,7 @@ Session::set_exclusive_input_active (boost::shared_ptr rl, bool onoff for (RouteList::iterator r = rl2.begin(); r != rl2.end(); ++r) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (*r); + std::shared_ptr mt = std::dynamic_pointer_cast (*r); if (!mt) { continue; @@ -4123,7 +4123,7 @@ Session::set_exclusive_input_active (boost::shared_ptr rl, bool onoff for (RouteList::iterator r = rl2.begin(); r != rl2.end(); ++r) { if ((*r) != (*rt)) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (*r); + std::shared_ptr mt = std::dynamic_pointer_cast (*r); if (mt) { mt->set_input_active (!others_are_already_on); } @@ -4136,7 +4136,7 @@ Session::set_exclusive_input_active (boost::shared_ptr rl, bool onoff void Session::routes_using_input_from (const string& str, RouteList& rl) { - boost::shared_ptr r = routes.reader(); + std::shared_ptr r = routes.reader(); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->input()->connected_to (str)) { @@ -4145,10 +4145,10 @@ Session::routes_using_input_from (const string& str, RouteList& rl) } } -boost::shared_ptr +std::shared_ptr Session::route_by_name (string name) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->name() == name) { @@ -4156,13 +4156,13 @@ Session::route_by_name (string name) const } } - return boost::shared_ptr ((Route*) 0); + return std::shared_ptr ((Route*) 0); } -boost::shared_ptr +std::shared_ptr Session::route_by_id (PBD::ID id) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->id() == id) { @@ -4170,11 +4170,11 @@ Session::route_by_id (PBD::ID id) const } } - return boost::shared_ptr ((Route*) 0); + return std::shared_ptr ((Route*) 0); } -boost::shared_ptr +std::shared_ptr Session::stripable_by_id (PBD::ID id) const { StripableList sl; @@ -4186,15 +4186,15 @@ Session::stripable_by_id (PBD::ID id) const } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Session::trigger_by_id (PBD::ID id) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr box = (*i)->triggerbox(); + std::shared_ptr box = (*i)->triggerbox(); if (box) { TriggerPtr trigger = box->trigger_by_id(id); if (trigger) { @@ -4203,31 +4203,31 @@ Session::trigger_by_id (PBD::ID id) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr Session::processor_by_id (PBD::ID id) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr p = (*i)->Route::processor_by_id (id); + std::shared_ptr p = (*i)->Route::processor_by_id (id); if (p) { return p; } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr Session::get_remote_nth_route (PresentationInfo::order_t n) const { - return boost::dynamic_pointer_cast (get_remote_nth_stripable (n, PresentationInfo::Route)); + return std::dynamic_pointer_cast (get_remote_nth_stripable (n, PresentationInfo::Route)); } -boost::shared_ptr +std::shared_ptr Session::get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag flags) const { StripableList sl; @@ -4263,10 +4263,10 @@ Session::get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo } /* there is no nth stripable that matches the given flags */ - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Session::route_by_selected_count (uint32_t id) const { RouteList r (*(routes.reader ())); @@ -4283,7 +4283,7 @@ Session::route_by_selected_count (uint32_t id) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } void @@ -4299,13 +4299,13 @@ Session::reassign_track_numbers () for (RouteList::iterator i = r.begin(); i != r.end(); ++i) { assert (!(*i)->is_auditioner()); - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { (*i)->set_track_number(++tn); } else if (!(*i)->is_master() && !(*i)->is_monitor()) { (*i)->set_track_number(--bn); } - boost::shared_ptr tb = (*i)->triggerbox(); + std::shared_ptr tb = (*i)->triggerbox(); if (tb) { tb->set_order (trigger_order); trigger_order++; @@ -4317,7 +4317,7 @@ Session::reassign_track_numbers () if (decimals_changed && config.get_track_name_number ()) { for (RouteList::iterator i = r.begin(); i != r.end(); ++i) { - boost::shared_ptr t = boost::dynamic_pointer_cast (*i); + std::shared_ptr t = std::dynamic_pointer_cast (*i); if (t) { t->resync_take_name (); } @@ -4328,7 +4328,7 @@ Session::reassign_track_numbers () #ifndef NDEBUG if (DEBUG_ENABLED(DEBUG::OrderKeys)) { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("%1 numbered %2\n", (*i)->name(), (*i)->track_number())); } @@ -4338,9 +4338,9 @@ Session::reassign_track_numbers () } void -Session::playlist_region_added (boost::weak_ptr w) +Session::playlist_region_added (std::weak_ptr w) { - boost::shared_ptr r = w.lock (); + std::shared_ptr r = w.lock (); if (!r) { return; } @@ -4430,12 +4430,12 @@ Session::playlist_regions_extended (list const & ranges) /* Region management */ -boost::shared_ptr -Session::find_whole_file_parent (boost::shared_ptr child) const +std::shared_ptr +Session::find_whole_file_parent (std::shared_ptr child) const { const RegionFactory::RegionMap& regions (RegionFactory::regions()); RegionFactory::RegionMap::const_iterator i; - boost::shared_ptr region; + std::shared_ptr region; Glib::Threads::Mutex::Lock lm (region_lock); @@ -4451,20 +4451,20 @@ Session::find_whole_file_parent (boost::shared_ptr child) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } int -Session::destroy_sources (list > const& srcs) +Session::destroy_sources (list > const& srcs) { - set > relevant_regions; + set > relevant_regions; - for (list >::const_iterator s = srcs.begin(); s != srcs.end(); ++s) { + for (list >::const_iterator s = srcs.begin(); s != srcs.end(); ++s) { RegionFactory::get_regions_using_source (*s, relevant_regions); } - for (set >::iterator r = relevant_regions.begin(); r != relevant_regions.end(); ) { - set >::iterator tmp; + for (set >::iterator r = relevant_regions.begin(); r != relevant_regions.end(); ) { + set >::iterator tmp; tmp = r; ++tmp; @@ -4480,7 +4480,7 @@ Session::destroy_sources (list > const& srcs) r = tmp; } - for (list >::const_iterator s = srcs.begin(); s != srcs.end(); ++s) { + for (list >::const_iterator s = srcs.begin(); s != srcs.end(); ++s) { { Glib::Threads::Mutex::Lock ls (source_lock); @@ -4490,7 +4490,7 @@ Session::destroy_sources (list > const& srcs) (*s)->mark_for_remove (); (*s)->drop_references (); - SourceRemoved (boost::weak_ptr (*s)); /* EMIT SIGNAL */ + SourceRemoved (std::weak_ptr (*s)); /* EMIT SIGNAL */ } return 0; @@ -4499,16 +4499,16 @@ Session::destroy_sources (list > const& srcs) int Session::remove_last_capture () { - list > srcs; + list > srcs; - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; } - list >& l = tr->last_capture_sources(); + list >& l = tr->last_capture_sources(); if (!l.empty()) { srcs.insert (srcs.end(), l.begin(), l.end()); @@ -4528,16 +4528,16 @@ Session::remove_last_capture () } void -Session::get_last_capture_sources (std::list >& srcs) +Session::get_last_capture_sources (std::list >& srcs) { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; } - list >& l = tr->last_capture_sources(); + list >& l = tr->last_capture_sources(); if (!l.empty()) { srcs.insert (srcs.end(), l.begin(), l.end()); @@ -4549,7 +4549,7 @@ Session::get_last_capture_sources (std::list >& srcs) /* Source Management */ void -Session::add_source (boost::shared_ptr source) +Session::add_source (std::shared_ptr source) { pair entry; pair result; @@ -4566,7 +4566,7 @@ Session::add_source (boost::shared_ptr source) /* yay, new source */ - boost::shared_ptr fs = boost::dynamic_pointer_cast (source); + std::shared_ptr fs = std::dynamic_pointer_cast (source); if (fs) { if (!fs->within_session()) { @@ -4576,29 +4576,29 @@ Session::add_source (boost::shared_ptr source) set_dirty(); - boost::shared_ptr afs; + std::shared_ptr afs; - if ((afs = boost::dynamic_pointer_cast(source)) != 0) { + if ((afs = std::dynamic_pointer_cast(source)) != 0) { if (Config->get_auto_analyse_audio()) { Analyser::queue_source_for_analysis (source, false); } } - source->DropReferences.connect_same_thread (*this, boost::bind (&Session::remove_source, this, boost::weak_ptr (source))); + source->DropReferences.connect_same_thread (*this, boost::bind (&Session::remove_source, this, std::weak_ptr (source))); - SourceAdded (boost::weak_ptr (source)); /* EMIT SIGNAL */ + SourceAdded (std::weak_ptr (source)); /* EMIT SIGNAL */ } } void -Session::remove_source (boost::weak_ptr src) +Session::remove_source (std::weak_ptr src) { if (deletion_in_progress ()) { return; } SourceMap::iterator i; - boost::shared_ptr source = src.lock(); + std::shared_ptr source = src.lock(); if (!source) { return; @@ -4631,12 +4631,12 @@ Session::remove_source (boost::weak_ptr src) } } -boost::shared_ptr +std::shared_ptr Session::source_by_id (const PBD::ID& id) { Glib::Threads::Mutex::Lock lm (source_lock); SourceMap::iterator i; - boost::shared_ptr source; + std::shared_ptr source; if ((i = sources.find (id)) != sources.end()) { source = i->second; @@ -4645,7 +4645,7 @@ Session::source_by_id (const PBD::ID& id) return source; } -boost::shared_ptr +std::shared_ptr Session::audio_source_by_path_and_channel (const string& path, uint16_t chn) const { /* Restricted to audio files because only audio sources have channel @@ -4655,18 +4655,18 @@ Session::audio_source_by_path_and_channel (const string& path, uint16_t chn) con Glib::Threads::Mutex::Lock lm (source_lock); for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr afs - = boost::dynamic_pointer_cast(i->second); + std::shared_ptr afs + = std::dynamic_pointer_cast(i->second); if (afs && afs->path() == path && chn == afs->channel()) { return afs; } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Session::midi_source_by_path (const std::string& path, bool need_source_lock) const { /* Restricted to MIDI files because audio sources require a channel @@ -4679,17 +4679,17 @@ Session::midi_source_by_path (const std::string& path, bool need_source_lock) co } for (SourceMap::const_iterator s = sources.begin(); s != sources.end(); ++s) { - boost::shared_ptr ms - = boost::dynamic_pointer_cast(s->second); - boost::shared_ptr fs - = boost::dynamic_pointer_cast(s->second); + std::shared_ptr ms + = std::dynamic_pointer_cast(s->second); + std::shared_ptr fs + = std::dynamic_pointer_cast(s->second); if (ms && fs && fs->path() == path) { return ms; } } - return boost::shared_ptr(); + return std::shared_ptr(); } uint32_t @@ -4699,8 +4699,8 @@ Session::count_sources_by_origin (const string& path) Glib::Threads::Mutex::Lock lm (source_lock); for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr fs - = boost::dynamic_pointer_cast(i->second); + std::shared_ptr fs + = std::dynamic_pointer_cast(i->second); if (fs && fs->origin() == path) { ++cnt; @@ -5030,34 +5030,34 @@ Session::new_midi_source_path (const string& base, bool need_lock) /** Create a new within-session audio source */ -boost::shared_ptr +std::shared_ptr Session::create_audio_source_for_session (size_t n_chans, string const & base, uint32_t chan) { const string path = new_audio_source_path (base, n_chans, chan, true); if (!path.empty()) { - return boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, *this, path, sample_rate(), true, true)); + return std::dynamic_pointer_cast (SourceFactory::createWritable (DataType::AUDIO, *this, path, sample_rate(), true, true)); } else { throw failed_constructor (); } } /** Create a new within-session MIDI source */ -boost::shared_ptr +std::shared_ptr Session::create_midi_source_for_session (string const & basic_name) { const string path = new_midi_source_path (basic_name); if (!path.empty()) { - return boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, *this, path, sample_rate())); + return std::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, *this, path, sample_rate())); } else { throw failed_constructor (); } } /** Create a new within-session MIDI source */ -boost::shared_ptr -Session::create_midi_source_by_stealing_name (boost::shared_ptr track) +std::shared_ptr +Session::create_midi_source_by_stealing_name (std::shared_ptr track) { /* the caller passes in the track the source will be used in, so that we can keep the numbering sane. @@ -5078,12 +5078,12 @@ Session::create_midi_source_by_stealing_name (boost::shared_ptr track) If that attempted rename fails, we get "Foo-N+2.mid" anyway. */ - boost::shared_ptr mt = boost::dynamic_pointer_cast (track); + std::shared_ptr mt = std::dynamic_pointer_cast (track); assert (mt); std::string name = track->steal_write_source_name (); if (name.empty()) { - return boost::shared_ptr(); + return std::shared_ptr(); } /* MIDI files are small, just put them in the first location of the @@ -5092,11 +5092,11 @@ Session::create_midi_source_by_stealing_name (boost::shared_ptr track) const string path = Glib::build_filename (source_search_path (DataType::MIDI).front(), name); - return boost::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, *this, path, sample_rate())); + return std::dynamic_pointer_cast (SourceFactory::createWritable (DataType::MIDI, *this, path, sample_rate())); } bool -Session::playlist_is_active (boost::shared_ptr playlist) +Session::playlist_is_active (std::shared_ptr playlist) { Glib::Threads::Mutex::Lock lm (_playlists->lock); for (SessionPlaylists::List::iterator i = _playlists->playlists.begin(); i != _playlists->playlists.end(); i++) { @@ -5108,7 +5108,7 @@ Session::playlist_is_active (boost::shared_ptr playlist) } void -Session::add_playlist (boost::shared_ptr playlist, bool unused) +Session::add_playlist (std::shared_ptr playlist, bool unused) { if (playlist->hidden()) { return; @@ -5124,13 +5124,13 @@ Session::add_playlist (boost::shared_ptr playlist, bool unused) } void -Session::remove_playlist (boost::weak_ptr weak_playlist) +Session::remove_playlist (std::weak_ptr weak_playlist) { if (deletion_in_progress ()) { return; } - boost::shared_ptr playlist (weak_playlist.lock()); + std::shared_ptr playlist (weak_playlist.lock()); if (!playlist) { return; @@ -5142,7 +5142,7 @@ Session::remove_playlist (boost::weak_ptr weak_playlist) } void -Session::set_audition (boost::shared_ptr r) +Session::set_audition (std::shared_ptr r) { pending_audition_region = r; add_post_transport_work (PostTransportAudition); @@ -5158,11 +5158,11 @@ Session::audition_playlist () } void -Session::load_io_plugin (boost::shared_ptr ioplugin) +Session::load_io_plugin (std::shared_ptr ioplugin) { { RCUWriter writer (_io_plugins); - boost::shared_ptr iop = writer.get_copy (); + std::shared_ptr iop = writer.get_copy (); Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); ioplugin->ensure_io (); iop->push_back (ioplugin); @@ -5173,11 +5173,11 @@ Session::load_io_plugin (boost::shared_ptr ioplugin) } bool -Session::unload_io_plugin (boost::shared_ptr ioplugin) +Session::unload_io_plugin (std::shared_ptr ioplugin) { { RCUWriter writer (_io_plugins); - boost::shared_ptr iop = writer.get_copy (); + std::shared_ptr iop = writer.get_copy (); auto i = find (iop->begin (), iop->end (), ioplugin); if (i == iop->end ()) { return false; @@ -5439,7 +5439,7 @@ Session::non_realtime_set_audition () } void -Session::audition_region (boost::shared_ptr r) +Session::audition_region (std::shared_ptr r) { SessionEvent* ev = new SessionEvent (SessionEvent::Audition, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->region = r; @@ -5741,10 +5741,10 @@ Session::unmark_insert_id (uint32_t id) void Session::reset_native_file_format () { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { /* don't save state as we do this, there's no point */ _state_of_the_state = StateOfTheState (_state_of_the_state | InCleanup); @@ -5757,7 +5757,7 @@ Session::reset_native_file_format () bool Session::route_name_unique (string n) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->name() == n) { @@ -5785,13 +5785,13 @@ Session::route_name_internal (string n) const int Session::freeze_all (InterThreadInfo& itt) { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr t; + std::shared_ptr t; - if ((t = boost::dynamic_pointer_cast(*i)) != 0) { + if ((t = std::dynamic_pointer_cast(*i)) != 0) { /* XXX this is wrong because itt.progress will keep returning to zero at the start of every track. */ @@ -5804,22 +5804,22 @@ Session::freeze_all (InterThreadInfo& itt) struct MidiSourceLockMap { - boost::shared_ptr src; + std::shared_ptr src; Source::WriterLock lock; - MidiSourceLockMap (boost::shared_ptr midi_source) : src (midi_source), lock (src->mutex()) {} + MidiSourceLockMap (std::shared_ptr midi_source) : src (midi_source), lock (src->mutex()) {} }; -boost::shared_ptr +std::shared_ptr Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, - bool /*overwrite*/, vector >& srcs, + bool /*overwrite*/, vector >& srcs, InterThreadInfo& itt, - boost::shared_ptr endpoint, bool include_endpoint, + std::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, std::string const& name) { - boost::shared_ptr result; - boost::shared_ptr playlist; - boost::shared_ptr source; + std::shared_ptr result; + std::shared_ptr playlist; + std::shared_ptr source; ChanCount diskstream_channels (track.n_channels()); samplepos_t position; samplecnt_t this_chunk; @@ -5925,9 +5925,9 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, /* prepare MIDI files */ - for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { + for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { - boost::shared_ptr ms = boost::dynamic_pointer_cast(*src); + std::shared_ptr ms = std::dynamic_pointer_cast(*src); if (ms) { midi_source_locks.push_back (new MidiSourceLockMap (ms)); @@ -5937,8 +5937,8 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, /* prepare audio files */ - for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); + for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { + std::shared_ptr afs = std::dynamic_pointer_cast(*src); if (afs) { afs->prepare_for_peakfile_writes (); } @@ -5967,9 +5967,9 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, const samplecnt_t current_chunk = this_chunk - latency_skip; uint32_t n = 0; - for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); - boost::shared_ptr ms; + for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) { + std::shared_ptr afs = std::dynamic_pointer_cast(*src); + std::shared_ptr ms; if (afs) { if (afs->write (buffers.get_audio(n).data(latency_skip), current_chunk) != current_chunk) { @@ -6032,8 +6032,8 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, start += this_chunk; uint32_t n = 0; - for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); + for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) { + std::shared_ptr afs = std::dynamic_pointer_cast(*src); if (afs) { if (afs->write (buffers.get_audio(n).data(), this_chunk) != this_chunk) { @@ -6092,16 +6092,16 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, time (&now); xnow = localtime (&now); - for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); - boost::shared_ptr ms; + for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src) { + std::shared_ptr afs = std::dynamic_pointer_cast(*src); + std::shared_ptr ms; if (afs) { afs->update_header (position, *xnow, now); afs->flush_header (); afs->mark_immutable (); plist.add (Properties::start, timepos_t (0)); - } else if ((ms = boost::dynamic_pointer_cast(*src))) { + } else if ((ms = std::dynamic_pointer_cast(*src))) { Source::WriterLock lock (ms->mutex()); ms->mark_streaming_write_completed(lock); plist.add (Properties::start, timepos_t (Beats())); @@ -6122,14 +6122,14 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, out: if (!result) { - for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { + for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { (*src)->mark_for_remove (); (*src)->drop_references (); } } else { - for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); + for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { + std::shared_ptr afs = std::dynamic_pointer_cast(*src); if (afs) afs->done_with_peakfile_writes (); @@ -6215,10 +6215,10 @@ Session::ntracks () const /* XXX Could be optimized by caching */ uint32_t n = 0; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { ++n; } } @@ -6232,10 +6232,10 @@ Session::naudiotracks () const /* XXX Could be optimized by caching */ uint32_t n = 0; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { - if (boost::dynamic_pointer_cast (*i)) { + if (std::dynamic_pointer_cast (*i)) { ++n; } } @@ -6247,10 +6247,10 @@ uint32_t Session::nbusses () const { uint32_t n = 0; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { - if (boost::dynamic_pointer_cast(*i) == 0) { + if (std::dynamic_pointer_cast(*i) == 0) { ++n; } } @@ -6303,11 +6303,11 @@ Session::have_rec_disabled_track () const void Session::update_route_record_state () { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); RouteList::iterator i = rl->begin(); while (i != rl->end ()) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->rec_enable_control()->get_value()) { break; } @@ -6324,7 +6324,7 @@ Session::update_route_record_state () } for (i = rl->begin(); i != rl->end (); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && !tr->rec_enable_control()->get_value()) { break; } @@ -6349,7 +6349,7 @@ Session::listen_position_changed () return; } ProcessorChangeBlocker pcb (this); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->listen_position_changed (); } @@ -6383,14 +6383,14 @@ Session::route_group_property_changed (RouteGroup* rg) /** Called when a route is added to one of our route groups */ void -Session::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr r) +Session::route_added_to_route_group (RouteGroup* rg, std::weak_ptr r) { RouteAddedToRouteGroup (rg, r); } /** Called when a route is removed from one of our route groups */ void -Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr r) +Session::route_removed_from_route_group (RouteGroup* rg, std::weak_ptr r) { update_route_record_state (); RouteRemovedFromRouteGroup (rg, r); /* EMIT SIGNAL */ @@ -6400,14 +6400,14 @@ Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr } } -boost::shared_ptr +std::shared_ptr Session::get_nth_audio_track (uint32_t nth) const { - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); rl->sort (Stripable::Sorter ()); for (RouteList::const_iterator r = rl->begin(); r != rl->end(); ++r) { - boost::shared_ptr at = boost::dynamic_pointer_cast (*r); + std::shared_ptr at = std::dynamic_pointer_cast (*r); if (!at) { continue; } @@ -6415,17 +6415,17 @@ Session::get_nth_audio_track (uint32_t nth) const return at; } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr Session::get_tracks () const { - boost::shared_ptr rl = routes.reader (); - boost::shared_ptr tl (new RouteList); + std::shared_ptr rl = routes.reader (); + std::shared_ptr tl (new RouteList); for (RouteList::const_iterator r = rl->begin(); r != rl->end(); ++r) { - if (boost::dynamic_pointer_cast (*r)) { + if (std::dynamic_pointer_cast (*r)) { assert (!(*r)->is_auditioner()); // XXX remove me tl->push_back (*r); } @@ -6433,19 +6433,19 @@ Session::get_tracks () const return tl; } -boost::shared_ptr +std::shared_ptr Session::get_routes_with_regions_at (timepos_t const & p) const { - boost::shared_ptr r = routes.reader (); - boost::shared_ptr rl (new RouteList); + std::shared_ptr r = routes.reader (); + std::shared_ptr rl (new RouteList); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr) { continue; } - boost::shared_ptr pl = tr->playlist (); + std::shared_ptr pl = tr->playlist (); if (!pl) { continue; } @@ -6688,7 +6688,7 @@ Session::remove_dir_from_search_path (const string& dir, DataType type) } -boost::shared_ptr +std::shared_ptr Session::get_speakers() { return _speakers; @@ -6699,7 +6699,7 @@ Session::unknown_processors () const { list p; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { list t = (*i)->unknown_processors (); copy (t.begin(), t.end(), back_inserter (p)); @@ -6716,10 +6716,10 @@ Session::missing_filesources (DataType dt) const { list p; for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - if (dt == DataType::AUDIO && 0 != boost::dynamic_pointer_cast (i->second)) { + if (dt == DataType::AUDIO && 0 != std::dynamic_pointer_cast (i->second)) { p.push_back (i->second->name()); } - else if (dt == DataType::MIDI && 0 != boost::dynamic_pointer_cast (i->second) && (i->second->flags() & Source::Missing) != 0) { + else if (dt == DataType::MIDI && 0 != std::dynamic_pointer_cast (i->second) && (i->second->flags() & Source::Missing) != 0) { p.push_back (i->second->name()); } } @@ -6783,7 +6783,7 @@ Session::update_route_latency (bool playback, bool apply_to_delayline, bool* del DEBUG_TRACE (DEBUG::LatencyCompensation , string_compose ("update_route_latency: %1 apply_to_delayline? %2)\n", (playback ? "PLAYBACK" : "CAPTURE"), (apply_to_delayline ? "yes" : "no"))); /* Note: RouteList is process-graph sorted */ - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); if (playback) { /* reverse the list so that we work backwards from the last route to run to the first, @@ -6836,7 +6836,7 @@ Session::set_owned_port_public_latency (bool playback) _click_io->set_public_port_latencies (_click_io->connected_latency (playback), playback); } - boost::shared_ptr iop (_io_plugins.reader ()); + std::shared_ptr iop (_io_plugins.reader ()); for (auto const& i : *iop) { i->set_public_latency (playback); } @@ -6910,7 +6910,7 @@ Session::update_latency (bool playback) } /* Note; RouteList is sorted as process-graph */ - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); if (playback) { /* reverse the list so that we work backwards from the last route to run to the first */ @@ -6995,7 +6995,7 @@ Session::set_worst_output_latency () return; } - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency()); @@ -7022,7 +7022,7 @@ Session::set_worst_input_latency () return; } - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency()); @@ -7098,7 +7098,7 @@ Session::update_latency_compensation (bool force_whole_graph, bool called_from_b #endif lm.acquire (); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->apply_latency_compensation (); } @@ -7141,12 +7141,12 @@ Session::notify_presentation_info_change (PropertyChange const& what_changed) } void -Session::controllable_touched (boost::weak_ptr c) +Session::controllable_touched (std::weak_ptr c) { _recently_touched_controllable = c; } -boost::shared_ptr +std::shared_ptr Session::recently_touched_controllable () const { return _recently_touched_controllable.lock (); @@ -7219,7 +7219,7 @@ Session::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos pl->clear_changes (); pl->clear_owned_changes (); - boost::shared_ptr p = copy ? pl->copy (ltr) : pl->cut (ltr); + std::shared_ptr p = copy ? pl->copy (ltr) : pl->cut (ltr); // TODO copy interpolated MIDI events if (!copy) { pl->ripple (start, end.distance(start), NULL); @@ -7255,7 +7255,7 @@ Session::cut_copy_section (timepos_t const& start, timepos_t const& end, timepos } void -Session::auto_connect_route (boost::shared_ptr route, +Session::auto_connect_route (std::shared_ptr route, bool connect_inputs, bool connect_outputs, const ChanCount& input_start, @@ -7298,7 +7298,7 @@ Session::queue_latency_recompute () void Session::auto_connect (const AutoConnectRequest& ar) { - boost::shared_ptr route = ar.route.lock(); + std::shared_ptr route = ar.route.lock(); if (!route) { return; } @@ -7494,7 +7494,7 @@ Session::auto_connect_thread_run () } if (_midi_ports && g_atomic_int_get (&_update_pretty_names)) { - boost::shared_ptr ap = boost::dynamic_pointer_cast (vkbd_output_port ()); + std::shared_ptr ap = std::dynamic_pointer_cast (vkbd_output_port ()); if (ap->pretty_name () != _("Virtual Keyboard")) { ap->set_pretty_name (_("Virtual Keyboard")); } @@ -7598,7 +7598,7 @@ Session::nth_mixer_scene_valid (size_t nth) const bool Session::apply_nth_mixer_scene (size_t nth) { - boost::shared_ptr scene; + std::shared_ptr scene; { Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock); if (_mixer_scenes.size () <= nth) { @@ -7618,7 +7618,7 @@ Session::apply_nth_mixer_scene (size_t nth) bool Session::apply_nth_mixer_scene (size_t nth, RouteList const& rl) { - boost::shared_ptr scene; + std::shared_ptr scene; { Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock); if (_mixer_scenes.size () <= nth) { @@ -7643,7 +7643,7 @@ Session::apply_nth_mixer_scene (size_t nth, RouteList const& rl) void Session::store_nth_mixer_scene (size_t nth) { - boost::shared_ptr scn = nth_mixer_scene (nth, true); + std::shared_ptr scn = nth_mixer_scene (nth, true); _last_touched_mixer_scene_idx = nth; scn->snapshot (); @@ -7655,7 +7655,7 @@ Session::store_nth_mixer_scene (size_t nth) } } -boost::shared_ptr +std::shared_ptr Session::nth_mixer_scene (size_t nth, bool create_if_missing) { Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock); @@ -7668,16 +7668,16 @@ Session::nth_mixer_scene (size_t nth, bool create_if_missing) if (_mixer_scenes.size() <= nth) { _mixer_scenes.resize (nth + 1); } - _mixer_scenes[nth] = boost::shared_ptr (new MixerScene (*this)); + _mixer_scenes[nth] = std::shared_ptr (new MixerScene (*this)); return _mixer_scenes[nth]; } if (_mixer_scenes.size () <= nth) { - return boost::shared_ptr (); + return std::shared_ptr (); } return _mixer_scenes[nth]; } -std::vector> +std::vector> Session::mixer_scenes () const { Glib::Threads::RWLock::ReaderLock lm (_mixer_scenes_lock); diff --git a/libs/ardour/session_bundles.cc b/libs/ardour/session_bundles.cc index cc741b94c3..e8fee57197 100644 --- a/libs/ardour/session_bundles.cc +++ b/libs/ardour/session_bundles.cc @@ -43,11 +43,11 @@ using namespace ARDOUR; using std::string; void -Session::add_bundle (boost::shared_ptr bundle, bool emit_signal) +Session::add_bundle (std::shared_ptr bundle, bool emit_signal) { { RCUWriter writer (_bundles); - boost::shared_ptr b = writer.get_copy (); + std::shared_ptr b = writer.get_copy (); b->push_back (bundle); } @@ -58,13 +58,13 @@ Session::add_bundle (boost::shared_ptr bundle, bool emit_signal) } void -Session::remove_bundle (boost::shared_ptr bundle) +Session::remove_bundle (std::shared_ptr bundle) { bool removed = false; { RCUWriter writer (_bundles); - boost::shared_ptr b = writer.get_copy (); + std::shared_ptr b = writer.get_copy (); BundleList::iterator i = find (b->begin(), b->end(), bundle); if (i != b->end()) { @@ -80,10 +80,10 @@ Session::remove_bundle (boost::shared_ptr bundle) set_dirty(); } -boost::shared_ptr +std::shared_ptr Session::bundle_by_name (string name) const { - boost::shared_ptr b = _bundles.reader (); + std::shared_ptr b = _bundles.reader (); for (BundleList::const_iterator i = b->begin(); i != b->end(); ++i) { if ((*i)->name() == name) { @@ -91,7 +91,7 @@ Session::bundle_by_name (string name) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } void @@ -100,9 +100,9 @@ Session::setup_bundles () { RCUWriter writer (_bundles); - boost::shared_ptr b = writer.get_copy (); + std::shared_ptr b = writer.get_copy (); for (BundleList::iterator i = b->begin(); i != b->end();) { - if (boost::dynamic_pointer_cast(*i)) { + if (std::dynamic_pointer_cast(*i)) { ++i; continue; } @@ -122,7 +122,7 @@ Session::setup_bundles () /* now add virtual Vkeybd, compare to PortGroupList::gather */ if (_midi_ports) { - boost::shared_ptr ap = boost::dynamic_pointer_cast (vkbd_output_port ()); + std::shared_ptr ap = std::dynamic_pointer_cast (vkbd_output_port ()); inputs[DataType::MIDI].push_back (AudioEngine::instance()->make_port_name_non_relative (ap->name ())); /* JACK semantics prevent us directly calling the @@ -147,13 +147,13 @@ Session::setup_bundles () for (uint32_t np = 0; np < outputs[DataType::AUDIO].size(); ++np) { std::string pn = _engine.get_pretty_name_by_name (outputs[DataType::AUDIO][np]); - boost::shared_ptr c; + std::shared_ptr c; if (!pn.empty()) { - c = boost::shared_ptr (new Bundle (string_compose (_("out %1"), pn), true)); + c = std::shared_ptr (new Bundle (string_compose (_("out %1"), pn), true)); } else { char buf[64]; snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1); - c = boost::shared_ptr (new Bundle (buf, true)); + c = std::shared_ptr (new Bundle (buf, true)); } c->add_channel (_("mono"), DataType::AUDIO); @@ -166,15 +166,15 @@ Session::setup_bundles () for (uint32_t np = 0; np < outputs[DataType::AUDIO].size(); np += 2) { if (np + 1 < outputs[DataType::AUDIO].size()) { - boost::shared_ptr c; + std::shared_ptr c; std::string pn1 = _engine.get_pretty_name_by_name (outputs[DataType::AUDIO][np]); std::string pn2 = _engine.get_pretty_name_by_name (outputs[DataType::AUDIO][np+1]); if (!pn1.empty() && !pn2.empty()) { - c = boost::shared_ptr (new Bundle (string_compose (_("out %1+%2"), pn1, pn2), true)); + c = std::shared_ptr (new Bundle (string_compose (_("out %1+%2"), pn1, pn2), true)); } else { char buf[64]; snprintf (buf, sizeof(buf), _("out %" PRIu32 "+%" PRIu32), np + 1, np + 2); - c = boost::shared_ptr (new Bundle (buf, true)); + c = std::shared_ptr (new Bundle (buf, true)); } c->add_channel (_("L"), DataType::AUDIO); c->set_port (0, outputs[DataType::AUDIO][np]); @@ -188,14 +188,14 @@ Session::setup_bundles () /* mono input bundles */ for (uint32_t np = 0; np < inputs[DataType::AUDIO].size(); ++np) { - boost::shared_ptr c; + std::shared_ptr c; std::string pn = _engine.get_pretty_name_by_name (inputs[DataType::AUDIO][np]); if (!pn.empty()) { - c = boost::shared_ptr (new Bundle (string_compose (_("in %1"), pn), false)); + c = std::shared_ptr (new Bundle (string_compose (_("in %1"), pn), false)); } else { char buf[64]; snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1); - c = boost::shared_ptr (new Bundle (buf, false)); + c = std::shared_ptr (new Bundle (buf, false)); } c->add_channel (_("mono"), DataType::AUDIO); @@ -208,15 +208,15 @@ Session::setup_bundles () for (uint32_t np = 0; np < inputs[DataType::AUDIO].size(); np += 2) { if (np + 1 < inputs[DataType::AUDIO].size()) { - boost::shared_ptr c; + std::shared_ptr c; std::string pn1 = _engine.get_pretty_name_by_name (inputs[DataType::AUDIO][np]); std::string pn2 = _engine.get_pretty_name_by_name (inputs[DataType::AUDIO][np+1]); if (!pn1.empty() && !pn2.empty()) { - c = boost::shared_ptr (new Bundle (string_compose (_("in %1+%2"), pn1, pn2), false)); + c = std::shared_ptr (new Bundle (string_compose (_("in %1+%2"), pn1, pn2), false)); } else { char buf[64]; snprintf (buf, sizeof(buf), _("in %" PRIu32 "+%" PRIu32), np + 1, np + 2); - c = boost::shared_ptr (new Bundle (buf, false)); + c = std::shared_ptr (new Bundle (buf, false)); } c->add_channel (_("L"), DataType::AUDIO); @@ -239,7 +239,7 @@ Session::setup_bundles () } else { boost::erase_first (n, X_("alsa_pcm:")); } - boost::shared_ptr c (new Bundle (n, false)); + std::shared_ptr c (new Bundle (n, false)); c->add_channel ("", DataType::MIDI); c->set_port (0, inputs[DataType::MIDI][np]); add_bundle (c, false); @@ -255,7 +255,7 @@ Session::setup_bundles () } else { boost::erase_first (n, X_("alsa_pcm:")); } - boost::shared_ptr c (new Bundle (n, true)); + std::shared_ptr c (new Bundle (n, true)); c->add_channel ("", DataType::MIDI); c->set_port (0, outputs[DataType::MIDI][np]); add_bundle (c, false); diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index e0538aaaa6..9b268680d6 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -77,7 +77,7 @@ Session::schedule_capture_buffering_adjustment () } void -Session::request_overwrite_buffer (boost::shared_ptr t, OverwriteReason why) +Session::request_overwrite_buffer (std::shared_ptr t, OverwriteReason why) { assert (t); SessionEvent *ev = new SessionEvent (SessionEvent::Overwrite, SessionEvent::Replace, SessionEvent::Immediate, 0, 0, 0.0); @@ -87,7 +87,7 @@ Session::request_overwrite_buffer (boost::shared_ptr t, OverwriteReason w } void -Session::overwrite_some_buffers (boost::shared_ptr r, OverwriteReason why) +Session::overwrite_some_buffers (std::shared_ptr r, OverwriteReason why) { /* this is called from the process thread while handling queued * SessionEvents. Therefore neither playback sample or read offsets in @@ -101,7 +101,7 @@ Session::overwrite_some_buffers (boost::shared_ptr r, OverwriteReason why if (r) { - boost::shared_ptr t = boost::dynamic_pointer_cast (r); + std::shared_ptr t = std::dynamic_pointer_cast (r); assert (t); t->set_pending_overwrite (why); diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index 9991ed1bed..2c2fe0e6a2 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -92,7 +92,7 @@ Session::memento_command_factory(XMLNode *n) n->get_property ("type-name", type_name); if (type_name == "ARDOUR::AudioRegion" || type_name == "ARDOUR::MidiRegion" || type_name == "ARDOUR::Region") { - boost::shared_ptr r = RegionFactory::region_by_id (id); + std::shared_ptr r = RegionFactory::region_by_id (id); if (r) { return new MementoCommand(*r, before, after); } @@ -112,12 +112,12 @@ Session::memento_command_factory(XMLNode *n) } else if (type_name == "ARDOUR::Playlist" || type_name == "ARDOUR::AudioPlaylist" || type_name == "ARDOUR::MidiPlaylist") { - if (boost::shared_ptr pl = _playlists->by_name(child->property("name")->value())) { + if (std::shared_ptr pl = _playlists->by_name(child->property("name")->value())) { return new MementoCommand(*(pl.get()), before, after); } } else if (type_name == "ARDOUR::Route" || type_name == "ARDOUR::AudioTrack" || type_name == "ARDOUR::MidiTrack") { - if (boost::shared_ptr r = route_by_id(id)) { + if (std::shared_ptr r = route_by_id(id)) { return new MementoCommand(*r, before, after); } else { error << string_compose (X_("Route %1 not found in session"), id) << endmsg; @@ -163,13 +163,13 @@ Session::stateful_diff_command_factory (XMLNode* n) } if ((type_name == "ARDOUR::AudioRegion" || type_name == "ARDOUR::MidiRegion")) { - boost::shared_ptr r = RegionFactory::region_by_id (id); + std::shared_ptr r = RegionFactory::region_by_id (id); if (r) { return new StatefulDiffCommand (r, *n); } } else if (type_name == "ARDOUR::AudioPlaylist" || type_name == "ARDOUR::MidiPlaylist") { - boost::shared_ptr p = _playlists->by_id (id); + std::shared_ptr p = _playlists->by_id (id); if (p) { return new StatefulDiffCommand (p, *n); } else { diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 22deeedac7..7cedffa520 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -404,7 +404,7 @@ std::ostream& operator<<(std::ostream& o, ARDOUR::SessionEvent const& ev) { o << " region: '" << ev.region->name () << "'"; break; case SessionEvent::Overwrite: - if (boost::shared_ptr track = ev.track.lock ()) { + if (std::shared_ptr track = ev.track.lock ()) { o << " track: '" << track->name () << "'"; } o << " reason: " << ev.overwrite; diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index 123ca97285..b989a004af 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -45,7 +45,7 @@ using namespace PBD; #define TFSM_ROLL() { _transport_fsm->enqueue (new TransportFSM::Event (TransportFSM::StartTransport)); } #define TFSM_SPEED(speed) { _transport_fsm->enqueue (new TransportFSM::Event (speed)); } -boost::shared_ptr +std::shared_ptr Session::get_export_handler () { if (!export_handler) { @@ -55,7 +55,7 @@ Session::get_export_handler () return export_handler; } -boost::shared_ptr +std::shared_ptr Session::get_export_status () { if (!export_status) { @@ -74,7 +74,7 @@ Session::pre_export () /* take everyone out of awrite to avoid disasters */ { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->protect_automation (); @@ -172,10 +172,10 @@ Session::start_audio_export (samplepos_t position, bool realtime, bool region_ex /* get everyone to the right position */ - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->seek (position, true)) { error << string_compose (_("%1: cannot seek to %2 for export"), (*i)->name(), position) diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc index 79f1264303..6dc59f3279 100644 --- a/libs/ardour/session_ltc.cc +++ b/libs/ardour/session_ltc.cc @@ -107,7 +107,7 @@ Session::ltc_tx_resync_latency (bool playback) if (deletion_in_progress() || !playback) { return; } - boost::shared_ptr ltcport = ltc_output_port(); + std::shared_ptr ltcport = ltc_output_port(); if (ltcport) { ltcport->get_connected_latency_range(ltc_out_latency, true); DEBUG_TRACE (DEBUG::TXLTC, string_compose ("resync latency: %1\n", ltc_out_latency.max)); @@ -167,7 +167,7 @@ Session::send_ltc_for_cycle (samplepos_t start_sample, samplepos_t end_sample, p assert (n_samples > 0); pframes_t txf = 0; - boost::shared_ptr ltcport = ltc_output_port(); + std::shared_ptr ltcport = ltc_output_port(); if (!ltcport) { assert (deletion_in_progress ()); diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 81f97cf69a..de754a4077 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -26,10 +26,11 @@ #include #include #include -#include #include #include +#include + #include #include "midi++/mmc.h" @@ -65,7 +66,7 @@ void Session::midi_panic() { { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { MidiTrack *track = dynamic_cast((*i).get()); @@ -298,7 +299,7 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc) of an MTC slave to become out of date. Catch this. */ - boost::shared_ptr mtcs = boost::dynamic_pointer_cast (transport_master()); + std::shared_ptr mtcs = std::dynamic_pointer_cast (transport_master()); if (mtcs) { // cerr << "Locate *with* MTC slave\n"; @@ -327,7 +328,7 @@ Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw) } } -boost::shared_ptr +std::shared_ptr Session::get_midi_nth_route_by_id (PresentationInfo::order_t n) const { PresentationInfo::Flag f; @@ -343,7 +344,7 @@ Session::get_midi_nth_route_by_id (PresentationInfo::order_t n) const f = PresentationInfo::Route; } - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); PresentationInfo::order_t match_cnt = 0; for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { @@ -354,7 +355,7 @@ Session::get_midi_nth_route_by_id (PresentationInfo::order_t n) const } } - return boost::shared_ptr(); + return std::shared_ptr(); } void @@ -364,12 +365,12 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled) return; } - boost::shared_ptr r = get_midi_nth_route_by_id (trk); + std::shared_ptr r = get_midi_nth_route_by_id (trk); if (r) { - boost::shared_ptr at; + std::shared_ptr at; - if ((at = boost::dynamic_pointer_cast (r))) { + if ((at = std::dynamic_pointer_cast (r))) { at->rec_enable_control()->set_value (enabled, Controllable::UseGroup); } } @@ -381,7 +382,7 @@ Session::mtc_tx_resync_latency (bool playback) if (deletion_in_progress() || !playback) { return; } - boost::shared_ptr mtxport = _midi_ports->mtc_output_port (); + std::shared_ptr mtxport = _midi_ports->mtc_output_port (); if (mtxport) { mtxport->get_connected_latency_range(mtc_out_latency, true); DEBUG_TRACE (DEBUG::MTC, string_compose ("resync latency: %1\n", mtc_out_latency.max)); @@ -661,56 +662,56 @@ Session::start_midi_thread () return 0; } -boost::shared_ptr +std::shared_ptr Session::mmc_output_port () const { return _midi_ports->mmc_output_port (); } -boost::shared_ptr +std::shared_ptr Session::mmc_input_port () const { return _midi_ports->mmc_input_port (); } -boost::shared_ptr +std::shared_ptr Session::scene_output_port () const { return _midi_ports->scene_output_port (); } -boost::shared_ptr +std::shared_ptr Session::scene_input_port () const { return _midi_ports->scene_input_port (); } -boost::shared_ptr +std::shared_ptr Session::trigger_input_port () const { return _midi_ports->trigger_input_port (); } -boost::shared_ptr +std::shared_ptr Session::vkbd_output_port () const { return _midi_ports->vkbd_output_port (); } -boost::shared_ptr +std::shared_ptr Session::midi_clock_output_port () const { return _midi_ports->midi_clock_output_port (); } -boost::shared_ptr +std::shared_ptr Session::mtc_output_port () const { return _midi_ports->mtc_output_port (); } void -Session::midi_track_presentation_info_changed (PropertyChange const& what_changed, boost::weak_ptr mt) +Session::midi_track_presentation_info_changed (PropertyChange const& what_changed, std::weak_ptr mt) { if (!Config->get_midi_input_follows_selection()) { return; @@ -720,7 +721,7 @@ Session::midi_track_presentation_info_changed (PropertyChange const& what_change return; } - boost::shared_ptr new_midi_target (mt.lock ()); + std::shared_ptr new_midi_target (mt.lock ()); if (new_midi_target->is_selected()) { rewire_selected_midi (new_midi_target); @@ -758,13 +759,13 @@ Session::disconnect_port_for_rewire (std::string const& port) const } void -Session::rewire_selected_midi (boost::shared_ptr new_midi_target) +Session::rewire_selected_midi (std::shared_ptr new_midi_target) { if (!new_midi_target) { return; } - boost::shared_ptr old_midi_target = current_midi_target.lock (); + std::shared_ptr old_midi_target = current_midi_target.lock (); if (new_midi_target == old_midi_target) { return; @@ -792,7 +793,7 @@ Session::rewire_midi_selection_ports () return; } - boost::shared_ptr target = current_midi_target.lock(); + std::shared_ptr target = current_midi_target.lock(); if (!target) { return; diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc index 31eef27e70..272de7695d 100644 --- a/libs/ardour/session_playlists.cc +++ b/libs/ardour/session_playlists.cc @@ -46,7 +46,7 @@ SessionPlaylists::~SessionPlaylists () ++tmp; DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for used playlist %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count())); - boost::shared_ptr keeper (*i); + std::shared_ptr keeper (*i); (*i)->drop_references (); i = tmp; @@ -60,7 +60,7 @@ SessionPlaylists::~SessionPlaylists () ++tmp; DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for unused playlist %1 ; pre-ref = %2\n", (*i)->name(), (*i).use_count())); - boost::shared_ptr keeper (*i); + std::shared_ptr keeper (*i); (*i)->drop_references (); i = tmp; @@ -71,7 +71,7 @@ SessionPlaylists::~SessionPlaylists () } bool -SessionPlaylists::add (boost::shared_ptr playlist) +SessionPlaylists::add (std::shared_ptr playlist) { Glib::Threads::Mutex::Lock lm (lock); @@ -79,9 +79,9 @@ SessionPlaylists::add (boost::shared_ptr playlist) if (!existing) { playlists.insert (playlists.begin(), playlist); - playlist->InUse.connect_same_thread (*this, boost::bind (&SessionPlaylists::track, this, _1, boost::weak_ptr(playlist))); + playlist->InUse.connect_same_thread (*this, boost::bind (&SessionPlaylists::track, this, _1, std::weak_ptr(playlist))); playlist->DropReferences.connect_same_thread ( - *this, boost::bind (&SessionPlaylists::remove_weak, this, boost::weak_ptr (playlist)) + *this, boost::bind (&SessionPlaylists::remove_weak, this, std::weak_ptr (playlist)) ); } @@ -89,16 +89,16 @@ SessionPlaylists::add (boost::shared_ptr playlist) } void -SessionPlaylists::remove_weak (boost::weak_ptr playlist) +SessionPlaylists::remove_weak (std::weak_ptr playlist) { - boost::shared_ptr p = playlist.lock (); + std::shared_ptr p = playlist.lock (); if (p) { remove (p); } } void -SessionPlaylists::remove (boost::shared_ptr playlist) +SessionPlaylists::remove (std::shared_ptr playlist) { Glib::Threads::Mutex::Lock lm (lock); @@ -141,9 +141,9 @@ SessionPlaylists::update_tracking () } void -SessionPlaylists::track (bool inuse, boost::weak_ptr wpl) +SessionPlaylists::track (bool inuse, std::weak_ptr wpl) { - boost::shared_ptr pl(wpl.lock()); + std::shared_ptr pl(wpl.lock()); if (!pl) { return; @@ -186,12 +186,12 @@ SessionPlaylists::n_playlists () const return playlists.size(); } -boost::shared_ptr +std::shared_ptr SessionPlaylists::for_pgroup (string pgroup_id, const PBD::ID& id) { if(pgroup_id.length()==0) { /*matching empty pgroup-id's would be meaningless*/ - return boost::shared_ptr(); + return std::shared_ptr(); } Glib::Threads::Mutex::Lock lm (lock); @@ -212,13 +212,13 @@ SessionPlaylists::for_pgroup (string pgroup_id, const PBD::ID& id) } } - return boost::shared_ptr(); + return std::shared_ptr(); } -std::vector > +std::vector > SessionPlaylists::playlists_for_pgroup (std::string pgroup) { - vector > pl_tr; + vector > pl_tr; if(pgroup.length()==0) { /*matching empty pgroup-id's would be meaningless*/ @@ -242,7 +242,7 @@ SessionPlaylists::playlists_for_pgroup (std::string pgroup) return pl_tr; } -boost::shared_ptr +std::shared_ptr SessionPlaylists::by_name (string name) { Glib::Threads::Mutex::Lock lm (lock); @@ -259,10 +259,10 @@ SessionPlaylists::by_name (string name) } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr SessionPlaylists::by_id (const PBD::ID& id) { Glib::Threads::Mutex::Lock lm (lock); @@ -279,11 +279,11 @@ SessionPlaylists::by_id (const PBD::ID& id) } } - return boost::shared_ptr(); + return std::shared_ptr(); } void -SessionPlaylists::unassigned (std::list > & list) +SessionPlaylists::unassigned (std::list > & list) { Glib::Threads::Mutex::Lock lm (lock); @@ -319,7 +319,7 @@ SessionPlaylists::update_orig_2X (PBD::ID old_orig, PBD::ID new_orig) } void -SessionPlaylists::get (vector >& s) const +SessionPlaylists::get (vector >& s) const { Glib::Threads::Mutex::Lock lm (lock); @@ -333,7 +333,7 @@ SessionPlaylists::get (vector >& s) const } void -SessionPlaylists::destroy_region (boost::shared_ptr r) +SessionPlaylists::destroy_region (std::shared_ptr r) { Glib::Threads::Mutex::Lock lm (lock); @@ -350,7 +350,7 @@ SessionPlaylists::destroy_region (boost::shared_ptr r) * Important: this counts usage in both used and not-used playlists. */ uint32_t -SessionPlaylists::source_use_count (boost::shared_ptr src) const +SessionPlaylists::source_use_count (std::shared_ptr src) const { uint32_t count = 0; @@ -400,14 +400,14 @@ SessionPlaylists::update_after_tempo_map_change () namespace { struct id_compare { - bool operator()(const boost::shared_ptr& p1, const boost::shared_ptr& p2) const + bool operator()(const std::shared_ptr& p1, const std::shared_ptr& p2) const { return p1->id () < p2->id (); } }; -typedef std::set > List; -typedef std::set, id_compare> IDSortedList; +typedef std::set > List; +typedef std::set, id_compare> IDSortedList; static void get_id_sorted_playlists (const List& playlists, IDSortedList& id_sorted_playlists) @@ -462,9 +462,9 @@ SessionPlaylists::add_state (XMLNode* node, bool save_template, bool include_unu /** @return true for `stop cleanup', otherwise false */ bool -SessionPlaylists::maybe_delete_unused (boost::function)> ask) +SessionPlaylists::maybe_delete_unused (boost::function)> ask) { - vector > playlists_tbd; + vector > playlists_tbd; bool delete_remaining = false; bool keep_remaining = false; @@ -510,8 +510,8 @@ SessionPlaylists::maybe_delete_unused (boost::function >::iterator x = playlists_tbd.begin(); x != playlists_tbd.end(); ++x) { - boost::shared_ptr keeper (*x); + for (vector >::iterator x = playlists_tbd.begin(); x != playlists_tbd.end(); ++x) { + std::shared_ptr keeper (*x); (*x)->drop_references (); } @@ -525,7 +525,7 @@ SessionPlaylists::load (Session& session, const XMLNode& node) { XMLNodeList nlist; XMLNodeConstIterator niter; - boost::shared_ptr playlist; + std::shared_ptr playlist; nlist = node.children(); @@ -545,7 +545,7 @@ SessionPlaylists::load_unused (Session& session, const XMLNode& node) { XMLNodeList nlist; XMLNodeConstIterator niter; - boost::shared_ptr playlist; + std::shared_ptr playlist; nlist = node.children(); @@ -558,13 +558,13 @@ SessionPlaylists::load_unused (Session& session, const XMLNode& node) // now manually untrack it - track (false, boost::weak_ptr (playlist)); + track (false, std::weak_ptr (playlist)); } return 0; } -boost::shared_ptr +std::shared_ptr SessionPlaylists::XMLPlaylistFactory (Session& session, const XMLNode& node) { try { @@ -572,16 +572,16 @@ SessionPlaylists::XMLPlaylistFactory (Session& session, const XMLNode& node) } catch (failed_constructor& err) { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr SessionPlaylists::find_crossfade (const PBD::ID& id) { Glib::Threads::Mutex::Lock lm (lock); - boost::shared_ptr c; + std::shared_ptr c; for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) { c = (*i)->find_crossfade (id); @@ -597,11 +597,11 @@ SessionPlaylists::find_crossfade (const PBD::ID& id) } } - return boost::shared_ptr (); + return std::shared_ptr (); } uint32_t -SessionPlaylists::region_use_count (boost::shared_ptr region) const +SessionPlaylists::region_use_count (std::shared_ptr region) const { Glib::Threads::Mutex::Lock lm (lock); uint32_t cnt = 0; @@ -617,10 +617,10 @@ SessionPlaylists::region_use_count (boost::shared_ptr region) const return cnt; } -vector > +vector > SessionPlaylists::get_used () const { - vector > pl; + vector > pl; Glib::Threads::Mutex::Lock lm (lock); @@ -631,10 +631,10 @@ SessionPlaylists::get_used () const return pl; } -vector > +vector > SessionPlaylists::get_unused () const { - vector > pl; + vector > pl; Glib::Threads::Mutex::Lock lm (lock); @@ -646,15 +646,15 @@ SessionPlaylists::get_unused () const } /** @return list of Playlists that are associated with a track */ -vector > -SessionPlaylists::playlists_for_track (boost::shared_ptr tr) const +vector > +SessionPlaylists::playlists_for_track (std::shared_ptr tr) const { - vector > pl; + vector > pl; get (pl); - vector > pl_tr; + vector > pl_tr; - for (vector >::iterator i = pl.begin(); i != pl.end(); ++i) { + for (vector >::iterator i = pl.begin(); i != pl.end(); ++i) { if ( ((*i)->get_orig_track_id() == tr->id()) || (tr->playlist()->id() == (*i)->id()) || ((*i)->shared_with (tr->id())) ) @@ -667,7 +667,7 @@ SessionPlaylists::playlists_for_track (boost::shared_ptr tr) const } void -SessionPlaylists::foreach (boost::function)> functor, bool incl_unused) +SessionPlaylists::foreach (boost::function)> functor, bool incl_unused) { Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); i++) { diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 99c33dd1db..0f9c3b1aee 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -110,7 +110,7 @@ Session::process (pframes_t nframes) _engine.main_thread()->get_buffers (); - boost::shared_ptr io_graph_chain = _io_graph_chain[0]; + std::shared_ptr io_graph_chain = _io_graph_chain[0]; if (io_graph_chain) { PortManager::falloff_cache_calc (nframes, nominal_sample_rate ()); _process_graph->process_io_plugs (io_graph_chain, nframes, 0); @@ -134,7 +134,7 @@ Session::process (pframes_t nframes) bool one_or_more_routes_declicking = false; { ProcessorChangeBlocker pcb (this); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->apply_processor_changes_rt()) { _rt_emit_pending = true; @@ -146,7 +146,7 @@ Session::process (pframes_t nframes) } if (_update_send_delaylines) { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { (*i)->update_send_delaylines (); } @@ -205,7 +205,7 @@ Session::no_roll (pframes_t nframes) samplepos_t end_sample = _transport_sample + floor (nframes * _transport_fsm->transport_speed()); int ret = 0; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); if (_click_io) { _click_io->silence (nframes); @@ -218,7 +218,7 @@ Session::no_roll (pframes_t nframes) _global_locate_pending = locate_pending (); - boost::shared_ptr graph_chain = _graph_chain; + std::shared_ptr graph_chain = _graph_chain; if (graph_chain) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n"); _process_graph->routes_no_roll(graph_chain, nframes, _transport_sample, end_sample, non_realtime_work_pending()); @@ -250,7 +250,7 @@ int Session::process_routes (pframes_t nframes, bool& need_butler) { TimerRAII tr (dsp_stats[Roll]); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); const samplepos_t start_sample = _transport_sample; const samplepos_t end_sample = _transport_sample + floor (nframes * _transport_fsm->transport_speed()); @@ -266,7 +266,7 @@ Session::process_routes (pframes_t nframes, bool& need_butler) _global_locate_pending = locate_pending(); - boost::shared_ptr graph_chain = _graph_chain; + std::shared_ptr graph_chain = _graph_chain; if (graph_chain) { DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n"); if (_process_graph->process_routes (graph_chain, nframes, start_sample, end_sample, need_butler) < 0) { @@ -307,10 +307,10 @@ Session::get_track_statistics () float pworst = 1.0f; float cworst = 1.0f; - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (!tr || tr->is_private_route()) { continue; @@ -348,7 +348,7 @@ Session::compute_audible_delta (samplepos_t& pos_and_delta) const samplecnt_t Session::calc_preroll_subcycle (samplecnt_t ns) const { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { samplecnt_t route_offset = (*i)->playback_latency (); if (_remaining_latency_preroll > route_offset + ns) { @@ -759,9 +759,9 @@ void Session::process_audition (pframes_t nframes) { SessionEvent* ev; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); - boost::shared_ptr graph_chain = _graph_chain; + std::shared_ptr graph_chain = _graph_chain; if (graph_chain) { /* Ideally we'd use Session::rt_tasklist, since dependency is irrelevant. */ _process_graph->silence_routes (graph_chain, nframes); @@ -1033,13 +1033,13 @@ Session::process_event (SessionEvent* ev) break; case SessionEvent::Overwrite: - if (boost::shared_ptr track = ev->track.lock()) { + if (std::shared_ptr track = ev->track.lock()) { overwrite_some_buffers (track, ev->overwrite); } break; case SessionEvent::OverwriteAll: - overwrite_some_buffers (boost::shared_ptr(), ev->overwrite); + overwrite_some_buffers (std::shared_ptr(), ev->overwrite); break; case SessionEvent::TransportStateChange: @@ -1097,9 +1097,9 @@ Session::process_event (SessionEvent* ev) } void -Session::handle_slots_empty_status (boost::weak_ptr const & wr) +Session::handle_slots_empty_status (std::weak_ptr const & wr) { - boost::shared_ptr r = wr.lock(); + std::shared_ptr r = wr.lock(); if (!r) { return; @@ -1176,7 +1176,7 @@ Session::emit_route_signals () // TODO use RAII to allow using these signals in other places BatchUpdateStart(); /* EMIT SIGNAL */ ProcessorChangeBlocker pcb (this); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::const_iterator ci = r->begin(); ci != r->end(); ++ci) { (*ci)->emit_pending_signals (); } @@ -1738,7 +1738,7 @@ Session::bang_trigger_at (int32_t route_index, int32_t row_index) get_stripables (sl); sl.sort (Stripable::Sorter ()); for (StripableList::iterator s = sl.begin (); s != sl.end (); ++s) { - boost::shared_ptr r = boost::dynamic_pointer_cast (*s); + std::shared_ptr r = std::dynamic_pointer_cast (*s); if (!r || !r->triggerbox ()) { continue; } @@ -1765,7 +1765,7 @@ Session::unbang_trigger_at (int32_t route_index, int32_t row_index) get_stripables (sl); sl.sort (Stripable::Sorter ()); for (StripableList::iterator s = sl.begin (); s != sl.end (); ++s) { - boost::shared_ptr r = boost::dynamic_pointer_cast (*s); + std::shared_ptr r = std::dynamic_pointer_cast (*s); if (!r || !r->triggerbox ()) { continue; } @@ -1782,7 +1782,7 @@ Session::unbang_trigger_at (int32_t route_index, int32_t row_index) return false; } -boost::shared_ptr +std::shared_ptr Session::triggerbox_at (int32_t route_index) const { int index = 0; @@ -1790,7 +1790,7 @@ Session::triggerbox_at (int32_t route_index) const get_stripables (sl); sl.sort (Stripable::Sorter ()); for (StripableList::iterator s = sl.begin (); s != sl.end (); ++s) { - boost::shared_ptr r = boost::dynamic_pointer_cast (*s); + std::shared_ptr r = std::dynamic_pointer_cast (*s); if (!r || !r->triggerbox ()) { continue; } @@ -1803,7 +1803,7 @@ Session::triggerbox_at (int32_t route_index) const } index++; } - return boost::shared_ptr(); + return std::shared_ptr(); } int @@ -1813,7 +1813,7 @@ Session::num_triggerboxes () const StripableList sl; get_stripables (sl); for (StripableList::iterator s = sl.begin (); s != sl.end (); ++s) { - boost::shared_ptr r = boost::dynamic_pointer_cast (*s); + std::shared_ptr r = std::dynamic_pointer_cast (*s); if (!r || !r->triggerbox ()) { continue; } @@ -1829,7 +1829,7 @@ Session::num_triggerboxes () const TriggerPtr Session::trigger_at (int32_t route_index, int32_t trigger_index) const { - boost::shared_ptr tb = triggerbox_at(route_index); + std::shared_ptr tb = triggerbox_at(route_index); if (tb) { return tb->trigger(trigger_index); } diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index 446241064f..fb22617c03 100644 --- a/libs/ardour/session_rtevents.cc +++ b/libs/ardour/session_rtevents.cc @@ -41,7 +41,7 @@ using namespace ARDOUR; using namespace Glib; void -Session::set_controls (boost::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) +Session::set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { if (cl->empty()) { return; @@ -71,7 +71,7 @@ Session::set_controls (boost::shared_ptr cl, double val, Controllab } #endif - boost::shared_ptr wcl (new WeakControlList); + std::shared_ptr wcl (new WeakControlList); for (ControlList::iterator ci = cl->begin(); ci != cl->end(); ++ci) { /* as of july 2017 this is a no-op for everything except record enable */ (*ci)->pre_realtime_queue_stuff (val, gcd); @@ -83,19 +83,19 @@ Session::set_controls (boost::shared_ptr cl, double val, Controllab } void -Session::set_control (boost::shared_ptr ac, double val, Controllable::GroupControlDisposition gcd) +Session::set_control (std::shared_ptr ac, double val, Controllable::GroupControlDisposition gcd) { if (!ac) { return; } - boost::shared_ptr cl (new ControlList); + std::shared_ptr cl (new ControlList); cl->push_back (ac); set_controls (cl, val, gcd); } void -Session::rt_set_controls (boost::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) +Session::rt_set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { /* Note that we require that all controls in the ControlList are of the same type. @@ -107,7 +107,7 @@ Session::rt_set_controls (boost::shared_ptr cl, double val, Con AutomationType type = NullAutomation; for (auto const& c : *cl) { - boost::shared_ptr ac = c.lock (); + std::shared_ptr ac = c.lock (); if (ac) { ac->set_value (val, gcd); type = ac->desc().type; @@ -128,11 +128,11 @@ Session::rt_set_controls (boost::shared_ptr cl, double val, Con } void -Session::prepare_momentary_solo (SoloMuteRelease* smr, bool exclusive, boost::shared_ptr route) +Session::prepare_momentary_solo (SoloMuteRelease* smr, bool exclusive, std::shared_ptr route) { - boost::shared_ptr routes_on (new RouteList); - boost::shared_ptr routes_off (new RouteList); - boost::shared_ptr routes = get_routes(); + std::shared_ptr routes_on (new RouteList); + std::shared_ptr routes_off (new RouteList); + std::shared_ptr routes = get_routes(); for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { #ifdef MIXBUS @@ -157,7 +157,7 @@ Session::prepare_momentary_solo (SoloMuteRelease* smr, bool exclusive, boost::sh if (_monitor_out) { if (smr) { - boost::shared_ptr > pml (new std::list); + std::shared_ptr > pml (new std::list); _engine.monitor_port().active_monitors (*pml); smr->set (pml); } @@ -169,13 +169,13 @@ Session::prepare_momentary_solo (SoloMuteRelease* smr, bool exclusive, boost::sh } void -Session::clear_all_solo_state (boost::shared_ptr rl) +Session::clear_all_solo_state (std::shared_ptr rl) { queue_event (get_rt_event (rl, false, rt_cleanup, Controllable::NoGroup, &Session::rt_clear_all_solo_state)); } void -Session::rt_clear_all_solo_state (boost::shared_ptr rl, bool /* yn */, Controllable::GroupControlDisposition /* group_override */) +Session::rt_clear_all_solo_state (std::shared_ptr rl, bool /* yn */, Controllable::GroupControlDisposition /* group_override */) { for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { if ((*i)->is_auditioner()) { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 4e918e4b11..d4e570dd90 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -234,11 +234,11 @@ Session::post_engine_init () MIDISceneChanger* msc; _scene_changer = msc = new MIDISceneChanger (*this); - msc->set_input_port (boost::dynamic_pointer_cast(scene_input_port())); - msc->set_output_port (boost::dynamic_pointer_cast(scene_output_port())); + msc->set_input_port (std::dynamic_pointer_cast(scene_input_port())); + msc->set_output_port (std::dynamic_pointer_cast(scene_output_port())); boost::function timer_func (boost::bind (&Session::audible_sample, this, (bool*)(0))); - boost::dynamic_pointer_cast(scene_input_port())->set_timer (timer_func); + std::dynamic_pointer_cast(scene_input_port())->set_timer (timer_func); setup_midi_machine_control (); @@ -320,7 +320,7 @@ Session::post_engine_init () { Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ()); ProcessorChangeBlocker pcb (this); - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->configure_processors (0); } @@ -1094,11 +1094,11 @@ Session::get_template () return state (true, NormalSave); } -typedef std::set > PlaylistSet; -typedef std::set > SourceSet; +typedef std::set > PlaylistSet; +typedef std::set > SourceSet; bool -Session::export_track_state (boost::shared_ptr rl, const string& path) +Session::export_track_state (std::shared_ptr rl, const string& path) { if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { return false; @@ -1127,7 +1127,7 @@ Session::export_track_state (boost::shared_ptr rl, const string& path continue; } child->add_child_nocopy ((*i)->get_state()); - boost::shared_ptr track = boost::dynamic_pointer_cast (*i); + std::shared_ptr track = std::dynamic_pointer_cast (*i); if (track) { playlists.insert (track->playlist ()); } @@ -1139,7 +1139,7 @@ Session::export_track_state (boost::shared_ptr rl, const string& path child = node->add_child ("Playlists"); // SessionPlaylists::add_state for (PlaylistSet::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { child->add_child_nocopy ((*i)->get_state ()); - boost::shared_ptr prl = (*i)->region_list (); + std::shared_ptr prl = (*i)->region_list (); for (RegionList::const_iterator s = prl->begin(); s != prl->end(); ++s) { const Region::SourceList& sl = (*s)->sources (); for (Region::SourceList::const_iterator sli = sl.begin(); sli != sl.end(); ++sli) { @@ -1151,7 +1151,7 @@ Session::export_track_state (boost::shared_ptr rl, const string& path child = node->add_child ("Sources"); for (SourceSet::const_iterator i = sources.begin(); i != sources.end(); ++i) { child->add_child_nocopy ((*i)->get_state ()); - boost::shared_ptr fs = boost::dynamic_pointer_cast (*i); + std::shared_ptr fs = std::dynamic_pointer_cast (*i); if (fs) { #ifdef PLATFORM_WINDOWS fs->close (); @@ -1169,20 +1169,20 @@ Session::export_track_state (boost::shared_ptr rl, const string& path } static void -merge_all_sources (boost::shared_ptr pl, std::set >* all_sources) +merge_all_sources (std::shared_ptr pl, std::set >* all_sources) { pl->deep_sources (*all_sources); } void -Session::collect_sources_of_this_snapshot (set>& s, bool incl_unused) const +Session::collect_sources_of_this_snapshot (set>& s, bool incl_unused) const { _playlists->sync_all_regions_with_regions (); _playlists->foreach (boost::bind (merge_all_sources, _1, &s), incl_unused); - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (auto const& r : *rl) { - boost::shared_ptr tb = r->triggerbox (); + std::shared_ptr tb = r->triggerbox (); if (tb) { tb->deep_sources (s); } @@ -1193,7 +1193,7 @@ namespace { struct route_id_compare { bool - operator() (const boost::shared_ptr& r1, const boost::shared_ptr& r2) + operator() (const std::shared_ptr& r1, const std::shared_ptr& r2) { return r1->id () < r2->id (); } @@ -1225,7 +1225,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, node->set_property ("sample-rate", _base_sample_rate); /* store the last engine device we we can avoid autostarting on a different device with wrong i/o count */ - boost::shared_ptr backend = _engine.current_backend(); + std::shared_ptr backend = _engine.current_backend(); if (!for_archive && _engine.running () && backend && _engine.setup_required ()) { child = node->add_child ("EngineHints"); child->set_property ("backend", backend-> name ()); @@ -1310,7 +1310,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, if (!save_template) { Glib::Threads::Mutex::Lock sl (source_lock); - set > sources_used_by_this_snapshot; + set > sources_used_by_this_snapshot; if (only_used_assets) { collect_sources_of_this_snapshot (sources_used_by_this_snapshot, false); @@ -1322,9 +1322,9 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, * about file sources that are empty * and unused by any regions. */ - boost::shared_ptr fs; + std::shared_ptr fs; - if ((fs = boost::dynamic_pointer_cast (siter->second)) == 0) { + if ((fs = std::dynamic_pointer_cast (siter->second)) == 0) { continue; } @@ -1334,7 +1334,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, if (only_used_assets) { /* skip only unused audio files */ - boost::shared_ptr afs = boost::dynamic_pointer_cast (fs); + std::shared_ptr afs = std::dynamic_pointer_cast (fs); if (afs && !afs->used()) { continue; } @@ -1372,13 +1372,13 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, if (!only_used_assets) { const RegionFactory::RegionMap& region_map (RegionFactory::all_regions()); for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) { - boost::shared_ptr r = i->second; + std::shared_ptr r = i->second; /* regions must have sources */ assert (r->sources().size() > 0 && r->master_sources().size() > 0); /* only store regions not attached to playlists */ if (r->playlist() == 0) { - if (boost::dynamic_pointer_cast(r)) { - child->add_child_nocopy ((boost::dynamic_pointer_cast(r))->get_basic_state ()); + if (std::dynamic_pointer_cast(r)) { + child->add_child_nocopy ((std::dynamic_pointer_cast(r))->get_basic_state ()); } else { child->add_child_nocopy (r->get_state ()); } @@ -1392,11 +1392,11 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, * Furthermore we need to collect Regions used by Triggers, since * they are not in any Playlist. */ - std::set> tr; + std::set> tr; { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (auto const& r : *rl) { - boost::shared_ptr tb = r->triggerbox (); + std::shared_ptr tb = r->triggerbox (); if (tb) { tb->used_regions (tr); } @@ -1406,7 +1406,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, auto const& used_pl (_playlists->get_used ()); const RegionFactory::RegionMap& region_map (RegionFactory::all_regions()); for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) { - boost::shared_ptr r = i->second; + std::shared_ptr r = i->second; if (tr.find (r) != tr.end()) { child->add_child_nocopy (r->get_state ()); @@ -1451,7 +1451,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, ca->add_child_nocopy (*can); /* see above, child is still "Regions" here */ if (i->second->playlist() == 0 && only_used_assets) { - if (boost::shared_ptr ar = boost::dynamic_pointer_cast (i->second)) { + if (std::shared_ptr ar = std::dynamic_pointer_cast (i->second)) { child->add_child_nocopy (ar->get_basic_state ()); } else { child->add_child_nocopy (i->second->get_state ()); @@ -1493,9 +1493,9 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, child = node->add_child ("Bundles"); { - boost::shared_ptr bundles = _bundles.reader (); + std::shared_ptr bundles = _bundles.reader (); for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) { - boost::shared_ptr b = boost::dynamic_pointer_cast (*i); + std::shared_ptr b = std::dynamic_pointer_cast (*i); if (b) { child->add_child_nocopy (b->get_state()); } @@ -1506,7 +1506,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, child = node->add_child ("Routes"); { - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); route_id_compare cmp; RouteList xml_node_order (*r); @@ -1593,7 +1593,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, } { - boost::shared_ptr iop (_io_plugins.reader ()); + std::shared_ptr iop (_io_plugins.reader ()); XMLNode* iop_node = new XMLNode (X_("IOPlugins")); for (auto const& i : *iop) { iop_node->add_child_nocopy (i->get_state()); @@ -1605,7 +1605,7 @@ Session::state (bool save_template, snapshot_t snapshot_type, bool for_archive, } bool -Session::maybe_copy_midifile (snapshot_t snapshot_type, boost::shared_ptr src, XMLNode* child) +Session::maybe_copy_midifile (snapshot_t snapshot_type, std::shared_ptr src, XMLNode* child) { /* copy MIDI sources to new file * @@ -1621,9 +1621,9 @@ Session::maybe_copy_midifile (snapshot_t snapshot_type, boost::shared_ptr ms; + std::shared_ptr ms; - if ((ms = boost::dynamic_pointer_cast (src)) == 0) { + if ((ms = std::dynamic_pointer_cast (src)) == 0) { return false; /* No, it was not a MIDI source */ } @@ -1636,7 +1636,7 @@ Session::maybe_copy_midifile (snapshot_t snapshot_type, boost::shared_ptr newsrc (new SMFSource (*this, path, ms->flags())); + std::shared_ptr newsrc (new SMFSource (*this, path, ms->flags())); { Source::WriterLock lm (ms->mutex()); @@ -1904,7 +1904,7 @@ Session::set_state (const XMLNode& node, int version) SourceMap src_map (sources); const RegionFactory::RegionMap& region_map (RegionFactory::all_regions()); for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) { - boost::shared_ptr r = i->second; + std::shared_ptr r = i->second; if (!r->whole_file ()) { continue; } @@ -1919,7 +1919,7 @@ Session::set_state (const XMLNode& node, int version) } /* TODO try to be smart and combine %L/%R sources into stereo whole-file regions */ for (SourceMap::const_iterator i = src_map.begin(); i != src_map.end(); ++i) { - boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr afs = std::dynamic_pointer_cast (i->second); if (!afs) { continue; } @@ -2026,7 +2026,7 @@ Session::set_state (const XMLNode& node, int version) for (auto const n : child->children () ) { uint64_t index = 0; if (n->get_property("index", index)) { - _mixer_scenes[index] = boost::shared_ptr (new MixerScene (*this)); + _mixer_scenes[index] = std::shared_ptr (new MixerScene (*this)); _mixer_scenes[index]->set_state (*n, version); } } @@ -2034,9 +2034,9 @@ Session::set_state (const XMLNode& node, int version) if ((child = find_named_node (node, "IOPlugins"))) { RCUWriter writer (_io_plugins); - boost::shared_ptr iopl = writer.get_copy (); + std::shared_ptr iopl = writer.get_copy (); for (XMLNodeList::const_iterator n = child->children ().begin (); n != child->children ().end (); ++n) { - boost::shared_ptr iop = boost::make_shared(*this); + std::shared_ptr iop = std::make_shared(*this); if (0 == iop->set_state (**n, version)) { iopl->push_back (iop); iop->LatencyChanged.connect_same_thread (*this, boost::bind (&Session::update_latency_compensation, this, true, false)); @@ -2085,7 +2085,7 @@ Session::load_routes (const XMLNode& node, int version) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - boost::shared_ptr route; + std::shared_ptr route; if (version < 3000) { route = XMLRouteFactory_2X (**niter, version); @@ -2111,10 +2111,10 @@ Session::load_routes (const XMLNode& node, int version) /* re-subscribe to MIDI connection handler */ for (RouteList::iterator r = new_routes.begin(); r != new_routes.end(); ++r) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (*r); + std::shared_ptr mt = std::dynamic_pointer_cast (*r); bool is_midi_route = (*r)->n_inputs().n_midi() > 0 && (*r)->n_inputs().n_midi() > 0; if (mt || is_midi_route) { - (*r)->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, boost::weak_ptr(*r))); + (*r)->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, std::weak_ptr(*r))); } } @@ -2124,10 +2124,10 @@ Session::load_routes (const XMLNode& node, int version) return 0; } -boost::shared_ptr +std::shared_ptr Session::XMLRouteFactory (const XMLNode& node, int version) { - boost::shared_ptr ret; + std::shared_ptr ret; if (node.name() != "Route") { return ret; @@ -2148,7 +2148,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) /* has at least 1 playlist, therefore a track ... */ - boost::shared_ptr track; + std::shared_ptr track; if (type == DataType::AUDIO) { track.reset (new AudioTrack (*this)); @@ -2169,7 +2169,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version) } else { PresentationInfo::Flag flags = PresentationInfo::get_flags (node); - boost::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); + std::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); if (r->init () == 0 && r->set_state (node, version) == 0) { BOOST_MARK_ROUTE (r); @@ -2180,10 +2180,10 @@ Session::XMLRouteFactory (const XMLNode& node, int version) return ret; } -boost::shared_ptr +std::shared_ptr Session::XMLRouteFactory_3X (const XMLNode& node, int version) { - boost::shared_ptr ret; + std::shared_ptr ret; if (node.name() != "Route") { return ret; @@ -2198,7 +2198,7 @@ Session::XMLRouteFactory_3X (const XMLNode& node, int version) if (ds_child) { - boost::shared_ptr track; + std::shared_ptr track; if (type == DataType::AUDIO) { track.reset (new AudioTrack (*this)); @@ -2219,7 +2219,7 @@ Session::XMLRouteFactory_3X (const XMLNode& node, int version) } else { PresentationInfo::Flag flags = PresentationInfo::get_flags2X3X (node); - boost::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); + std::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); if (r->init () == 0 && r->set_state (node, version) == 0) { BOOST_MARK_ROUTE (r); @@ -2230,10 +2230,10 @@ Session::XMLRouteFactory_3X (const XMLNode& node, int version) return ret; } -boost::shared_ptr +std::shared_ptr Session::XMLRouteFactory_2X (const XMLNode& node, int version) { - boost::shared_ptr ret; + std::shared_ptr ret; if (node.name() != "Route") { return ret; @@ -2254,13 +2254,13 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) PBD::ID ds_id (ds_prop->value ()); std::string playlist_name = _diskstreams_2X[ds_id]; - boost::shared_ptr pl = playlists()->by_name (playlist_name); + std::shared_ptr pl = playlists()->by_name (playlist_name); if (playlist_name.empty () || !pl) { warning << string_compose (_("Could not find diskstream for diskstream-id: '%1', playlist: '%2'"), ds_prop->value (), playlist_name) << endmsg; } - boost::shared_ptr track; + std::shared_ptr track; if (type == DataType::AUDIO) { track.reset (new AudioTrack (*this)); @@ -2292,7 +2292,7 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) } else { PresentationInfo::Flag flags = PresentationInfo::get_flags2X3X (node); - boost::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); + std::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); if (r->init () == 0 && r->set_state (node, version) == 0) { BOOST_MARK_ROUTE (r); @@ -2308,7 +2308,7 @@ Session::load_regions (const XMLNode& node) { XMLNodeList nlist; XMLNodeConstIterator niter; - boost::shared_ptr region; + std::shared_ptr region; nlist = node.children(); @@ -2352,8 +2352,8 @@ Session::load_compounds (const XMLNode& node) } copy_id = caprop->value(); - boost::shared_ptr orig = RegionFactory::region_by_id (orig_id); - boost::shared_ptr copy = RegionFactory::region_by_id (copy_id); + std::shared_ptr orig = RegionFactory::region_by_id (orig_id); + std::shared_ptr copy = RegionFactory::region_by_id (copy_id); if (!orig || !copy) { warning << string_compose (_("Regions in compound description not found (ID's %1 and %2): ignored"), @@ -2403,7 +2403,7 @@ Session::load_nested_sources (const XMLNode& node) } } -boost::shared_ptr +std::shared_ptr Session::XMLRegionFactory (const XMLNode& node, bool full) { XMLProperty const * type = node.property("type"); @@ -2420,31 +2420,31 @@ Session::XMLRegionFactory (const XMLNode& node, bool full) } if (!type || type->value() == "audio") { - return boost::shared_ptr(XMLAudioRegionFactory (node, full)); + return std::shared_ptr(XMLAudioRegionFactory (node, full)); } else if (type->value() == "midi") { - return boost::shared_ptr(XMLMidiRegionFactory (node, full)); + return std::shared_ptr(XMLMidiRegionFactory (node, full)); } } catch (failed_constructor& err) { - return boost::shared_ptr (); + return std::shared_ptr (); } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr +std::shared_ptr Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) { XMLProperty const * prop; - boost::shared_ptr source; - boost::shared_ptr as; + std::shared_ptr source; + std::shared_ptr as; SourceList sources; SourceList master_sources; uint32_t nchans = 1; char buf[128]; if (node.name() != X_("Region")) { - return boost::shared_ptr(); + return std::shared_ptr(); } node.get_property (X_("channels"), nchans); @@ -2457,7 +2457,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) if ((prop = node.property (X_("source-0"))) == 0) { if ((prop = node.property ("source")) == 0) { error << _("Session: XMLNode describing a AudioRegion is incomplete (no source)") << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -2465,13 +2465,13 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) if ((source = source_by_id (s_id)) == 0) { error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), s_id) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } - as = boost::dynamic_pointer_cast(source); + as = std::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), s_id) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } sources.push_back (as); @@ -2486,13 +2486,13 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) if ((source = source_by_id (id2)) == 0) { error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } - as = boost::dynamic_pointer_cast(source); + as = std::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } sources.push_back (as); } @@ -2506,26 +2506,26 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) if ((source = source_by_id (id2)) == 0) { error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } - as = boost::dynamic_pointer_cast(source); + as = std::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } master_sources.push_back (as); } } try { - boost::shared_ptr region (boost::dynamic_pointer_cast (RegionFactory::create (sources, node))); + std::shared_ptr region (std::dynamic_pointer_cast (RegionFactory::create (sources, node))); /* a final detail: this is the one and only place that we know how long missing files are */ if (region->whole_file()) { for (SourceList::iterator sx = sources.begin(); sx != sources.end(); ++sx) { - boost::shared_ptr sfp = boost::dynamic_pointer_cast (*sx); + std::shared_ptr sfp = std::dynamic_pointer_cast (*sx); if (sfp) { sfp->set_length (region->length().samples()); } @@ -2545,20 +2545,20 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) } catch (failed_constructor& err) { - return boost::shared_ptr(); + return std::shared_ptr(); } } -boost::shared_ptr +std::shared_ptr Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/) { XMLProperty const * prop; - boost::shared_ptr source; - boost::shared_ptr ms; + std::shared_ptr source; + std::shared_ptr ms; SourceList sources; if (node.name() != X_("Region")) { - return boost::shared_ptr(); + return std::shared_ptr(); } if ((prop = node.property ("name")) == 0) { @@ -2569,7 +2569,7 @@ Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/) if ((prop = node.property (X_("source-0"))) == 0) { if ((prop = node.property ("source")) == 0) { error << _("Session: XMLNode describing a MidiRegion is incomplete (no source)") << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -2577,24 +2577,24 @@ Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/) if ((source = source_by_id (s_id)) == 0) { error << string_compose(_("Session: XMLNode describing a MidiRegion references an unknown source id =%1"), s_id) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } - ms = boost::dynamic_pointer_cast(source); + ms = std::dynamic_pointer_cast(source); if (!ms) { error << string_compose(_("Session: XMLNode describing a MidiRegion references a non-midi source id =%1"), s_id) << endmsg; - return boost::shared_ptr(); + return std::shared_ptr(); } sources.push_back (ms); try { - boost::shared_ptr region (boost::dynamic_pointer_cast (RegionFactory::create (sources, node))); + std::shared_ptr region (std::dynamic_pointer_cast (RegionFactory::create (sources, node))); /* a final detail: this is the one and only place that we know how long missing files are */ if (region->whole_file()) { for (SourceList::iterator sx = sources.begin(); sx != sources.end(); ++sx) { - boost::shared_ptr sfp = boost::dynamic_pointer_cast (*sx); + std::shared_ptr sfp = std::dynamic_pointer_cast (*sx); if (sfp) { sfp->set_length (region->length().samples()); } @@ -2605,7 +2605,7 @@ Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/) } catch (failed_constructor& err) { - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -2626,9 +2626,9 @@ Session::get_sources_as_xml () void Session::reset_write_sources (bool mark_write_complete, bool force) { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { _state_of_the_state = StateOfTheState (_state_of_the_state | InCleanup); tr->reset_write_sources(mark_write_complete, force); @@ -2646,7 +2646,7 @@ Session::load_sources (const XMLNode& node) * versions of gcc complaining about * discarded return values. */ - boost::shared_ptr source; + std::shared_ptr source; nlist = node.children(); @@ -2777,11 +2777,11 @@ retry: return 0; } -boost::shared_ptr +std::shared_ptr Session::XMLSourceFactory (const XMLNode& node) { if (node.name() != "Source") { - return boost::shared_ptr(); + return std::shared_ptr(); } try { @@ -2792,7 +2792,7 @@ Session::XMLSourceFactory (const XMLNode& node) catch (failed_constructor& err) { error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the programmers."), PROGRAM_NAME) << endmsg; node.dump (std::cout, " Invalid Source: "); - return boost::shared_ptr(); + return std::shared_ptr(); } } @@ -3108,9 +3108,9 @@ Session::load_bundles (XMLNode const & node) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((*niter)->name() == "InputBundle") { - add_bundle (boost::shared_ptr (new UserBundle (**niter, true))); + add_bundle (std::shared_ptr (new UserBundle (**niter, true))); } else if ((*niter)->name() == "OutputBundle") { - add_bundle (boost::shared_ptr (new UserBundle (**niter, false))); + add_bundle (std::shared_ptr (new UserBundle (**niter, false))); } else { error << string_compose(_("Unknown node \"%1\" found in Bundles list from session file"), (*niter)->name()) << endmsg; return -1; @@ -3296,7 +3296,7 @@ Session::add_command (Command* const cmd) } PBD::StatefulDiffCommand* -Session::add_stateful_diff_command (boost::shared_ptr sfd) +Session::add_stateful_diff_command (std::shared_ptr sfd) { PBD::StatefulDiffCommand* cmd = new PBD::StatefulDiffCommand (sfd); add_command (cmd); @@ -3558,16 +3558,16 @@ Session::find_all_sources_across_snapshots (set& result, bool exclude_th } struct RegionCounter { - typedef std::map > AudioSourceList; + typedef std::map > AudioSourceList; AudioSourceList::iterator iter; - boost::shared_ptr region; + std::shared_ptr region; uint32_t count; RegionCounter() : count (0) {} }; int -Session::ask_about_playlist_deletion (boost::shared_ptr p) +Session::ask_about_playlist_deletion (std::shared_ptr p) { boost::optional r = AskAboutPlaylistDeletion (p); return r.value_or (1); @@ -3580,11 +3580,11 @@ Session::cleanup_regions () const RegionFactory::RegionMap& regions (RegionFactory::regions()); /* collect Regions used by Triggers */ - std::set> tr; + std::set> tr; { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (auto const& r : *rl) { - boost::shared_ptr tb = r->triggerbox (); + std::shared_ptr tb = r->triggerbox (); if (tb) { tb->used_regions (tr); } @@ -3600,7 +3600,7 @@ Session::cleanup_regions () } if (used == 0 && !i->second->automatic ()) { - boost::weak_ptr w = i->second; + std::weak_ptr w = i->second; ++i; removed = true; RegionFactory::map_remove (w); @@ -3616,9 +3616,9 @@ Session::cleanup_regions () ++i; continue; } - assert(boost::dynamic_pointer_cast(i->second->source (0)) != 0); + assert(std::dynamic_pointer_cast(i->second->source (0)) != 0); if (0 == _playlists->region_use_count (i->second)) { - boost::weak_ptr w = i->second; + std::weak_ptr w = i->second; ++i; RegionFactory::map_remove (w); } else { @@ -3669,8 +3669,8 @@ Session::cleanup_peakfiles () } for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr as; - if ((as = boost::dynamic_pointer_cast (i->second)) != 0) { + std::shared_ptr as; + if ((as = std::dynamic_pointer_cast (i->second)) != 0) { as->close_peakfile(); } } @@ -3680,8 +3680,8 @@ Session::cleanup_peakfiles () _state_of_the_state = StateOfTheState (_state_of_the_state & (~PeakCleanup)); for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr as; - if ((as = boost::dynamic_pointer_cast (i->second)) != 0) { + std::shared_ptr as; + if ((as = std::dynamic_pointer_cast (i->second)) != 0) { SourceFactory::setup_peakfile(as, true); } } @@ -3705,7 +3705,7 @@ Session::cleanup_sources (CleanupReport& rep) string tmppath2; Searchpath asp; Searchpath msp; - set > sources_used_by_this_snapshot; + set > sources_used_by_this_snapshot; _state_of_the_state = StateOfTheState (_state_of_the_state | InCleanup); @@ -3798,11 +3798,11 @@ Session::cleanup_sources (CleanupReport& rep) ls.acquire (); for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) { - boost::shared_ptr fs; + std::shared_ptr fs; SourceMap::iterator tmp = i; ++tmp; - if ((fs = boost::dynamic_pointer_cast (i->second)) == 0) { + if ((fs = std::dynamic_pointer_cast (i->second)) == 0) { /* not a file */ i = tmp; continue; @@ -4083,7 +4083,7 @@ Session::clear_deletion_in_progress () } void -Session::add_controllable (boost::shared_ptr c) +Session::add_controllable (std::shared_ptr c) { /* this adds a controllable to the list managed by the Session. this is a subset of those managed by the Controllable class @@ -4095,7 +4095,7 @@ Session::add_controllable (boost::shared_ptr c) controllables.insert (c); } -boost::shared_ptr +std::shared_ptr Session::controllable_by_id (const PBD::ID& id) { Glib::Threads::Mutex::Lock lm (controllables_lock); @@ -4106,13 +4106,13 @@ Session::controllable_by_id (const PBD::ID& id) } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr Session::automation_control_by_id (const PBD::ID& id) { - return boost::dynamic_pointer_cast (controllable_by_id (id)); + return std::dynamic_pointer_cast (controllable_by_id (id)); } void @@ -4260,8 +4260,8 @@ Session::restore_history (string snapshot_name) } else if (n->name() == "NoteDiffCommand") { PBD::ID id (n->property("midi-source")->value()); - boost::shared_ptr midi_source = - boost::dynamic_pointer_cast(source_by_id(id)); + std::shared_ptr midi_source = + std::dynamic_pointer_cast(source_by_id(id)); if (midi_source) { ut->add_command (new MidiModel::NoteDiffCommand(midi_source->model(), *n)); } else { @@ -4271,8 +4271,8 @@ Session::restore_history (string snapshot_name) } else if (n->name() == "SysExDiffCommand") { PBD::ID id (n->property("midi-source")->value()); - boost::shared_ptr midi_source = - boost::dynamic_pointer_cast(source_by_id(id)); + std::shared_ptr midi_source = + std::dynamic_pointer_cast(source_by_id(id)); if (midi_source) { ut->add_command (new MidiModel::SysExDiffCommand (midi_source->model(), *n)); } else { @@ -4282,8 +4282,8 @@ Session::restore_history (string snapshot_name) } else if (n->name() == "PatchChangeDiffCommand") { PBD::ID id (n->property("midi-source")->value()); - boost::shared_ptr midi_source = - boost::dynamic_pointer_cast(source_by_id(id)); + std::shared_ptr midi_source = + std::dynamic_pointer_cast(source_by_id(id)); if (midi_source) { ut->add_command (new MidiModel::PatchChangeDiffCommand (midi_source->model(), *n)); } else { @@ -4567,8 +4567,8 @@ Session::setup_midi_machine_control () { _mmc = new MIDI::MachineControl; - boost::shared_ptr async_in = boost::dynamic_pointer_cast (_midi_ports->mmc_input_port()); - boost::shared_ptr async_out = boost::dynamic_pointer_cast (_midi_ports->mmc_output_port()); + std::shared_ptr async_in = std::dynamic_pointer_cast (_midi_ports->mmc_input_port()); + std::shared_ptr async_out = std::dynamic_pointer_cast (_midi_ports->mmc_output_port()); if (!async_out || !async_out) { return; @@ -4602,7 +4602,7 @@ Session::setup_midi_machine_control () _mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this)); } -boost::shared_ptr +std::shared_ptr Session::solo_cut_control() const { /* the solo cut control is a bit of an anomaly, at least as of Febrary 2011. There are no other @@ -4677,7 +4677,7 @@ Session::rename (const std::string& new_name) */ for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr fs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr fs = std::dynamic_pointer_cast (i->second); if (fs) { fs->close (); } @@ -4810,7 +4810,7 @@ Session::rename (const std::string& new_name) /* update file source paths */ for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr fs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr fs = std::dynamic_pointer_cast (i->second); if (fs) { string p = fs->path (); boost::replace_all (p, old_sources_root, _session_dir->sources_root()); @@ -5001,7 +5001,7 @@ Session::get_snapshot_from_instant (const std::string& session_dir) return ""; } -typedef std::vector > SeveralFileSources; +typedef std::vector > SeveralFileSources; typedef std::map SourcePathMap; int @@ -5011,7 +5011,7 @@ Session::bring_all_sources_into_session (boost::function afs; + std::shared_ptr afs; int ret = 0; { @@ -5019,7 +5019,7 @@ Session::bring_all_sources_into_session (boost::function fs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr fs = std::dynamic_pointer_cast (i->second); if (!fs) { continue; @@ -5512,7 +5512,7 @@ Session::save_as (SaveAs& saveas) */ for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - boost::shared_ptr fs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr fs = std::dynamic_pointer_cast (i->second); if (!fs) { continue; @@ -5645,12 +5645,12 @@ Session::archive_session (const std::string& dest, blacklist_dirs.push_back (string (externals_dir_name) + G_DIR_SEPARATOR); blacklist_dirs.push_back (string (plugins_dir_name) + G_DIR_SEPARATOR); - std::map, std::string> orig_sources; - std::map, std::string> orig_origin; - std::map, float> orig_gain; - std::map, uint16_t> orig_channel; + std::map, std::string> orig_sources; + std::map, std::string> orig_origin; + std::map, float> orig_gain; + std::map, uint16_t> orig_channel; - set > sources_used_by_this_snapshot; + set > sources_used_by_this_snapshot; if (only_used_sources) { collect_sources_of_this_snapshot (sources_used_by_this_snapshot, false); } @@ -5665,10 +5665,10 @@ Session::archive_session (const std::string& dest, /* build a list of used names */ std::set audio_file_names; for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - if (boost::dynamic_pointer_cast (i->second)) { + if (std::dynamic_pointer_cast (i->second)) { continue; } - boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr afs = std::dynamic_pointer_cast (i->second); if (!afs || afs->length ().is_zero ()) { continue; } @@ -5684,10 +5684,10 @@ Session::archive_session (const std::string& dest, } for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - if (boost::dynamic_pointer_cast (i->second)) { + if (std::dynamic_pointer_cast (i->second)) { continue; } - boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr afs = std::dynamic_pointer_cast (i->second); if (!afs || afs->length ().is_zero ()) { continue; } @@ -5748,10 +5748,10 @@ Session::archive_session (const std::string& dest, Glib::Threads::Mutex::Lock lm (source_lock); for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { - if (boost::dynamic_pointer_cast (i->second)) { + if (std::dynamic_pointer_cast (i->second)) { continue; } - boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); + std::shared_ptr afs = std::dynamic_pointer_cast (i->second); if (!afs || afs->length ().is_zero ()) { continue; } @@ -5916,16 +5916,16 @@ Session::archive_session (const std::string& dest, config.set_audio_search_path (old_config_search_path[DataType::AUDIO]); config.set_midi_search_path (old_config_search_path[DataType::MIDI]); - for (std::map, std::string>::iterator i = orig_origin.begin (); i != orig_origin.end (); ++i) { + for (std::map, std::string>::iterator i = orig_origin.begin (); i != orig_origin.end (); ++i) { i->first->set_origin (i->second); } - for (std::map, std::string>::iterator i = orig_sources.begin (); i != orig_sources.end (); ++i) { + for (std::map, std::string>::iterator i = orig_sources.begin (); i != orig_sources.end (); ++i) { i->first->replace_file (i->second); } - for (std::map, float>::iterator i = orig_gain.begin (); i != orig_gain.end (); ++i) { + for (std::map, float>::iterator i = orig_gain.begin (); i != orig_gain.end (); ++i) { i->first->set_gain (i->second, true); } - for (std::map, uint16_t>::iterator i = orig_channel.begin (); i != orig_channel.end (); ++i) { + for (std::map, uint16_t>::iterator i = orig_channel.begin (); i != orig_channel.end (); ++i) { i->first->set_channel (i->second); } diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 502e4fa339..06230a11f3 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -121,7 +121,7 @@ Session::realtime_stop (bool abort, bool clear_state) /* call routes */ - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin (); i != r->end(); ++i) { (*i)->realtime_handle_transport_stopped (); @@ -211,7 +211,7 @@ Session::locate (samplepos_t target_sample, bool for_loop_end, bool force, bool /* Tell all routes to do the RT part of locate */ - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->realtime_locate (for_loop_end); } @@ -264,10 +264,10 @@ Session::locate (samplepos_t target_sample, bool for_loop_end, bool force, bool // located to start of loop - this is looping, basically - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->rec_enable_control()->get_value()) { // tell it we've looped, so it can deal with the record state @@ -436,7 +436,7 @@ Session::set_transport_speed (double speed) void Session::trigger_stop_all (bool now) { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { (*i)->stop_triggers (now); @@ -717,9 +717,9 @@ Session::micro_locate (samplecnt_t distance) { ENSURE_PROCESS_THREAD; - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && !tr->can_internal_playback_seek (distance)) { return -1; } @@ -728,7 +728,7 @@ Session::micro_locate (samplecnt_t distance) DEBUG_TRACE (DEBUG::Transport, string_compose ("micro-locate by %1\n", distance)); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { tr->internal_playback_seek (distance); } @@ -742,7 +742,7 @@ void Session::flush_all_inserts () { ENSURE_PROCESS_THREAD; - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->flush_processors (); @@ -792,7 +792,7 @@ Session::synced_to_engine() const } void -Session::request_sync_source (boost::shared_ptr tm) +Session::request_sync_source (std::shared_ptr tm) { SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportMaster, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->transport_master = tm; @@ -1066,10 +1066,10 @@ Session::solo_selection_active () void Session::solo_selection (StripableList &list, bool new_state) { - boost::shared_ptr solo_list (new ControlList); - boost::shared_ptr unsolo_list (new ControlList); + std::shared_ptr solo_list (new ControlList); + std::shared_ptr unsolo_list (new ControlList); - boost::shared_ptr rl = get_routes(); + std::shared_ptr rl = get_routes(); for (ARDOUR::RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { @@ -1077,15 +1077,15 @@ Session::solo_selection (StripableList &list, bool new_state) continue; } - boost::shared_ptr s (*i); + std::shared_ptr s (*i); bool found = (std::find(list.begin(), list.end(), s) != list.end()); if ( found ) { /* must invalidate playlists on selected track, so disk reader * will re-fill with the new selection state for solo_selection */ - boost::shared_ptr track = boost::dynamic_pointer_cast (*i); + std::shared_ptr track = std::dynamic_pointer_cast (*i); if (track) { - boost::shared_ptr playlist = track->playlist(); + std::shared_ptr playlist = track->playlist(); if (playlist) { playlist->ContentsChanged(); } @@ -1116,7 +1116,7 @@ Session::butler_transport_work (bool have_process_lock) /* Note: this function executes in the butler thread context */ restart: - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); int on_entry = g_atomic_int_get (&_butler->should_do_transport_work); bool finished = true; PostTransportWork ptw = post_transport_work(); @@ -1134,7 +1134,7 @@ Session::butler_transport_work (bool have_process_lock) lx.acquire (); } for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { tr->adjust_playback_buffering (); /* and refill those buffers ... */ @@ -1155,7 +1155,7 @@ Session::butler_transport_work (bool have_process_lock) lx.acquire (); } for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { tr->adjust_capture_buffering (); } @@ -1205,9 +1205,9 @@ Session::non_realtime_overwrite (int on_entry, bool& finished, bool update_loop_ DiskReader::reset_loop_declick (_locations->auto_loop_location(), sample_rate()); } - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->pending_overwrite ()) { tr->overwrite_existing_buffers (); } @@ -1258,7 +1258,7 @@ Session::non_realtime_locate () gint sc; { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); restart: sc = g_atomic_int_get (&_seek_counter); @@ -1341,9 +1341,9 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished, bool will_ did_record = false; saved = false; - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && tr->get_captured_samples () != 0) { did_record = true; break; @@ -1378,7 +1378,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished, bool will_ } for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { tr->transport_stopped_wallclock (*now, xnow, abort); } @@ -1390,7 +1390,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished, bool will_ _state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup); } - boost::shared_ptr r = routes.reader (); + std::shared_ptr r = routes.reader (); if (did_record) { commit_reversible_command (); @@ -1648,7 +1648,7 @@ Session::unset_play_loop (bool change_transport_state) TFSM_STOP (false, false); } - overwrite_some_buffers (boost::shared_ptr(), LoopDisabled); + overwrite_some_buffers (std::shared_ptr(), LoopDisabled); TransportStateChange (); /* EMIT SIGNAL */ } @@ -1661,7 +1661,7 @@ Session::set_track_loop (bool yn) yn = false; } - boost::shared_ptr rl = routes.reader (); + std::shared_ptr rl = routes.reader (); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { if (*i && !(*i)->is_private_route()) { @@ -1852,9 +1852,9 @@ Session::xrun_recovery () /* ..and start the FSM engine again */ _transport_fsm->start (); } else { - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr) { tr->mark_capture_xrun (); } @@ -1951,7 +1951,7 @@ Session::timecode_transmission_suspended () const return g_atomic_int_get (&_suspend_timecode_transmission) == 1; } -boost::shared_ptr +std::shared_ptr Session::transport_master() const { return TransportMasterManager::instance().current(); @@ -1974,7 +1974,7 @@ Session::sync_source_changed (SyncSource type, samplepos_t pos, pframes_t cycle_ { /* Runs in process() context */ - boost::shared_ptr master = TransportMasterManager::instance().current(); + std::shared_ptr master = TransportMasterManager::instance().current(); if (master->can_loop()) { request_play_loop (false); @@ -1991,7 +1991,7 @@ Session::sync_source_changed (SyncSource type, samplepos_t pos, pframes_t cycle_ #if 0 we should not be treating specific transport masters as special cases because there maybe > 1 of a particular type - boost::shared_ptr mtc_master = boost::dynamic_pointer_cast (master); + std::shared_ptr mtc_master = std::dynamic_pointer_cast (master); if (mtc_master) { mtc_master->ActiveChanged.connect_same_thread (mtc_status_connection, boost::bind (&Session::mtc_status_changed, this, _1)); @@ -2003,7 +2003,7 @@ Session::sync_source_changed (SyncSource type, samplepos_t pos, pframes_t cycle_ mtc_status_connection.disconnect (); } - boost::shared_ptr ltc_master = boost::dynamic_pointer_cast (master); + std::shared_ptr ltc_master = std::dynamic_pointer_cast (master); if (ltc_master) { ltc_master->ActiveChanged.connect_same_thread (ltc_status_connection, boost::bind (&Session::ltc_status_changed, this, _1)); @@ -2021,11 +2021,11 @@ Session::sync_source_changed (SyncSource type, samplepos_t pos, pframes_t cycle_ // need to queue this for next process() cycle _send_timecode_update = true; - boost::shared_ptr rl = routes.reader(); + std::shared_ptr rl = routes.reader(); const bool externally_slaved = transport_master_is_external(); for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + std::shared_ptr tr = std::dynamic_pointer_cast (*i); if (tr && !tr->is_private_route()) { tr->set_slaved (externally_slaved); } diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index ea1b0a2288..44df4e1d02 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -521,7 +521,7 @@ intptr_t Session::vst_callback ( SHOW_CALLBACK ("audioMasterBeginEdit"); // begin of automation session (when mouse down), parameter index in if (plug && plug->plugin_insert ()) { - boost::shared_ptr ac = plug->plugin_insert ()->automation_control (Evoral::Parameter (PluginAutomation, 0, index)); + std::shared_ptr ac = plug->plugin_insert ()->automation_control (Evoral::Parameter (PluginAutomation, 0, index)); if (ac) { ac->start_touch (timepos_t (ac->session().transport_sample())); } @@ -532,7 +532,7 @@ intptr_t Session::vst_callback ( SHOW_CALLBACK ("audioMasterEndEdit"); // end of automation session (when mouse up), parameter index in if (plug && plug->plugin_insert ()) { - boost::shared_ptr ac = plug->plugin_insert ()->automation_control (Evoral::Parameter (PluginAutomation, 0, index)); + std::shared_ptr ac = plug->plugin_insert ()->automation_control (Evoral::Parameter (PluginAutomation, 0, index)); if (ac) { ac->stop_touch (timepos_t (ac->session().transport_sample())); } diff --git a/libs/ardour/slavable.cc b/libs/ardour/slavable.cc index 5756df9693..ec4439d6c7 100644 --- a/libs/ardour/slavable.cc +++ b/libs/ardour/slavable.cc @@ -60,10 +60,10 @@ Slavable::get_state () const return *node; } -std::vector > +std::vector > Slavable::masters (VCAManager* manager) const { - std::vector > rv; + std::vector > rv; Glib::Threads::RWLock::ReaderLock lm (master_lock); for (std::set::const_iterator i = _masters.begin(); i != _masters.end(); ++i) { rv.push_back (manager->vca_by_number (*i)); @@ -72,13 +72,13 @@ Slavable::masters (VCAManager* manager) const } bool -Slavable::assigned_to (VCAManager* manager, boost::shared_ptr mst) const +Slavable::assigned_to (VCAManager* manager, std::shared_ptr mst) const { if (mst.get () == this) { return true; } - std::vector > ml = mst->masters (manager); - for (std::vector >::const_iterator i = ml.begin (); i != ml.end(); ++i) { + std::vector > ml = mst->masters (manager); + for (std::vector >::const_iterator i = ml.begin (); i != ml.end(); ++i) { if (assigned_to (manager, *i)) { return true; } @@ -111,13 +111,13 @@ Slavable::set_state (XMLNode const& node, int version) int Slavable::do_assign (VCAManager* manager) { - std::vector > vcas; + std::vector > vcas; { Glib::Threads::RWLock::ReaderLock lm (master_lock); for (std::set::const_iterator i = _masters.begin(); i != _masters.end(); ++i) { - boost::shared_ptr v = manager->vca_by_number (*i); + std::shared_ptr v = manager->vca_by_number (*i); if (v) { vcas.push_back (v); } else { @@ -130,7 +130,7 @@ Slavable::do_assign (VCAManager* manager) if (!vcas.empty()) { - for (std::vector >::iterator v = vcas.begin(); v != vcas.end(); ++v) { + for (std::vector >::iterator v = vcas.begin(); v != vcas.end(); ++v) { assign (*v); } @@ -146,7 +146,7 @@ Slavable::do_assign (VCAManager* manager) } void -Slavable::assign (boost::shared_ptr v) +Slavable::assign (std::shared_ptr v) { assert (v); { @@ -156,29 +156,29 @@ Slavable::assign (boost::shared_ptr v) } /* Do NOT use ::unassign() because it will store a - * boost::shared_ptr in the functor, leaving a dangling ref to the + * std::shared_ptr in the functor, leaving a dangling ref to the * VCA. */ - v->Drop.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr(v))); - v->DropReferences.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr(v))); + v->Drop.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, std::weak_ptr(v))); + v->DropReferences.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, std::weak_ptr(v))); } AssignmentChange (v, true); } void -Slavable::weak_unassign (boost::weak_ptr v) +Slavable::weak_unassign (std::weak_ptr v) { - boost::shared_ptr sv (v.lock()); + std::shared_ptr sv (v.lock()); if (sv) { unassign (sv); } } void -Slavable::unassign (boost::shared_ptr v) +Slavable::unassign (std::shared_ptr v) { { Glib::Threads::RWLock::WriterLock lm (master_lock); @@ -194,7 +194,7 @@ Slavable::unassign (boost::shared_ptr v) } bool -Slavable::assign_controls (boost::shared_ptr vca) +Slavable::assign_controls (std::shared_ptr vca) { bool rv = false; SlavableControlList scl = slavables (); @@ -205,7 +205,7 @@ Slavable::assign_controls (boost::shared_ptr vca) } void -Slavable::unassign_controls (boost::shared_ptr vca) +Slavable::unassign_controls (std::shared_ptr vca) { SlavableControlList scl = slavables (); for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) { @@ -214,9 +214,9 @@ Slavable::unassign_controls (boost::shared_ptr vca) } bool -Slavable::assign_control (boost::shared_ptr vca, boost::shared_ptr slave) +Slavable::assign_control (std::shared_ptr vca, std::shared_ptr slave) { - boost::shared_ptr master; + std::shared_ptr master; master = vca->automation_control (slave->parameter()); if (!master) { return false; @@ -226,13 +226,13 @@ Slavable::assign_control (boost::shared_ptr vca, boost::shared_ptr vca, boost::shared_ptr slave) +Slavable::unassign_control (std::shared_ptr vca, std::shared_ptr slave) { if (!vca) { /* unassign from all */ slave->clear_masters (); } else { - boost::shared_ptr master; + std::shared_ptr master; master = vca->automation_control (slave->parameter()); if (master) { slave->remove_master (master); diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index 9c4dba5747..54ee13dba9 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -42,7 +42,7 @@ using namespace PBD; SlavableAutomationControl::SlavableAutomationControl(ARDOUR::Session& s, const Evoral::Parameter& parameter, const ParameterDescriptor& desc, - boost::shared_ptr l, + std::shared_ptr l, const std::string& name, Controllable::Flag flags) : AutomationControl (s, parameter, desc, l, name, flags) @@ -130,7 +130,7 @@ bool SlavableAutomationControl::masters_curve_multiply (timepos_t const & start, timepos_t const & end, float* vec, samplecnt_t veclen) const { gain_t* scratch = _session.scratch_automation_buffer (); - bool from_list = _list && boost::dynamic_pointer_cast(_list)->automation_playback(); + bool from_list = _list && std::dynamic_pointer_cast(_list)->automation_playback(); bool rv = from_list && list()->curve().rt_safe_get_vector (start, end, scratch, veclen); if (rv) { for (samplecnt_t i = 0; i < veclen; ++i) { @@ -144,8 +144,8 @@ SlavableAutomationControl::masters_curve_multiply (timepos_t const & start, time } for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - boost::shared_ptr sc - = boost::dynamic_pointer_cast(mr->second.master()); + std::shared_ptr sc + = std::dynamic_pointer_cast(mr->second.master()); assert (sc); rv |= sc->masters_curve_multiply (start, end, vec, veclen); apply_gain_to_buffer (vec, veclen, mr->second.val_master_inv ()); @@ -181,7 +181,7 @@ SlavableAutomationControl::actually_set_value (double value, PBD::Controllable:: } void -SlavableAutomationControl::add_master (boost::shared_ptr m) +SlavableAutomationControl::add_master (std::shared_ptr m) { std::pair res; @@ -189,7 +189,7 @@ SlavableAutomationControl::add_master (boost::shared_ptr m) const double master_value = m->get_value(); Glib::Threads::RWLock::WriterLock lm (master_lock); - pair newpair (m->id(), MasterRecord (boost::weak_ptr (m), get_value_locked(), master_value)); + pair newpair (m->id(), MasterRecord (std::weak_ptr (m), get_value_locked(), master_value)); res = _masters.insert (newpair); if (res.second) { @@ -198,7 +198,7 @@ SlavableAutomationControl::add_master (boost::shared_ptr m) avoiding holding a reference to the control in the binding itself. */ - m->DropReferences.connect_same_thread (res.first->second.dropped_connection, boost::bind (&SlavableAutomationControl::master_going_away, this, boost::weak_ptr(m))); + m->DropReferences.connect_same_thread (res.first->second.dropped_connection, boost::bind (&SlavableAutomationControl::master_going_away, this, std::weak_ptr(m))); /* Store the connection inside the MasterRecord, so that when we destroy it, the connection is destroyed @@ -206,7 +206,7 @@ SlavableAutomationControl::add_master (boost::shared_ptr m) AutomationControl. Note that this also makes it safe to store a - boost::shared_ptr in the functor, + std::shared_ptr in the functor, since we know we will destroy the functor when the connection is destroyed, which happens when we disconnect from the master (for any reason). @@ -216,7 +216,7 @@ SlavableAutomationControl::add_master (boost::shared_ptr m) because the change came from the master. */ - m->Changed.connect_same_thread (res.first->second.changed_connection, boost::bind (&SlavableAutomationControl::master_changed, this, _1, _2, boost::weak_ptr(m))); + m->Changed.connect_same_thread (res.first->second.changed_connection, boost::bind (&SlavableAutomationControl::master_changed, this, _1, _2, std::weak_ptr(m))); } } @@ -248,7 +248,7 @@ SlavableAutomationControl::get_boolean_masters () const } void -SlavableAutomationControl::update_boolean_masters_records (boost::shared_ptr m) +SlavableAutomationControl::update_boolean_masters_records (std::shared_ptr m) { if (_desc.toggled) { /* We may modify a MasterRecord, but we not modify the master @@ -283,9 +283,9 @@ SlavableAutomationControl::update_boolean_masters_records (boost::shared_ptr wm) +SlavableAutomationControl::master_changed (bool /*from_self*/, GroupControlDisposition gcd, std::weak_ptr wm) { - boost::shared_ptr m = wm.lock (); + std::shared_ptr m = wm.lock (); assert (m); Glib::Threads::RWLock::ReaderLock lm (master_lock); bool send_signal = handle_master_change (m); @@ -298,9 +298,9 @@ SlavableAutomationControl::master_changed (bool /*from_self*/, GroupControlDispo } void -SlavableAutomationControl::master_going_away (boost::weak_ptr wm) +SlavableAutomationControl::master_going_away (std::weak_ptr wm) { - boost::shared_ptr m = wm.lock(); + std::shared_ptr m = wm.lock(); if (m) { remove_master (m); } @@ -323,7 +323,7 @@ SlavableAutomationControl::scale_automation_callback (double value, double ratio } void -SlavableAutomationControl::remove_master (boost::shared_ptr m) +SlavableAutomationControl::remove_master (std::shared_ptr m) { if (_session.deletion_in_progress()) { /* no reason to care about new values or sending signals */ @@ -338,7 +338,7 @@ SlavableAutomationControl::remove_master (boost::shared_ptr m double master_ratio = 0; double list_ratio = toggled () ? 0 : 1; - boost::shared_ptr master; + std::shared_ptr master; { Glib::Threads::RWLock::WriterLock lm (master_lock); @@ -408,7 +408,7 @@ SlavableAutomationControl::clear_masters () double list_ratio = toggled () ? 0 : 1; /* null ptr means "all masters */ - pre_remove_master (boost::shared_ptr()); + pre_remove_master (std::shared_ptr()); { Glib::Threads::RWLock::WriterLock lm (master_lock); @@ -417,7 +417,7 @@ SlavableAutomationControl::clear_masters () } for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - boost::shared_ptr master = mr->second.master(); + std::shared_ptr master = mr->second.master(); if (master->automation_playback () && master->list()) { masters.push_back (mr->second.master()); list_ratio *= mr->second.val_master_inv (); @@ -479,17 +479,17 @@ SlavableAutomationControl::find_next_event_locked (timepos_t const & now, timepo * (see also Automatable::find_next_event) */ for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - boost::shared_ptr ac (mr->second.master()); + std::shared_ptr ac (mr->second.master()); - boost::shared_ptr sc - = boost::dynamic_pointer_cast(ac); + std::shared_ptr sc + = std::dynamic_pointer_cast(ac); if (sc && sc->find_next_event_locked (now, end, next_event)) { rv = true; } Evoral::ControlList::const_iterator i; - boost::shared_ptr alist (ac->list()); + std::shared_ptr alist (ac->list()); Evoral::ControlEvent cp (now, 0.0f); if (!alist) { continue; @@ -514,7 +514,7 @@ SlavableAutomationControl::find_next_event_locked (timepos_t const & now, timepo } bool -SlavableAutomationControl::handle_master_change (boost::shared_ptr) +SlavableAutomationControl::handle_master_change (std::shared_ptr) { /* Derived classes can implement this for special cases (e.g. mute). * This method is called with a ReaderLock (master_lock) held. @@ -554,18 +554,18 @@ SlavableAutomationControl::boolean_automation_run_locked (samplepos_t start, pfr return false; } for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - boost::shared_ptr ac (mr->second.master()); + std::shared_ptr ac (mr->second.master()); if (!ac->automation_playback ()) { continue; } if (!ac->toggled ()) { continue; } - boost::shared_ptr sc = boost::dynamic_pointer_cast(ac); + std::shared_ptr sc = std::dynamic_pointer_cast(ac); if (sc) { rv |= sc->boolean_automation_run (start, len); } - boost::shared_ptr alist (ac->list()); + std::shared_ptr alist (ac->list()); bool valid = false; const bool yn = alist->rt_safe_eval (timepos_t (start), valid) >= 0.5; if (!valid) { @@ -596,7 +596,7 @@ SlavableAutomationControl::boolean_automation_run (samplepos_t start, pframes_t } bool -SlavableAutomationControl::slaved_to (boost::shared_ptr m) const +SlavableAutomationControl::slaved_to (std::shared_ptr m) const { Glib::Threads::RWLock::ReaderLock lm (master_lock); return _masters.find (m->id()) != _masters.end(); @@ -609,13 +609,13 @@ SlavableAutomationControl::slaved () const return !_masters.empty(); } -std::set> +std::set> SlavableAutomationControl::masters () const { - std::set> rv; + std::set> rv; Glib::Threads::RWLock::ReaderLock lm (master_lock); for (auto const& m : _masters) { - boost::shared_ptr ac (m.second.master ()); + std::shared_ptr ac (m.second.master ()); if (ac) { rv.insert (ac); } diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 0e7687ae79..f761cd2133 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -96,7 +96,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) /* there's no data to load into the model but create it anyway */ - _model = boost::shared_ptr (new MidiModel (*this)); + _model = std::shared_ptr (new MidiModel (*this)); } /** Constructor used for external-to-session files. File must exist. */ @@ -653,7 +653,7 @@ SMFSource::load_model_unlocked (bool force_reload) assert (!_writing); if (!_model) { - _model = boost::shared_ptr (new MidiModel (*this)); + _model = std::shared_ptr (new MidiModel (*this)); } else { _model->clear(); } @@ -823,7 +823,7 @@ SMFSource::ensure_disk_file (const WriterLock& lock) /* We have a model, so write it to disk; see MidiSource::session_saved for an explanation of what we are doing here. */ - boost::shared_ptr mm = _model; + std::shared_ptr mm = _model; _model.reset (); mm->sync_to_source (lock); _model = mm; diff --git a/libs/ardour/solo_control.cc b/libs/ardour/solo_control.cc index 14f8c0287b..65f2d65757 100644 --- a/libs/ardour/solo_control.cc +++ b/libs/ardour/solo_control.cc @@ -30,7 +30,7 @@ using namespace PBD; SoloControl::SoloControl (Session& session, std::string const & name, Soloable& s, Muteable& m, Temporal::TimeDomain td) : SlavableAutomationControl (session, SoloAutomation, ParameterDescriptor (SoloAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(SoloAutomation), td)), name) , _soloable (s) , _muteable (m) @@ -181,7 +181,7 @@ SoloControl::get_value () const return self_soloed() || get_masters_value (); } - if (_list && boost::dynamic_pointer_cast(_list)->automation_playback()) { + if (_list && std::dynamic_pointer_cast(_list)->automation_playback()) { // Playing back automation, get the value from the list return AutomationControl::get_value(); } @@ -260,9 +260,9 @@ SoloControl::get_state () const } void -SoloControl::master_changed (bool /*from self*/, GroupControlDisposition, boost::weak_ptr wm) +SoloControl::master_changed (bool /*from self*/, GroupControlDisposition, std::weak_ptr wm) { - boost::shared_ptr m = wm.lock (); + std::shared_ptr m = wm.lock (); assert (m); bool send_signal = false; @@ -299,7 +299,7 @@ SoloControl::master_changed (bool /*from self*/, GroupControlDisposition, boost: } void -SoloControl::post_add_master (boost::shared_ptr m) +SoloControl::post_add_master (std::shared_ptr m) { if (m->get_value()) { @@ -317,7 +317,7 @@ SoloControl::post_add_master (boost::shared_ptr m) } void -SoloControl::pre_remove_master (boost::shared_ptr m) +SoloControl::pre_remove_master (std::shared_ptr m) { if (!m) { /* null control ptr means we're removing all masters. Nothing diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc index f953fc63c6..f2caf6184c 100644 --- a/libs/ardour/solo_isolate_control.cc +++ b/libs/ardour/solo_isolate_control.cc @@ -30,7 +30,7 @@ using namespace PBD; SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & name, Soloable& s, Temporal::TimeDomain td) : SlavableAutomationControl (session, SoloIsolateAutomation, ParameterDescriptor (SoloIsolateAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloIsolateAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(SoloIsolateAutomation), td)), name) , _soloable (s) , _solo_isolated (false) @@ -42,7 +42,7 @@ SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & na } void -SoloIsolateControl::master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::weak_ptr) +SoloIsolateControl::master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, std::weak_ptr) { if (!_soloable.can_solo()) { return; @@ -144,7 +144,7 @@ SoloIsolateControl::get_value () const return solo_isolated() || get_masters_value (); } - if (_list && boost::dynamic_pointer_cast(_list)->automation_playback()) { + if (_list && std::dynamic_pointer_cast(_list)->automation_playback()) { // Playing back automation, get the value from the list return AutomationControl::get_value(); } diff --git a/libs/ardour/solo_mute_release.cc b/libs/ardour/solo_mute_release.cc index 3eab207a78..98a7adab18 100644 --- a/libs/ardour/solo_mute_release.cc +++ b/libs/ardour/solo_mute_release.cc @@ -40,7 +40,7 @@ SoloMuteRelease::set_exclusive (bool e) } void -SoloMuteRelease::set (boost::shared_ptr r) +SoloMuteRelease::set (std::shared_ptr r) { if (active) { routes_on.reset (new RouteList); @@ -52,7 +52,7 @@ SoloMuteRelease::set (boost::shared_ptr r) } void -SoloMuteRelease::set (boost::shared_ptr rl) +SoloMuteRelease::set (std::shared_ptr rl) { if (active) { routes_on = rl; @@ -62,14 +62,14 @@ SoloMuteRelease::set (boost::shared_ptr rl) } void -SoloMuteRelease::set (boost::shared_ptr on, boost::shared_ptr off) +SoloMuteRelease::set (std::shared_ptr on, std::shared_ptr off) { routes_on = on; routes_off = off; } void -SoloMuteRelease::set (boost::shared_ptr > pml) +SoloMuteRelease::set (std::shared_ptr > pml) { port_monitors = pml; } diff --git a/libs/ardour/solo_safe_control.cc b/libs/ardour/solo_safe_control.cc index 4dace9e865..45562548b5 100644 --- a/libs/ardour/solo_safe_control.cc +++ b/libs/ardour/solo_safe_control.cc @@ -30,7 +30,7 @@ using namespace PBD; SoloSafeControl::SoloSafeControl (Session& session, std::string const & name, Temporal::TimeDomain td) : SlavableAutomationControl (session, SoloSafeAutomation, ParameterDescriptor (SoloSafeAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloSafeAutomation), td)), + std::shared_ptr(new AutomationList(Evoral::Parameter(SoloSafeAutomation), td)), name) , _solo_safe (false) { @@ -57,7 +57,7 @@ SoloSafeControl::get_value () const return get_masters_value_locked () ? 1.0 : 0.0; } - if (_list && boost::dynamic_pointer_cast(_list)->automation_playback()) { + if (_list && std::dynamic_pointer_cast(_list)->automation_playback()) { // Playing back automation, get the value from the list return AutomationControl::get_value(); } diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc index 97b89fbf24..1cf11cbcb1 100644 --- a/libs/ardour/source.cc +++ b/libs/ardour/source.cc @@ -458,7 +458,7 @@ Source::dec_use_count () #endif try { - boost::shared_ptr sptr = shared_from_this(); + std::shared_ptr sptr = shared_from_this(); } catch (...) { /* no shared_ptr available, relax; */ } diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 2fad260c0b..579965a4b1 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -52,10 +52,10 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -PBD::Signal1> SourceFactory::SourceCreated; +PBD::Signal1> SourceFactory::SourceCreated; Glib::Threads::Cond SourceFactory::PeaksToBuild; Glib::Threads::Mutex SourceFactory::peak_building_lock; -std::list> SourceFactory::files_with_peaks; +std::list> SourceFactory::files_with_peaks; std::vector SourceFactory::peak_thread_pool; bool SourceFactory::peak_thread_run = false; @@ -85,7 +85,7 @@ peak_thread_work () goto wait; } - boost::shared_ptr as (SourceFactory::files_with_peaks.front ().lock ()); + std::shared_ptr as (SourceFactory::files_with_peaks.front ().lock ()); SourceFactory::files_with_peaks.pop_front (); if (as) { ++active_threads; @@ -137,15 +137,15 @@ SourceFactory::terminate () } int -SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) +SourceFactory::setup_peakfile (std::shared_ptr s, bool async) { - boost::shared_ptr as (boost::dynamic_pointer_cast (s)); + std::shared_ptr as (std::dynamic_pointer_cast (s)); if (as) { // immediately set 'peakfile-path' for empty and NoPeakFile sources if (async && !as->empty () && !(as->flags () & Source::NoPeakFile)) { Glib::Threads::Mutex::Lock lm (peak_building_lock); - files_with_peaks.push_back (boost::weak_ptr (as)); + files_with_peaks.push_back (std::weak_ptr (as)); PeaksToBuild.broadcast (); } else { @@ -159,18 +159,18 @@ SourceFactory::setup_peakfile (boost::shared_ptr s, bool async) return 0; } -boost::shared_ptr +std::shared_ptr SourceFactory::createSilent (Session& s, const XMLNode& node, samplecnt_t nframes, float sr) { Source* src = new SilentFileSource (s, node, nframes, sr); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); // no analysis data - the file is non-existent SourceCreated (ret); return ret; } -boost::shared_ptr +std::shared_ptr SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) { DataType type = DataType::AUDIO; @@ -185,7 +185,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) if (node.property ("playlist") != 0) { try { - boost::shared_ptr ap (new AudioPlaylistSource (s, node)); + std::shared_ptr ap (new AudioPlaylistSource (s, node)); if (setup_peakfile (ap, true)) { throw failed_constructor (); @@ -203,7 +203,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } else { try { Source* src = new SndFileSource (s, node); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, defer_peaks)) { throw failed_constructor (); @@ -217,7 +217,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) #ifdef HAVE_COREAUDIO try { Source* src = new CoreAudioSource (s, node); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, defer_peaks)) { @@ -236,7 +236,7 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } else if (type == DataType::MIDI) { try { - boost::shared_ptr src (new SMFSource (s, node)); + std::shared_ptr src (new SMFSource (s, node)); BOOST_MARK_SOURCE (src); src->check_for_analysis_data_on_disk (); SourceCreated (src); @@ -248,14 +248,14 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) throw failed_constructor (); } -boost::shared_ptr +std::shared_ptr SourceFactory::createExternal (DataType type, Session& s, const string& path, int chn, Source::Flag flags, bool announce, bool defer_peaks) { if (type == DataType::AUDIO) { try { Source* src = new SndFileSource (s, path, chn, flags); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, defer_peaks)) { throw failed_constructor (); @@ -271,7 +271,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, #ifdef HAVE_COREAUDIO try { Source* src = new CoreAudioSource (s, path, chn, flags); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, defer_peaks)) { throw failed_constructor (); @@ -289,7 +289,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, if (!announce && (!AudioFileSource::get_build_peakfiles () || defer_peaks)) { try { Source* src = new Mp3FileSource (s, path, chn, flags); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); return ret; @@ -298,7 +298,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, try { Source* src = new FFMPEGFileSource (s, path, chn, flags); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); return ret; @@ -308,7 +308,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, } else if (type == DataType::MIDI) { try { - boost::shared_ptr src (new SMFSource (s, path)); + std::shared_ptr src (new SMFSource (s, path)); Source::WriterLock lock (src->mutex ()); BOOST_MARK_SOURCE (src); @@ -324,7 +324,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, throw failed_constructor (); } -boost::shared_ptr +std::shared_ptr SourceFactory::createWritable (DataType type, Session& s, const std::string& path, samplecnt_t rate, bool announce, bool defer_peaks) { @@ -336,7 +336,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat s.config.get_native_file_header_format (), rate, SndFileSource::default_writable_flags); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, defer_peaks)) { @@ -353,7 +353,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat } else if (type == DataType::MIDI) { // XXX writable flags should belong to MidiSource too try { - boost::shared_ptr src (new SMFSource (s, path, SndFileSource::default_writable_flags)); + std::shared_ptr src (new SMFSource (s, path, SndFileSource::default_writable_flags)); assert (src->writable ()); BOOST_MARK_SOURCE (src); @@ -372,7 +372,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat throw failed_constructor (); } -boost::shared_ptr +std::shared_ptr SourceFactory::createForRecovery (DataType type, Session& s, const std::string& path, int chn) { /* this might throw failed_constructor(), which is OK */ @@ -380,7 +380,7 @@ SourceFactory::createForRecovery (DataType type, Session& s, const std::string& if (type == DataType::AUDIO) { Source* src = new SndFileSource (s, path, chn); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); BOOST_MARK_SOURCE (ret); if (setup_peakfile (ret, false)) { @@ -403,13 +403,13 @@ SourceFactory::createForRecovery (DataType type, Session& s, const std::string& throw failed_constructor (); } -boost::shared_ptr -SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const PBD::ID& orig, const std::string& name, +std::shared_ptr +SourceFactory::createFromPlaylist (DataType type, Session& s, std::shared_ptr p, const PBD::ID& orig, const std::string& name, uint32_t chn, timepos_t start, timepos_t const& len, bool copy, bool defer_peaks) { if (type == DataType::AUDIO) { try { - boost::shared_ptr ap = boost::dynamic_pointer_cast (p); + std::shared_ptr ap = std::dynamic_pointer_cast (p); if (ap) { if (copy) { @@ -418,7 +418,7 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr< } Source* src = new AudioPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0)); - boost::shared_ptr ret (src); + std::shared_ptr ret (src); if (setup_peakfile (ret, defer_peaks)) { throw failed_constructor (); diff --git a/libs/ardour/srcfilesource.cc b/libs/ardour/srcfilesource.cc index dfecf555e7..27f984e939 100644 --- a/libs/ardour/srcfilesource.cc +++ b/libs/ardour/srcfilesource.cc @@ -31,7 +31,7 @@ using namespace PBD; const uint32_t SrcFileSource::max_blocksize = 2097152U; /* see AudioDiskstream::do_refill_with_alloc, max */ -SrcFileSource::SrcFileSource (Session& s, boost::shared_ptr src, SrcQuality srcq) +SrcFileSource::SrcFileSource (Session& s, std::shared_ptr src, SrcQuality srcq) : Source(s, DataType::AUDIO, src->name(), Flag (src->flags() & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) , AudioFileSource (s, src->path(), Flag (src->flags() & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) , _source (src) @@ -86,7 +86,7 @@ SrcFileSource::~SrcFileSource () void SrcFileSource::close () { - boost::shared_ptr fs = boost::dynamic_pointer_cast (_source); + std::shared_ptr fs = std::dynamic_pointer_cast (_source); if (fs) { fs->close (); } diff --git a/libs/ardour/st_pitch.cc b/libs/ardour/st_pitch.cc index 0a2a2a810f..01277306d8 100644 --- a/libs/ardour/st_pitch.cc +++ b/libs/ardour/st_pitch.cc @@ -43,7 +43,7 @@ Pitch::Pitch (Session& s, TimeFXRequest& req) } int -Pitch::run (boost::shared_ptr region) +Pitch::run (std::shared_ptr region) { tsr.done = true; diff --git a/libs/ardour/st_stretch.cc b/libs/ardour/st_stretch.cc index 4313616d8f..4a5f05f66f 100644 --- a/libs/ardour/st_stretch.cc +++ b/libs/ardour/st_stretch.cc @@ -48,9 +48,9 @@ STStretch::~STStretch () } int -STStretch::run (boost::shared_ptr r, Progress* progress) +STStretch::run (std::shared_ptr r, Progress* progress) { - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); if (!region) { error << "STStretch::run() passed a non-audio region! WTF?" << endmsg; @@ -232,7 +232,7 @@ STStretch::run (boost::shared_ptr r, Progress* progress) this_read = min (bufsize, avail); this_read = st[i].receiveSamples(buffers[i], this_read); - boost::shared_ptr asrc = boost::dynamic_pointer_cast (nsrcs[i]); + std::shared_ptr asrc = std::dynamic_pointer_cast (nsrcs[i]); if (!asrc) { continue; } @@ -260,7 +260,7 @@ STStretch::run (boost::shared_ptr r, Progress* progress) this_read = st[i].receiveSamples(buffers[i], this_read); - boost::shared_ptr asrc = boost::dynamic_pointer_cast (nsrcs[i]); + std::shared_ptr asrc = std::dynamic_pointer_cast (nsrcs[i]); if (!asrc) { continue; } @@ -295,7 +295,7 @@ STStretch::run (boost::shared_ptr r, Progress* progress) /* now reset ancestral data for each new region */ - for (vector >::iterator x = results.begin (); x != results.end (); ++x) { + for (vector >::iterator x = results.begin (); x != results.end (); ++x) { (*x)->set_ancestral_data (read_start, read_duration, stretch, @@ -312,7 +312,7 @@ STStretch::run (boost::shared_ptr r, Progress* progress) /* XXX: assuming we've only processed one input region into one result here */ if (ret == 0 && tsr.time_fraction != 1) { - boost::shared_ptr result = boost::dynamic_pointer_cast (results.front ()); + std::shared_ptr result = std::dynamic_pointer_cast (results.front ()); assert (result); result->envelope ()->x_scale (tsr.time_fraction); } diff --git a/libs/ardour/step_sequencer.cc b/libs/ardour/step_sequencer.cc index d8019ac8ec..97b854952e 100644 --- a/libs/ardour/step_sequencer.cc +++ b/libs/ardour/step_sequencer.cc @@ -846,31 +846,31 @@ StepSequencer::clear_note_offs () } } -boost::shared_ptr +std::shared_ptr StepSequencer::write_to_source (Session& session, string path) const { - boost::shared_ptr src; + std::shared_ptr src; /* caller must check for pre-existing file */ assert (!path.empty()); assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)); - src = boost::dynamic_pointer_cast(SourceFactory::createWritable (DataType::MIDI, session, path, false, session.sample_rate())); + src = std::dynamic_pointer_cast(SourceFactory::createWritable (DataType::MIDI, session, path, false, session.sample_rate())); try { if (src->create (path)) { - return boost::shared_ptr(); + return std::shared_ptr(); } } catch (...) { - return boost::shared_ptr(); + return std::shared_ptr(); } if (!fill_midi_source (src)) { /* src will go out of scope, and its destructor will remove the file, if any */ - return boost::shared_ptr(); + return std::shared_ptr(); } return src; @@ -883,7 +883,7 @@ struct ETC { }; bool -StepSequencer::fill_midi_source (boost::shared_ptr src) const +StepSequencer::fill_midi_source (std::shared_ptr src) const { Temporal::Beats smf_beats; diff --git a/libs/ardour/strip_silence.cc b/libs/ardour/strip_silence.cc index 98a6eea71a..926a2305a0 100644 --- a/libs/ardour/strip_silence.cc +++ b/libs/ardour/strip_silence.cc @@ -43,14 +43,14 @@ StripSilence::StripSilence (Session & s, const AudioIntervalMap& sm, samplecnt_t } int -StripSilence::run (boost::shared_ptr r, Progress* progress) +StripSilence::run (std::shared_ptr r, Progress* progress) { results.clear (); /* we only operate on AudioRegions, for now, though this could be adapted to MIDI as well I guess */ - boost::shared_ptr region = boost::dynamic_pointer_cast (r); + std::shared_ptr region = std::dynamic_pointer_cast (r); InterThreadInfo itt; AudioIntervalMap::const_iterator sm; @@ -112,11 +112,11 @@ StripSilence::run (boost::shared_ptr r, Progress* progress) for (AudioIntervalResult::const_iterator i = audible.begin(); i != audible.end(); ++i, ++n) { PBD::PropertyList plist; - boost::shared_ptr copy; + std::shared_ptr copy; plist.add (Properties::length, timecnt_t (i->second - i->first, timepos_t (r->position_sample() + (i->first - r->start_sample())))); - copy = boost::dynamic_pointer_cast ( + copy = std::dynamic_pointer_cast ( RegionFactory::create (region, timecnt_t (i->first - r->start_sample(), timepos_t::zero (false)), plist) ); diff --git a/libs/ardour/stripable.cc b/libs/ardour/stripable.cc index b293b0e994..e2de8fa72e 100644 --- a/libs/ardour/stripable.cc +++ b/libs/ardour/stripable.cc @@ -118,7 +118,7 @@ bool Stripable::is_selected() const { try { - boost::shared_ptr s (shared_from_this()); + std::shared_ptr s (shared_from_this()); } catch (...) { std::cerr << "cannot shared-from-this for " << this << std::endl; abort (); @@ -127,7 +127,7 @@ Stripable::is_selected() const } bool -Stripable::Sorter::operator() (boost::shared_ptr a, boost::shared_ptr b) +Stripable::Sorter::operator() (std::shared_ptr a, std::shared_ptr b) { const PresentationInfo::Flag a_flag = a->presentation_info().flags (); const PresentationInfo::Flag b_flag = b->presentation_info().flags (); diff --git a/libs/ardour/test/audio_engine_test.cc b/libs/ardour/test/audio_engine_test.cc index 794c331332..125b93cb50 100644 --- a/libs/ardour/test/audio_engine_test.cc +++ b/libs/ardour/test/audio_engine_test.cc @@ -47,7 +47,7 @@ AudioEngineTest::test_start () CPPUNIT_ASSERT (AudioEngine::instance ()); - boost::shared_ptr backend = engine->set_backend ("None (Dummy)", "Unit-Test", ""); + std::shared_ptr backend = engine->set_backend ("None (Dummy)", "Unit-Test", ""); CPPUNIT_ASSERT (backend); diff --git a/libs/ardour/test/audio_region_test.cc b/libs/ardour/test/audio_region_test.cc index fd623ca828..226a30cd9a 100644 --- a/libs/ardour/test/audio_region_test.cc +++ b/libs/ardour/test/audio_region_test.cc @@ -41,12 +41,12 @@ AudioRegionTest::setUp () std::string const test_wav_path = Glib::build_filename (new_test_output_dir(), "test.wav"); _playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test"); - _audio_playlist = boost::dynamic_pointer_cast (_playlist); + _audio_playlist = std::dynamic_pointer_cast (_playlist); _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path, get_test_sample_rate ()); /* Write a staircase to the source */ - boost::shared_ptr s = boost::dynamic_pointer_cast (_source); + std::shared_ptr s = std::dynamic_pointer_cast (_source); assert (s); int const signal_length = 4096; @@ -63,7 +63,7 @@ AudioRegionTest::setUp () plist.add (Properties::length, 100); for (int i = 0; i < 16; ++i) { _r[i] = RegionFactory::create (_source, plist); - _ar[i] = boost::dynamic_pointer_cast (_r[i]); + _ar[i] = std::dynamic_pointer_cast (_r[i]); _ar[i]->set_name (string_compose ("ar%1", i)); } } diff --git a/libs/ardour/test/audio_region_test.h b/libs/ardour/test/audio_region_test.h index 061e0a1720..454aba01a1 100644 --- a/libs/ardour/test/audio_region_test.h +++ b/libs/ardour/test/audio_region_test.h @@ -38,14 +38,14 @@ public: virtual void tearDown (); protected: - boost::shared_ptr _playlist; + std::shared_ptr _playlist; /** AudioPlaylist downcast of _playlist */ - boost::shared_ptr _audio_playlist; - boost::shared_ptr _source; + std::shared_ptr _audio_playlist; + std::shared_ptr _source; /** 16 regions, of length 100, each referencing a source which is 4096 * samples of a staircase waveform. */ - boost::shared_ptr _r[16]; + std::shared_ptr _r[16]; /** AudioRegion downcasts of _r[] */ - boost::shared_ptr _ar[16]; + std::shared_ptr _ar[16]; }; diff --git a/libs/ardour/test/automation_list_property_test.cc b/libs/ardour/test/automation_list_property_test.cc index 35843dafbc..25c8489c9a 100644 --- a/libs/ardour/test/automation_list_property_test.cc +++ b/libs/ardour/test/automation_list_property_test.cc @@ -65,11 +65,11 @@ AutomationListPropertyTest::basicTest () list ignore_properties; ignore_properties.push_back ("id"); - PropertyDescriptor > descriptor; + PropertyDescriptor > descriptor; descriptor.property_id = g_quark_from_static_string ("FadeIn"); AutomationListProperty property ( descriptor, - boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime)) + std::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime)) ); property.clear_changes (); @@ -115,7 +115,7 @@ class Fred : public StatefulDestructible { public: Fred () - : _jim (_descriptor, boost::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) + : _jim (_descriptor, std::shared_ptr (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))) { add_property (_jim); @@ -137,10 +137,10 @@ public: } AutomationListProperty _jim; - static PropertyDescriptor > _descriptor; + static PropertyDescriptor > _descriptor; }; -PropertyDescriptor > Fred::_descriptor; +PropertyDescriptor > Fred::_descriptor; void AutomationListPropertyTest::undoTest () @@ -150,7 +150,7 @@ AutomationListPropertyTest::undoTest () Fred::make_property_quarks (); - boost::shared_ptr sheila (new Fred); + std::shared_ptr sheila (new Fred); /* Add some data */ sheila->_jim->add (timepos_t(0), 1, false, false); diff --git a/libs/ardour/test/lua_script_test.cc b/libs/ardour/test/lua_script_test.cc index ec29415517..674aed56a8 100644 --- a/libs/ardour/test/lua_script_test.cc +++ b/libs/ardour/test/lua_script_test.cc @@ -63,11 +63,11 @@ void LuaScriptTest::dsp_script_test () { PluginManager& pm = PluginManager::instance (); - std::list > tracks; + std::list > tracks; tracks = _session->new_audio_track (2, 2, NULL, 1, "", PresentationInfo::max_order); CPPUNIT_ASSERT (tracks.size() == 1); - boost::shared_ptr r = tracks.front (); + std::shared_ptr r = tracks.front (); std::cout << "\n"; const PluginInfoList& plugs = pm.lua_plugin_info(); @@ -91,10 +91,10 @@ LuaScriptTest::dsp_script_test () PluginPtr p = (*i)->load (*_session); CPPUNIT_ASSERT_MESSAGE ((*i)->name, p); - boost::shared_ptr processor (new PluginInsert (*_session, r->time_domain(), p)); + std::shared_ptr processor (new PluginInsert (*_session, r->time_domain(), p)); processor->enable (true); - int rv = r->add_processor (processor, boost::shared_ptr(), 0); + int rv = r->add_processor (processor, std::shared_ptr(), 0); CPPUNIT_ASSERT_MESSAGE ((*i)->name, rv == 0); processor->enable (true); Glib::usleep(200000); // run process, failing plugins will be deactivated. diff --git a/libs/ardour/test/playlist_equivalent_regions_test.cc b/libs/ardour/test/playlist_equivalent_regions_test.cc index a51c93c234..a7ed039f11 100644 --- a/libs/ardour/test/playlist_equivalent_regions_test.cc +++ b/libs/ardour/test/playlist_equivalent_regions_test.cc @@ -55,7 +55,7 @@ PlaylistEquivalentRegionsTest::basicsTest () _playlist_b->add_region (_r[1], timepos_t(42)); /* Look for the equivalents to _r[0] on _playlist_b */ - vector > e; + vector > e; _playlist_b->get_equivalent_regions (_r[0], e); /* That should be _r[1] */ @@ -93,7 +93,7 @@ PlaylistEquivalentRegionsTest::multiLayerTest () * using different equivalence modes */ Config->set_region_equivalence (Exact); - vector > e; + vector > e; _playlist_b->get_equivalent_regions (_r[0], e); /* That should be _r[2] and _r[3] */ CPPUNIT_ASSERT_EQUAL (size_t (2), e.size ()); diff --git a/libs/ardour/test/playlist_equivalent_regions_test.h b/libs/ardour/test/playlist_equivalent_regions_test.h index abf2b2f51f..31153227bb 100644 --- a/libs/ardour/test/playlist_equivalent_regions_test.h +++ b/libs/ardour/test/playlist_equivalent_regions_test.h @@ -32,5 +32,5 @@ public: void multiLayerTest (); private: - boost::shared_ptr _playlist_b; + std::shared_ptr _playlist_b; }; diff --git a/libs/ardour/test/profiling/lots_of_regions.cc b/libs/ardour/test/profiling/lots_of_regions.cc index f2292c31a3..bb5fceb2ec 100644 --- a/libs/ardour/test/profiling/lots_of_regions.cc +++ b/libs/ardour/test/profiling/lots_of_regions.cc @@ -26,15 +26,15 @@ main (int argc, char* argv[]) { /* Find the track */ - boost::shared_ptr track = boost::dynamic_pointer_cast (session->get_routes()->back()); + std::shared_ptr track = std::dynamic_pointer_cast (session->get_routes()->back()); assert (track); /* And the playlist */ - boost::shared_ptr playlist = track->playlist (); + std::shared_ptr playlist = track->playlist (); assert (playlist); /* And the region */ - boost::shared_ptr region = boost::dynamic_pointer_cast (playlist->region_list_property().rlist().front()); + std::shared_ptr region = std::dynamic_pointer_cast (playlist->region_list_property().rlist().front()); assert (region); /* Duplicate it a lot */ diff --git a/libs/ardour/test/region_naming_test.cc b/libs/ardour/test/region_naming_test.cc index dc4ecf7966..4a2954206d 100644 --- a/libs/ardour/test/region_naming_test.cc +++ b/libs/ardour/test/region_naming_test.cc @@ -30,7 +30,7 @@ void RegionNamingTest::basicsTest () { for (int i = 0; i < 64; ++i) { - boost::shared_ptr r = RegionFactory::create (_r[0], true); + std::shared_ptr r = RegionFactory::create (_r[0], true); stringstream s; s << "ar0." << (i + 1); CPPUNIT_ASSERT_EQUAL (s.str(), r->name()); @@ -39,15 +39,15 @@ RegionNamingTest::basicsTest () _r[0]->set_name ("foo"); for (int i = 0; i < 64; ++i) { - boost::shared_ptr r = RegionFactory::create (_r[0], true); + std::shared_ptr r = RegionFactory::create (_r[0], true); stringstream s; s << "foo." << (i + 1); CPPUNIT_ASSERT_EQUAL (s.str(), r->name()); } for (int i = 0; i < 64; ++i) { - boost::shared_ptr rA = RegionFactory::create (_r[0], true); - boost::shared_ptr rB = RegionFactory::create (rA, true); + std::shared_ptr rA = RegionFactory::create (_r[0], true); + std::shared_ptr rB = RegionFactory::create (rA, true); stringstream s; s << "foo." << (i * 2 + 64 + 1); CPPUNIT_ASSERT_EQUAL (s.str(), rA->name()); diff --git a/libs/ardour/test/resampled_source_test.cc b/libs/ardour/test/resampled_source_test.cc index 97bf2e58fe..a80565a2d2 100644 --- a/libs/ardour/test/resampled_source_test.cc +++ b/libs/ardour/test/resampled_source_test.cc @@ -20,7 +20,7 @@ ResampledSourceTest::seekTest () CPPUNIT_ASSERT (find_file (test_search_path (), test_filename, test_file_path)); - boost::shared_ptr s (new SndFileImportableSource (test_file_path)); + std::shared_ptr s (new SndFileImportableSource (test_file_path)); ResampledImportableSource r (s, 48000, SrcBest); /* Make sure that seek (0) has the desired effect, ie that diff --git a/libs/ardour/thawlist.cc b/libs/ardour/thawlist.cc index 5e94477e9a..fe3d157e76 100644 --- a/libs/ardour/thawlist.cc +++ b/libs/ardour/thawlist.cc @@ -30,7 +30,7 @@ ThawList::~ThawList () } void -ThawList::add (boost::shared_ptr r) +ThawList::add (std::shared_ptr r) { if (std::find (begin (), end (), r) != end ()) { return; @@ -49,7 +49,7 @@ ThawList::release () (*i)->set_changemap (0); } for (Region::ChangeMap::const_iterator i = cm.begin (); i != cm.end (); ++i) { - boost::shared_ptr rl (new RegionList (i->second)); + std::shared_ptr rl (new RegionList (i->second)); assert (rl->size () > 0); Region::RegionsPropertyChanged (rl, i->first); } diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 821ecbf573..54d1e497dc 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -89,7 +89,7 @@ int Track::init () { if (!is_auditioner()) { - _triggerbox = boost::shared_ptr (new TriggerBox (_session, data_type ())); + _triggerbox = std::shared_ptr (new TriggerBox (_session, data_type ())); _triggerbox->set_owner (this); } @@ -113,8 +113,8 @@ Track::init () set_align_choice_from_io (); - boost::shared_ptr rp (boost::dynamic_pointer_cast (shared_from_this())); - boost::shared_ptr rt = boost::dynamic_pointer_cast (rp); + std::shared_ptr rp (std::dynamic_pointer_cast (shared_from_this())); + std::shared_ptr rt = std::dynamic_pointer_cast (rp); _record_enable_control.reset (new RecordEnableControl (_session, EventTypeMap::instance().to_symbol (RecEnableAutomation), *this, time_domain())); add_control (_record_enable_control); @@ -207,11 +207,11 @@ Track::set_state (const XMLNode& node, int version) set_align_choice (ac, true); } - if (boost::shared_ptr pl = boost::dynamic_pointer_cast (_session.playlists()->by_name (name))) { + if (std::shared_ptr pl = std::dynamic_pointer_cast (_session.playlists()->by_name (name))) { use_playlist (DataType::AUDIO, pl); } - if (boost::shared_ptr pl = boost::dynamic_pointer_cast (_session.playlists()->by_name (name))) { + if (std::shared_ptr pl = std::dynamic_pointer_cast (_session.playlists()->by_name (name))) { use_playlist (DataType::MIDI, pl); } } @@ -425,7 +425,7 @@ Track::set_name (const string& str) break; } - boost::shared_ptr me = boost::dynamic_pointer_cast (shared_from_this ()); + std::shared_ptr me = std::dynamic_pointer_cast (shared_from_this ()); _disk_reader->set_name (str); _disk_writer->set_name (str); @@ -465,7 +465,7 @@ Track::set_name (const string& str) return Route::set_name (str); } -boost::shared_ptr +std::shared_ptr Track::playlist () { return _playlists[data_type()]; @@ -487,7 +487,7 @@ Track::ensure_input_monitoring (bool m) } } -list > & +list > & Track::last_capture_sources () { return _disk_writer->last_capture_sources (); @@ -657,7 +657,7 @@ Track::playlist_modified () int Track::find_and_use_playlist (DataType dt, PBD::ID const & id) { - boost::shared_ptr playlist; + std::shared_ptr playlist; if ((playlist = _session.playlists()->by_id (id)) == 0) { return -1; @@ -672,7 +672,7 @@ Track::find_and_use_playlist (DataType dt, PBD::ID const & id) } int -Track::use_playlist (DataType dt, boost::shared_ptr p, bool set_orig) +Track::use_playlist (DataType dt, std::shared_ptr p, bool set_orig) { int ret; @@ -684,20 +684,20 @@ Track::use_playlist (DataType dt, boost::shared_ptr p, bool set_orig) } } - boost::shared_ptr old = _playlists[dt]; + std::shared_ptr old = _playlists[dt]; if (ret == 0) { _playlists[dt] = p; } if (old) { - boost::shared_ptr rl (new RegionList (old->region_list_property ().rlist ())); + std::shared_ptr rl (new RegionList (old->region_list_property ().rlist ())); if (rl->size () > 0) { Region::RegionsPropertyChanged (rl, Properties::hidden); } } if (p) { - boost::shared_ptr rl (new RegionList (p->region_list_property ().rlist ())); + std::shared_ptr rl (new RegionList (p->region_list_property ().rlist ())); if (rl->size () > 0) { Region::RegionsPropertyChanged (rl, Properties::hidden); } @@ -720,7 +720,7 @@ Track::use_copy_playlist () } string newname; - boost::shared_ptr playlist; + std::shared_ptr playlist; newname = Playlist::bump_name (_playlists[data_type()]->name(), _session); @@ -739,7 +739,7 @@ int Track::use_new_playlist (DataType dt) { string newname; - boost::shared_ptr playlist = _playlists[dt]; + std::shared_ptr playlist = _playlists[dt]; if (playlist) { newname = Playlist::bump_name (playlist->name(), _session); @@ -788,7 +788,7 @@ Track::set_align_choice_from_io () if (_input) { uint32_t n = 0; - boost::shared_ptr p; + std::shared_ptr p; while (0 != (p = _input->nth (n++))) { /* In case of JACK all ports not owned by Ardour may be re-sampled, @@ -895,8 +895,8 @@ Track::use_captured_sources (SourceList& srcs, CaptureInfos const & capture_info return; } - boost::shared_ptr afs = boost::dynamic_pointer_cast (srcs.front()); - boost::shared_ptr mfs = boost::dynamic_pointer_cast (srcs.front()); + std::shared_ptr afs = std::dynamic_pointer_cast (srcs.front()); + std::shared_ptr mfs = std::dynamic_pointer_cast (srcs.front()); if (afs) { use_captured_audio_sources (srcs, capture_info); @@ -916,9 +916,9 @@ Track::use_captured_midi_sources (SourceList& srcs, CaptureInfos const & capture /* There is an assumption here that we have only a single MIDI file */ - boost::shared_ptr mfs = boost::dynamic_pointer_cast (srcs.front()); - boost::shared_ptr pl = _playlists[DataType::MIDI]; - boost::shared_ptr midi_region; + std::shared_ptr mfs = std::dynamic_pointer_cast (srcs.front()); + std::shared_ptr pl = _playlists[DataType::MIDI]; + std::shared_ptr midi_region; CaptureInfos::const_iterator ci; if (!mfs || !pl) { @@ -961,9 +961,9 @@ Track::use_captured_midi_sources (SourceList& srcs, CaptureInfos const & capture plist.add (Properties::length, mfs->length()); plist.add (Properties::layer, 0); - boost::shared_ptr rx (RegionFactory::create (srcs, plist)); + std::shared_ptr rx (RegionFactory::create (srcs, plist)); - midi_region = boost::dynamic_pointer_cast (rx); + midi_region = std::dynamic_pointer_cast (rx); midi_region->special_set_position (timepos_t (capture_info.front()->start)); } @@ -1023,8 +1023,8 @@ Track::use_captured_midi_sources (SourceList& srcs, CaptureInfos const & capture plist.add (Properties::opaque, rmode != RecSoundOnSound); plist.add (Properties::name, region_name); - boost::shared_ptr rx (RegionFactory::create (srcs, plist)); - midi_region = boost::dynamic_pointer_cast (rx); + std::shared_ptr rx (RegionFactory::create (srcs, plist)); + midi_region = std::dynamic_pointer_cast (rx); if (preroll_off > 0) { midi_region->trim_front (timepos_t ((*ci)->start - initial_capture + preroll_off)); } @@ -1054,9 +1054,9 @@ Track::use_captured_audio_sources (SourceList& srcs, CaptureInfos const & captur return; } - boost::shared_ptr afs = boost::dynamic_pointer_cast (srcs.front()); - boost::shared_ptr pl = _playlists[DataType::AUDIO]; - boost::shared_ptr region; + std::shared_ptr afs = std::dynamic_pointer_cast (srcs.front()); + std::shared_ptr pl = _playlists[DataType::AUDIO]; + std::shared_ptr region; if (!afs || !pl) { return; @@ -1080,11 +1080,11 @@ Track::use_captured_audio_sources (SourceList& srcs, CaptureInfos const & captur plist.add (Properties::length, afs->length()); plist.add (Properties::name, whole_file_region_name); plist.add (Properties::opaque, rmode != RecSoundOnSound); - boost::shared_ptr rx (RegionFactory::create (srcs, plist)); + std::shared_ptr rx (RegionFactory::create (srcs, plist)); rx->set_automatic (true); rx->set_whole_file (true); - region = boost::dynamic_pointer_cast (rx); + region = std::dynamic_pointer_cast (rx); region->special_set_position (timepos_t (afs->natural_position())); } @@ -1127,8 +1127,8 @@ Track::use_captured_audio_sources (SourceList& srcs, CaptureInfos const & captur plist.add (Properties::name, region_name); plist.add (Properties::opaque, rmode != RecSoundOnSound); - boost::shared_ptr rx (RegionFactory::create (srcs, plist)); - region = boost::dynamic_pointer_cast (rx); + std::shared_ptr rx (RegionFactory::create (srcs, plist)); + region = std::dynamic_pointer_cast (rx); if (preroll_off > 0) { region->trim_front (timepos_t (buffer_position + preroll_off)); } diff --git a/libs/ardour/transform.cc b/libs/ardour/transform.cc index 25f94a175e..beebb63737 100644 --- a/libs/ardour/transform.cc +++ b/libs/ardour/transform.cc @@ -120,7 +120,7 @@ Transform::Operation::eval(Context& ctx) const } Command* -Transform::operator()(boost::shared_ptr model, +Transform::operator()(std::shared_ptr model, Temporal::Beats position, std::vector& seqs) { diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc index 3c06e5cd35..2d90d0516b 100644 --- a/libs/ardour/transport_master.cc +++ b/libs/ardour/transport_master.cc @@ -164,14 +164,14 @@ TransportMaster::set_name (std::string const & str) } void -TransportMaster::connection_handler (boost::weak_ptr w0, std::string, boost::weak_ptr w1, std::string, bool yn) +TransportMaster::connection_handler (std::weak_ptr w0, std::string, std::weak_ptr w1, std::string, bool yn) { if (!_port) { return; } - boost::shared_ptr p0 (w0.lock()); - boost::shared_ptr p1 (w1.lock()); + std::shared_ptr p0 (w0.lock()); + std::shared_ptr p1 (w1.lock()); if ((p0 && _port == p0) || (p1 && _port == p1)) { @@ -340,11 +340,11 @@ TransportMaster::get_state () const return *node; } -boost::shared_ptr +std::shared_ptr TransportMaster::factory (XMLNode const & node) { if (node.name() != TransportMaster::state_node_name) { - return boost::shared_ptr(); + return std::shared_ptr(); } SyncSource type; @@ -352,11 +352,11 @@ TransportMaster::factory (XMLNode const & node) bool removeable; if (!node.get_property (X_("type"), type)) { - return boost::shared_ptr(); + return std::shared_ptr(); } if (!node.get_property (X_("name"), name)) { - return boost::shared_ptr(); + return std::shared_ptr(); } if (!node.get_property (X_("removeable"), removeable)) { @@ -371,12 +371,12 @@ TransportMaster::factory (XMLNode const & node) return factory (type, name, removeable); } -boost::shared_ptr +std::shared_ptr TransportMaster::factory (SyncSource type, std::string const& name, bool removeable) { /* XXX need to count existing sources of a given type */ - boost::shared_ptr tm; + std::shared_ptr tm; DEBUG_TRACE (DEBUG::Slave, string_compose ("factory-construct %1 name %2 removeable %3\n", enum_2_string (type), name, removeable)); @@ -400,7 +400,7 @@ TransportMaster::factory (SyncSource type, std::string const& name, bool removea } catch (...) { error << string_compose (_("Construction of transport master object of type %1 failed"), enum_2_string (type)) << endmsg; std::cerr << string_compose (_("Construction of transport master object of type %1 failed"), enum_2_string (type)) << std::endl; - return boost::shared_ptr(); + return std::shared_ptr(); } if (tm) { @@ -558,16 +558,16 @@ TransportMasterViaMIDI::~TransportMasterViaMIDI () session_connections.drop_connections(); } -boost::shared_ptr +std::shared_ptr TransportMasterViaMIDI::create_midi_port (std::string const & port_name) { - boost::shared_ptr p; + std::shared_ptr p; if ((p = AudioEngine::instance()->register_input_port (DataType::MIDI, port_name, false, TransportMasterPort)) == 0) { - return boost::shared_ptr (); + return std::shared_ptr (); } - _midi_port = boost::dynamic_pointer_cast (p); + _midi_port = std::dynamic_pointer_cast (p); return p; } diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc index 6ccf1edd07..84058fb137 100644 --- a/libs/ardour/transport_master_manager.cc +++ b/libs/ardour/transport_master_manager.cc @@ -332,8 +332,8 @@ TransportMasterManager::maybe_set_tc_format () if (!Config->get_timecode_sync_frame_rate() || !_session) { return; } - boost::shared_ptr tcm; - if ((tcm = boost::dynamic_pointer_cast(_current_master)) == 0) { + std::shared_ptr tcm; + if ((tcm = std::dynamic_pointer_cast(_current_master)) == 0) { return; } @@ -393,7 +393,7 @@ int TransportMasterManager::add (SyncSource type, std::string const & name, bool removeable) { int ret = 0; - boost::shared_ptr tm; + std::shared_ptr tm; DEBUG_TRACE (DEBUG::Slave, string_compose ("adding new transport master, type %1 name %2 removeable %3\n", enum_2_string (type), name, removeable)); @@ -426,7 +426,7 @@ TransportMasterManager::add (SyncSource type, std::string const & name, bool rem } int -TransportMasterManager::add_locked (boost::shared_ptr tm) +TransportMasterManager::add_locked (std::shared_ptr tm) { if (!tm) { return -1; @@ -445,7 +445,7 @@ int TransportMasterManager::remove (std::string const & name) { int ret = -1; - boost::shared_ptr tm; + std::shared_ptr tm; { Glib::Threads::RWLock::WriterLock lm (lock); @@ -471,7 +471,7 @@ TransportMasterManager::remove (std::string const & name) } int -TransportMasterManager::set_current_locked (boost::shared_ptr c) +TransportMasterManager::set_current_locked (std::shared_ptr c) { if (c) { if (find (_transport_masters.begin(), _transport_masters.end(), c) == _transport_masters.end()) { @@ -514,10 +514,10 @@ TransportMasterManager::set_current_locked (boost::shared_ptr c } int -TransportMasterManager::set_current (boost::shared_ptr c) +TransportMasterManager::set_current (std::shared_ptr c) { int ret = -1; - boost::shared_ptr old (_current_master); + std::shared_ptr old (_current_master); { Glib::Threads::RWLock::WriterLock lm (lock); @@ -535,7 +535,7 @@ int TransportMasterManager::set_current (SyncSource ss) { int ret = -1; - boost::shared_ptr old (_current_master); + std::shared_ptr old (_current_master); { Glib::Threads::RWLock::WriterLock lm (lock); @@ -560,7 +560,7 @@ int TransportMasterManager::set_current (std::string const & str) { int ret = -1; - boost::shared_ptr old (_current_master); + std::shared_ptr old (_current_master); { Glib::Threads::RWLock::WriterLock lm (lock); @@ -590,7 +590,7 @@ TransportMasterManager::clear () _transport_masters.clear (); } - Removed (boost::shared_ptr()); + Removed (std::shared_ptr()); } int @@ -618,7 +618,7 @@ TransportMasterManager::set_state (XMLNode const & node, int version) for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) { - boost::shared_ptr tm = TransportMaster::factory (**c); + std::shared_ptr tm = TransportMaster::factory (**c); if (!tm) { continue; @@ -663,7 +663,7 @@ TransportMasterManager::get_state () const return *node; } -boost::shared_ptr +std::shared_ptr TransportMasterManager::master_by_type (SyncSource src) const { Glib::Threads::RWLock::ReaderLock lm (lock); @@ -674,11 +674,11 @@ TransportMasterManager::master_by_type (SyncSource src) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } -boost::shared_ptr -TransportMasterManager::master_by_port (boost::shared_ptr const &p) const +std::shared_ptr +TransportMasterManager::master_by_port (std::shared_ptr const &p) const { Glib::Threads::RWLock::ReaderLock lm (lock); @@ -688,7 +688,7 @@ TransportMasterManager::master_by_port (boost::shared_ptr const &p) const } } - return boost::shared_ptr (); + return std::shared_ptr (); } diff --git a/libs/ardour/transpose.cc b/libs/ardour/transpose.cc index 771fae360a..4f3c5849ee 100644 --- a/libs/ardour/transpose.cc +++ b/libs/ardour/transpose.cc @@ -25,7 +25,7 @@ Transpose::Transpose(int semitones) {} Command* -Transpose::operator()(boost::shared_ptr model, +Transpose::operator()(std::shared_ptr model, Temporal::Beats position, std::vector& seqs) { diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index f13d4575c7..b247eb0f72 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -23,8 +23,6 @@ #include #include -#include - #include #include @@ -613,7 +611,7 @@ Trigger::set_state (const XMLNode& node, int version) node.get_property (X_("region"), rid); - boost::shared_ptr r = RegionFactory::region_by_id (rid); + std::shared_ptr r = RegionFactory::region_by_id (rid); if (r) { set_region (r, false); //this results in a call to estimate_tempo() @@ -638,7 +636,7 @@ Trigger::internal_use_follow_length () const } void -Trigger::set_region (boost::shared_ptr r, bool use_thread) +Trigger::set_region (std::shared_ptr r, bool use_thread) { /* Called from (G)UI thread */ @@ -665,7 +663,7 @@ Trigger::clear_region () } void -Trigger::set_region_internal (boost::shared_ptr r) +Trigger::set_region_internal (std::shared_ptr r) { /* No whole file regions in the triggerbox, just like we do not allow * them in playlists either. @@ -1549,11 +1547,11 @@ AudioTrigger::natural_length() const } int -AudioTrigger::set_region_in_worker_thread (boost::shared_ptr r) +AudioTrigger::set_region_in_worker_thread (std::shared_ptr r) { assert (!active()); - boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + std::shared_ptr ar = std::dynamic_pointer_cast (r); if (r && !ar) { return -1; @@ -1774,7 +1772,7 @@ AudioTrigger::setup_stretcher () return; } - boost::shared_ptr ar (boost::dynamic_pointer_cast (_region)); + std::shared_ptr ar (std::dynamic_pointer_cast (_region)); const uint32_t nchans = std::min (_box.input_streams().n_audio(), ar->n_channels()); //map our internal enum to a rubberband option @@ -1803,7 +1801,7 @@ AudioTrigger::drop_data () } int -AudioTrigger::load_data (boost::shared_ptr ar) +AudioTrigger::load_data (std::shared_ptr ar) { const uint32_t nchans = ar->n_channels(); @@ -1847,7 +1845,7 @@ AudioTrigger::audio_run (BufferSet& bufs, samplepos_t start_sample, samplepos_t Temporal::Beats const & start, Temporal::Beats const & end, pframes_t nframes, pframes_t dest_offset, double bpm, pframes_t& quantize_offset) { - boost::shared_ptr ar = boost::dynamic_pointer_cast(_region); + std::shared_ptr ar = std::dynamic_pointer_cast(_region); /* We do not modify the I/O of our parent route, so we process only min (bufs.n_audio(),region.channels()) */ const uint32_t nchans = (in_process_context ? std::min (bufs.count().n_audio(), ar->n_channels()) : ar->n_channels()); int avail = 0; @@ -2355,7 +2353,7 @@ SegmentDescriptor MIDITrigger::get_segment_descriptor () const { SegmentDescriptor sd; - boost::shared_ptr mr = boost::dynamic_pointer_cast (_region); + std::shared_ptr mr = std::dynamic_pointer_cast (_region); assert (mr); sd.set_extent (Temporal::Beats(), mr->length().beats()); @@ -2605,13 +2603,13 @@ MIDITrigger::estimate_midi_patches () _patch_change[chan].set_program( 0 ); } - boost::shared_ptr smfs = boost::dynamic_pointer_cast (_region->source(0)); + std::shared_ptr smfs = std::dynamic_pointer_cast (_region->source(0)); if (smfs) { /* second, apply any patches that the Auditioner has in its memory * ...this handles the case where the user chose patches for a file that itself lacked patch-settings * (it's possible that the user didn't audition the actual file they dragged in, but this is still the best starting-point we have) * */ - boost::shared_ptr aud = _box.session().the_auditioner(); + std::shared_ptr aud = _box.session().the_auditioner(); if (aud) { for (uint8_t chan = 0; chan < 16; ++chan) { if (aud->patch_change (chan).is_set()) { @@ -2621,7 +2619,7 @@ MIDITrigger::estimate_midi_patches () } /* thirdly, apply the patches from the file itself (if it has any) */ - boost::shared_ptr model = smfs->model(); + std::shared_ptr model = smfs->model(); for (MidiModel::PatchChanges::const_iterator i = model->patch_changes().begin(); i != model->patch_changes().end(); ++i) { if ((*i)->is_set()) { int chan = (*i)->channel(); /* behavior is undefined for SMF's with multiple patch changes. I'm not sure that we care */ @@ -2641,9 +2639,9 @@ MIDITrigger::estimate_midi_patches () } int -MIDITrigger::set_region_in_worker_thread (boost::shared_ptr r) +MIDITrigger::set_region_in_worker_thread (std::shared_ptr r) { - boost::shared_ptr mr = boost::dynamic_pointer_cast (r); + std::shared_ptr mr = std::dynamic_pointer_cast (r); if (!mr) { return -1; @@ -3054,9 +3052,9 @@ PBD::Signal0 TriggerBox::TriggerMIDILearned; MIDI::Parser* TriggerBox::input_parser (new MIDI::Parser); /* leak */ PBD::ScopedConnectionList TriggerBox::static_connections; PBD::ScopedConnection TriggerBox::midi_input_connection; -boost::shared_ptr TriggerBox::current_input; +std::shared_ptr TriggerBox::current_input; -typedef std::map , boost::shared_ptr> RegionStateMap; +typedef std::map , std::shared_ptr> RegionStateMap; RegionStateMap enqueued_state_map; void @@ -3072,7 +3070,7 @@ TriggerBox::static_init (Session & s) { Config->ParameterChanged.connect_same_thread (static_connections, boost::bind (&TriggerBox::static_parameter_changed, _1)); input_parser->any.connect_same_thread (midi_input_connection, boost::bind (&TriggerBox::midi_input_handler, _1, _2, _3, _4)); - boost::dynamic_pointer_cast (s.trigger_input_port())->set_trace (input_parser); + std::dynamic_pointer_cast (s.trigger_input_port())->set_trace (input_parser); std::string const& dtip (Config->get_default_trigger_input_port()); if (!dtip.empty () && s.engine().get_port_by_name (dtip)) { s.trigger_input_port()->connect (dtip); @@ -3101,11 +3099,11 @@ TriggerBox::TriggerBox (Session& s, DataType dt) if (_data_type == DataType::AUDIO) { for (uint32_t n = 0; n < TriggerBox::default_triggers_per_box; ++n) { - all_triggers.push_back (boost::make_shared (n, *this)); + all_triggers.push_back (std::make_shared (n, *this)); } } else { for (uint32_t n = 0; n < TriggerBox::default_triggers_per_box; ++n) { - all_triggers.push_back (boost::make_shared (n, *this)); + all_triggers.push_back (std::make_shared (n, *this)); } } @@ -3359,8 +3357,8 @@ TriggerBox::fast_forward (CueEvents const & cues, samplepos_t transport_position DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1: roll trigger %2 from %3 to %4 with cnt = %5\n", order(), trig->index(), start_samples, transport_position, cnt)); - if (boost::dynamic_pointer_cast (trig)) { - boost::dynamic_pointer_cast (trig)->_transition_bbt = ns; + if (std::dynamic_pointer_cast (trig)) { + std::dynamic_pointer_cast (trig)->_transition_bbt = ns; } trig->start_and_roll_to (start_samples, transport_position, cnt); @@ -3389,7 +3387,7 @@ TriggerBox::fast_forward (CueEvents const & cues, samplepos_t transport_position } void -TriggerBox::set_region (uint32_t slot, boost::shared_ptr region) +TriggerBox::set_region (uint32_t slot, std::shared_ptr region) { /* This is called from our worker thread */ @@ -3555,12 +3553,12 @@ TriggerBox::trigger_by_id (PBD::ID check) } void -TriggerBox::deep_sources (std::set >& sources) +TriggerBox::deep_sources (std::set >& sources) { Glib::Threads::RWLock::ReaderLock lm (trigger_lock); for (uint64_t n = 0; n < all_triggers.size(); ++n) { - boost::shared_ptr r (trigger(n)->region ()); + std::shared_ptr r (trigger(n)->region ()); if (r) { r->deep_sources (sources); } @@ -3568,12 +3566,12 @@ TriggerBox::deep_sources (std::set >& sources) } void -TriggerBox::used_regions (std::set >& regions) +TriggerBox::used_regions (std::set >& regions) { Glib::Threads::RWLock::ReaderLock lm (trigger_lock); for (uint64_t n = 0; n < all_triggers.size(); ++n) { - boost::shared_ptr r (trigger(n)->region ()); + std::shared_ptr r (trigger(n)->region ()); if (r) { regions.insert (r); } @@ -3582,13 +3580,13 @@ TriggerBox::used_regions (std::set >& regions) void -TriggerBox::enqueue_trigger_state_for_region (boost::shared_ptr region, boost::shared_ptr state) +TriggerBox::enqueue_trigger_state_for_region (std::shared_ptr region, std::shared_ptr state) { enqueued_state_map.insert (std::make_pair(region, state)); } void -TriggerBox::set_from_selection (uint32_t slot, boost::shared_ptr region) +TriggerBox::set_from_selection (uint32_t slot, std::shared_ptr region) { DEBUG_TRACE (DEBUG::Triggers, string_compose ("load %1 into %2\n", region->name(), slot)); @@ -3653,7 +3651,7 @@ TriggerBox::set_from_path (uint32_t slot, std::string const & path) plist.add (Properties::layer, 0); plist.add (Properties::layering_index, 0); - boost::shared_ptr the_region (RegionFactory::create (src_list, plist, true)); + std::shared_ptr the_region (RegionFactory::create (src_list, plist, true)); all_triggers[slot]->set_region (the_region); @@ -3677,7 +3675,7 @@ void TriggerBox::clear_all_triggers () { for (uint64_t n = 0; n < all_triggers.size(); ++n) { - all_triggers[n]->set_region (boost::shared_ptr()); + all_triggers[n]->set_region (std::shared_ptr()); } } @@ -4404,7 +4402,7 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp pframes_t frames_covered; - boost::shared_ptr ar = boost::dynamic_pointer_cast (_currently_playing->region()); + std::shared_ptr ar = std::dynamic_pointer_cast (_currently_playing->region()); if (ar) { max_chans = std::max (ar->n_channels(), max_chans); } @@ -4919,7 +4917,7 @@ TriggerBoxThread::Request::init_pool () } void -TriggerBoxThread::set_region (TriggerBox& box, uint32_t slot, boost::shared_ptr r) +TriggerBoxThread::set_region (TriggerBox& box, uint32_t slot, std::shared_ptr r) { TriggerBoxThread::Request* req = new TriggerBoxThread::Request (TriggerBoxThread::SetRegion); diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc index c61aa1e979..57eeb20d0a 100644 --- a/libs/ardour/vca.cc +++ b/libs/ardour/vca.cc @@ -72,7 +72,7 @@ VCA::VCA (Session& s, int32_t num, const string& name) : Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA)) , Muteable (s, name) , _number (num) - , _gain_control (new GainControl (s, Evoral::Parameter (GainAutomation), boost::shared_ptr ())) + , _gain_control (new GainControl (s, Evoral::Parameter (GainAutomation), std::shared_ptr ())) { } @@ -95,7 +95,7 @@ VCA::~VCA () { Glib::Threads::Mutex::Lock lm (_control_lock); for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { - boost::dynamic_pointer_cast(li->second)->drop_references (); + std::dynamic_pointer_cast(li->second)->drop_references (); } } { @@ -198,7 +198,7 @@ VCA::slaved () const } bool -VCA::slaved_to (boost::shared_ptr vca) const +VCA::slaved_to (std::shared_ptr vca) const { if (!vca || !_gain_control) { return false; @@ -210,7 +210,7 @@ VCA::slaved_to (boost::shared_ptr vca) const } void -VCA::assign (boost::shared_ptr v) +VCA::assign (std::shared_ptr v) { /* prevent recursive assignments */ if (assigned_to (_session.vca_manager_ptr (), v)) { diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc index cdfaf04b54..2b6754b1af 100644 --- a/libs/ardour/vca_manager.cc +++ b/libs/ardour/vca_manager.cc @@ -99,7 +99,7 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template) replace_all (name, "%n", sn); } - boost::shared_ptr vca = boost::shared_ptr (new VCA (_session, num, name)); + std::shared_ptr vca = std::shared_ptr (new VCA (_session, num, name)); BOOST_MARK_VCA (vca); vca->init (); @@ -122,7 +122,7 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template) } void -VCAManager::remove_vca (boost::shared_ptr vca) +VCAManager::remove_vca (std::shared_ptr vca) { { Mutex::Lock lm (lock); @@ -142,7 +142,7 @@ VCAManager::remove_vca (boost::shared_ptr vca) _session.set_dirty (); } -boost::shared_ptr +std::shared_ptr VCAManager::vca_by_number (int32_t n) const { Mutex::Lock lm (lock); @@ -153,10 +153,10 @@ VCAManager::vca_by_number (int32_t n) const } } - return boost::shared_ptr(); + return std::shared_ptr(); } -boost::shared_ptr +std::shared_ptr VCAManager::vca_by_name (std::string const& name) const { Mutex::Lock lm (lock); @@ -167,7 +167,7 @@ VCAManager::vca_by_name (std::string const& name) const } } - return boost::shared_ptr(); + return std::shared_ptr(); } XMLNode& @@ -200,7 +200,7 @@ VCAManager::set_state (XMLNode const& node, int version) for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == VCA::xml_node_name) { - boost::shared_ptr vca = boost::shared_ptr (new VCA (_session, 0, X_("tobereset"))); + std::shared_ptr vca = std::shared_ptr (new VCA (_session, 0, X_("tobereset"))); BOOST_MARK_VCA (vca); if (vca->init() || vca->set_state (**i, version)) { diff --git a/libs/ardour/vst3_module.cc b/libs/ardour/vst3_module.cc index f954d28910..0d3402f3f1 100644 --- a/libs/ardour/vst3_module.cc +++ b/libs/ardour/vst3_module.cc @@ -245,14 +245,14 @@ VST3PluginModule::release_factory () } } -boost::shared_ptr +std::shared_ptr VST3PluginModule::load (std::string const& path) { #ifdef __APPLE__ - return boost::shared_ptr (new VST3MacModule (path)); + return std::shared_ptr (new VST3MacModule (path)); #elif defined PLATFORM_WINDOWS - return boost::shared_ptr (new VST3WindowsModule (path)); + return std::shared_ptr (new VST3WindowsModule (path)); #else - return boost::shared_ptr (new VST3LinuxModule (path)); + return std::shared_ptr (new VST3LinuxModule (path)); #endif } diff --git a/libs/ardour/vst3_plugin.cc b/libs/ardour/vst3_plugin.cc index 1fa855d82b..6630a35cbd 100644 --- a/libs/ardour/vst3_plugin.cc +++ b/libs/ardour/vst3_plugin.cc @@ -66,7 +66,7 @@ VST3Plugin::VST3Plugin (const VST3Plugin& other) : Plugin (other) , _parameter_queue (128 + other.parameter_count ()) { - boost::shared_ptr nfo = boost::dynamic_pointer_cast (other.get_info ()); + std::shared_ptr nfo = std::dynamic_pointer_cast (other.get_info ()); _plug = new VST3PI (nfo->m, nfo->unique_id); init (); @@ -231,12 +231,12 @@ VST3Plugin::designated_bypass_port () } void -VST3Plugin::set_automation_control (uint32_t port, boost::shared_ptr ac) +VST3Plugin::set_automation_control (uint32_t port, std::shared_ptr ac) { if (!ac->alist () || !_plug->subscribe_to_automation_changes ()) { return; } - ac->alist ()->automation_state_changed.connect_same_thread (_connections, boost::bind (&VST3PI::automation_state_changed, _plug, port, _1, boost::weak_ptr (ac->alist ()))); + ac->alist ()->automation_state_changed.connect_same_thread (_connections, boost::bind (&VST3PI::automation_state_changed, _plug, port, _1, std::weak_ptr (ac->alist ()))); } std::set @@ -673,18 +673,18 @@ VST3Plugin::plugin_latency () const } void -VST3Plugin::add_slave (boost::shared_ptr p, bool rt) +VST3Plugin::add_slave (std::shared_ptr p, bool rt) { - boost::shared_ptr vst = boost::dynamic_pointer_cast (p); + std::shared_ptr vst = std::dynamic_pointer_cast (p); if (vst) { _plug->add_slave (vst->_plug->controller (), rt); } } void -VST3Plugin::remove_slave (boost::shared_ptr p) +VST3Plugin::remove_slave (std::shared_ptr p) { - boost::shared_ptr vst = boost::dynamic_pointer_cast (p); + std::shared_ptr vst = std::dynamic_pointer_cast (p); if (vst) { _plug->remove_slave (vst->_plug->controller ()); } @@ -896,8 +896,10 @@ VST3Plugin::load_preset (PresetRecord r) std::string VST3Plugin::do_save_preset (std::string name) { - boost::shared_ptr nfo = boost::dynamic_pointer_cast (get_info ()); + + std::shared_ptr nfo = std::dynamic_pointer_cast (get_info ()); PBD::Searchpath psp = nfo->preset_search_path (); + assert (!psp.empty ()); std::string dir = psp.front (); @@ -928,8 +930,9 @@ VST3Plugin::do_save_preset (std::string name) void VST3Plugin::do_remove_preset (std::string name) { - boost::shared_ptr nfo = boost::dynamic_pointer_cast (get_info ()); + std::shared_ptr nfo = std::dynamic_pointer_cast (get_info ()); PBD::Searchpath psp = nfo->preset_search_path (); + assert (!psp.empty ()); std::string dir = psp.front (); @@ -1018,7 +1021,8 @@ VST3Plugin::find_presets () // TODO check _plug->unit_data() // IUnitData: programDataSupported -> setUnitProgramData (IBStream) - boost::shared_ptr info = boost::dynamic_pointer_cast (get_info ()); + + std::shared_ptr info = std::dynamic_pointer_cast (get_info ()); PBD::Searchpath psp = info->preset_search_path (); std::vector preset_files; @@ -1142,7 +1146,7 @@ VST3PluginInfo::preset_search_path () const /* ****************************************************************************/ -VST3PI::VST3PI (boost::shared_ptr m, std::string unique_id) +VST3PI::VST3PI (std::shared_ptr m, std::string unique_id) : _module (m) , _component (0) , _controller (0) @@ -1406,8 +1410,8 @@ VST3PI::connect_components () return true; } - _component_cproxy = boost::shared_ptr (new ConnectionProxy (componentCP)); - _controller_cproxy = boost::shared_ptr (new ConnectionProxy (controllerCP)); + _component_cproxy = std::shared_ptr (new ConnectionProxy (componentCP)); + _controller_cproxy = std::shared_ptr (new ConnectionProxy (controllerCP)); tresult res = _component_cproxy->connect (controllerCP); if (!(res == kResultOk || res == kNotImplemented)) { @@ -2638,10 +2642,10 @@ VST3PI::subscribe_to_automation_changes () const } void -VST3PI::automation_state_changed (uint32_t port, AutoState s, boost::weak_ptr wal) +VST3PI::automation_state_changed (uint32_t port, AutoState s, std::weak_ptr wal) { Vst::ParamID id (index_to_id (port)); - boost::shared_ptr al = wal.lock (); + std::shared_ptr al = wal.lock (); FUnknownPtr extra_ctrl (_controller); assert (extra_ctrl); @@ -2674,12 +2678,12 @@ VST3PI::automation_state_changed (uint32_t port, AutoState s, boost::weak_ptr +static std::shared_ptr lookup_ac (SessionObject* o, FIDString id) { Stripable* s = dynamic_cast (o); if (!s) { - return boost::shared_ptr (); + return std::shared_ptr (); } if (0 == strcmp (id, ContextInfo::kMute)) { @@ -2713,7 +2717,7 @@ lookup_ac (SessionObject* o, FIDString id) } #endif } - return boost::shared_ptr (); + return std::shared_ptr (); } tresult @@ -2750,7 +2754,7 @@ VST3PI::getContextInfoValue (int32& value, FIDString id) } else if (0 == strcmp (id, ContextInfo::kSelected)) { value = s->is_selected () ? 1 : 0; } else if (0 == strcmp (id, ContextInfo::kFocused)) { - boost::shared_ptr stripable = s->session ().selection ().first_selected_stripable (); + std::shared_ptr stripable = s->session ().selection ().first_selected_stripable (); value = stripable && stripable.get () == s ? 1 : 0; } else if (0 == strcmp (id, ContextInfo::kSendCount)) { value = 0; @@ -2758,7 +2762,7 @@ VST3PI::getContextInfoValue (int32& value, FIDString id) ++value; } } else if (0 == strcmp (id, ContextInfo::kMute)) { - boost::shared_ptr ac = s->mute_control (); + std::shared_ptr ac = s->mute_control (); if (ac) { psl_subscribe_to (ac, id); value = ac->muted_by_self (); @@ -2766,7 +2770,7 @@ VST3PI::getContextInfoValue (int32& value, FIDString id) value = 0; } } else if (0 == strcmp (id, ContextInfo::kSolo)) { - boost::shared_ptr ac = s->solo_control (); + std::shared_ptr ac = s->solo_control (); if (ac) { psl_subscribe_to (ac, id); value = ac->self_soloed (); @@ -2808,7 +2812,7 @@ VST3PI::getContextInfoString (Vst::TChar* string, int32 max_len, FIDString id) DEBUG_TRACE (DEBUG::VST3Callbacks, string_compose ("VST3PI::setContextInfoString: NOT IMPLEMENTED (%1)\n", id)); return kNotImplemented; // XXX TODO } else { - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (!ac) { DEBUG_TRACE (DEBUG::VST3Callbacks, string_compose ("VST3PI::getContextInfoString unsupported ID %1\n", id)); return kInvalidArgument; @@ -2837,11 +2841,11 @@ VST3PI::getContextInfoValue (double& value, FIDString id) #endif value = 2.0; // Config->get_max_gain(); } else if (0 == strcmp (id, ContextInfo::kVolume)) { - boost::shared_ptr ac = s->gain_control (); + std::shared_ptr ac = s->gain_control (); value = ac->get_value (); // gain coefficient 0..2 (1.0 = 0dB) psl_subscribe_to (ac, id); } else if (0 == strcmp (id, ContextInfo::kPan)) { - boost::shared_ptr ac = s->pan_azimuth_control (); + std::shared_ptr ac = s->pan_azimuth_control (); if (ac) { value = ac->internal_to_interface (ac->get_value (), true); psl_subscribe_to (ac, id); @@ -2849,7 +2853,7 @@ VST3PI::getContextInfoValue (double& value, FIDString id) value = 0.5; // center } } else if (0 == strncmp (id, ContextInfo::kSendLevel, strlen (ContextInfo::kSendLevel))) { - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (ac) { value = ac->get_value (); // gain cofficient psl_subscribe_to (ac, id); @@ -2874,15 +2878,15 @@ VST3PI::setContextInfoValue (FIDString id, double value) } DEBUG_TRACE (DEBUG::VST3Callbacks, string_compose ("VST3PI::setContextInfoValue %1 to %2\n", id, value)); if (0 == strcmp (id, ContextInfo::kVolume)) { - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); ac->set_value (value, Controllable::NoGroup); } else if (0 == strcmp (id, ContextInfo::kPan)) { - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (ac) { ac->set_value (ac->interface_to_internal (value, true), PBD::Controllable::NoGroup); } } else if (0 == strncmp (id, ContextInfo::kSendLevel, strlen (ContextInfo::kSendLevel))) { - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (ac) { ac->set_value (value, Controllable::NoGroup); } else { @@ -2910,14 +2914,14 @@ VST3PI::setContextInfoValue (FIDString id, int32 value) #endif s->presentation_info ().set_color (value); } else if (0 == strcmp (id, ContextInfo::kSelected)) { - boost::shared_ptr stripable = s->session ().stripable_by_id (s->id ()); + std::shared_ptr stripable = s->session ().stripable_by_id (s->id ()); assert (stripable); if (value == 0) { - s->session ().selection ().remove (stripable, boost::shared_ptr ()); + s->session ().selection ().remove (stripable, std::shared_ptr ()); } else if (_add_to_selection) { - s->session ().selection ().add (stripable, boost::shared_ptr ()); + s->session ().selection ().add (stripable, std::shared_ptr ()); } else { - s->session ().selection ().set (stripable, boost::shared_ptr ()); + s->session ().selection ().set (stripable, std::shared_ptr ()); } } else if (0 == strcmp (id, ContextInfo::kMultiSelect)) { _add_to_selection = value != 0; @@ -2954,7 +2958,7 @@ VST3PI::beginEditContextInfoValue (FIDString id) DEBUG_TRACE (DEBUG::VST3Callbacks, "VST3PI::beginEditContextInfoValue: not initialized"); return kNotInitialized; } - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (!ac) { return kInvalidArgument; } @@ -2970,7 +2974,7 @@ VST3PI::endEditContextInfoValue (FIDString id) DEBUG_TRACE (DEBUG::VST3Callbacks, "VST3PI::endEditContextInfoValue: not initialized"); return kNotInitialized; } - boost::shared_ptr ac = lookup_ac (_owner, id); + std::shared_ptr ac = lookup_ac (_owner, id); if (!ac) { return kInvalidArgument; } @@ -2980,7 +2984,7 @@ VST3PI::endEditContextInfoValue (FIDString id) } void -VST3PI::psl_subscribe_to (boost::shared_ptr ac, FIDString id) +VST3PI::psl_subscribe_to (std::shared_ptr ac, FIDString id) { FUnknownPtr nfo2 (_controller); if (!nfo2) { diff --git a/libs/ardour/vst3_scan.cc b/libs/ardour/vst3_scan.cc index f1a0c94952..d55a230c78 100644 --- a/libs/ardour/vst3_scan.cc +++ b/libs/ardour/vst3_scan.cc @@ -108,7 +108,7 @@ count_channels (Vst::IComponent* c, Vst::MediaType media, Vst::BusDirection dir, } static bool -discover_vst3 (boost::shared_ptr m, std::vector& rv, bool verbose) +discover_vst3 (std::shared_ptr m, std::vector& rv, bool verbose) { using namespace std; using namespace ARDOUR; @@ -473,7 +473,7 @@ ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& root->set_property ("module", module_path); try { - boost::shared_ptr m = VST3PluginModule::load (module_path); + std::shared_ptr m = VST3PluginModule::load (module_path); std::vector nfo; if (!discover_vst3 (m, nfo, verbose)) { delete root; diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index 4f28b6f814..359e05ecd8 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -482,7 +482,7 @@ VSTPlugin::load_user_preset (PresetRecord r) non-direct-dispatch thing. */ - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return false; } @@ -555,7 +555,7 @@ VSTPlugin::load_user_preset (PresetRecord r) string VSTPlugin::do_save_preset (string name) { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return ""; } @@ -619,7 +619,7 @@ VSTPlugin::do_save_preset (string name) void VSTPlugin::do_remove_preset (string name) { - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t == 0) { return; } @@ -888,7 +888,7 @@ VSTPlugin::find_presets () /* User presets from our XML file */ - boost::shared_ptr t (presets_tree ()); + std::shared_ptr t (presets_tree ()); if (t) { XMLNode* root = t->root (); diff --git a/libs/audiographer/audiographer/general/deinterleaver.h b/libs/audiographer/audiographer/general/deinterleaver.h index 491c07fcb6..63ab49a729 100644 --- a/libs/audiographer/audiographer/general/deinterleaver.h +++ b/libs/audiographer/audiographer/general/deinterleaver.h @@ -20,7 +20,7 @@ class /*LIBAUDIOGRAPHER_API*/ DeInterleaver , public Throwing<> { private: - typedef boost::shared_ptr > OutputPtr; + typedef std::shared_ptr > OutputPtr; public: /// Constructor. \n RT safe @@ -32,7 +32,7 @@ class /*LIBAUDIOGRAPHER_API*/ DeInterleaver ~DeInterleaver() { reset(); } - typedef boost::shared_ptr > SourcePtr; + typedef std::shared_ptr > SourcePtr; /// Inits the deinterleaver. Must be called before using. \n Not RT safe void init (unsigned int num_channels, samplecnt_t max_samples_per_channel) diff --git a/libs/audiographer/audiographer/general/interleaver.h b/libs/audiographer/audiographer/general/interleaver.h index 7ea1be1ab8..e18b51f1e0 100644 --- a/libs/audiographer/audiographer/general/interleaver.h +++ b/libs/audiographer/audiographer/general/interleaver.h @@ -54,7 +54,7 @@ class /*LIBAUDIOGRAPHER_API*/ Interleaver throw Exception (*this, "Channel out of range"); } - return boost::static_pointer_cast > (inputs[channel]); + return std::static_pointer_cast > (inputs[channel]); } private: @@ -140,7 +140,7 @@ class /*LIBAUDIOGRAPHER_API*/ Interleaver return ready_samples * channels; } - typedef boost::shared_ptr InputPtr; + typedef std::shared_ptr InputPtr; std::vector inputs; unsigned int channels; diff --git a/libs/audiographer/audiographer/general/threader.h b/libs/audiographer/audiographer/general/threader.h index 9ef579276e..db5703ce4a 100644 --- a/libs/audiographer/audiographer/general/threader.h +++ b/libs/audiographer/audiographer/general/threader.h @@ -128,7 +128,7 @@ class /*LIBAUDIOGRAPHER_API*/ Threader : public Source, public Sink long wait_timeout; Glib::Threads::Mutex exception_mutex; - boost::shared_ptr exception; + std::shared_ptr exception; }; diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h index b03f08eb80..dba2a89b56 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h @@ -27,7 +27,7 @@ class SndfileWriter , public FlagDebuggable<> { public: - SndfileWriter (std::string const & path, int format, ChannelCount channels, samplecnt_t samplerate, boost::shared_ptr broadcast_info) + SndfileWriter (std::string const & path, int format, ChannelCount channels, samplecnt_t samplerate, std::shared_ptr broadcast_info) : SndfileHandle (path, Write, format, channels, samplerate) , path (path) { diff --git a/libs/audiographer/audiographer/source.h b/libs/audiographer/audiographer/source.h index 6c78b487e8..d59f74e100 100644 --- a/libs/audiographer/audiographer/source.h +++ b/libs/audiographer/audiographer/source.h @@ -20,7 +20,7 @@ class LIBAUDIOGRAPHER_API Source public: virtual ~Source () { } - typedef boost::shared_ptr > SinkPtr; + typedef std::shared_ptr > SinkPtr; /// Adds an output to this source. All data generated is forwarded to \a output virtual void add_output (SinkPtr output) = 0; diff --git a/libs/audiographer/tests/general/chunker_test.cc b/libs/audiographer/tests/general/chunker_test.cc index b7896e23e6..05918a7458 100644 --- a/libs/audiographer/tests/general/chunker_test.cc +++ b/libs/audiographer/tests/general/chunker_test.cc @@ -139,7 +139,7 @@ class ChunkerTest : public CppUnit::TestFixture void testEndOfInputFlagHandling() { - boost::shared_ptr > grabber(new ProcessContextGrabber()); + std::shared_ptr > grabber(new ProcessContextGrabber()); assert (samples % 2 == 0); chunker.reset (new Chunker(samples)); @@ -168,8 +168,8 @@ class ChunkerTest : public CppUnit::TestFixture } private: - boost::shared_ptr > chunker; - boost::shared_ptr > sink; + std::shared_ptr > chunker; + std::shared_ptr > sink; float * random_data; samplecnt_t samples; diff --git a/libs/audiographer/tests/general/deinterleaver_test.cc b/libs/audiographer/tests/general/deinterleaver_test.cc index 66d5362d80..4413babd55 100644 --- a/libs/audiographer/tests/general/deinterleaver_test.cc +++ b/libs/audiographer/tests/general/deinterleaver_test.cc @@ -113,11 +113,11 @@ class DeInterleaverTest : public CppUnit::TestFixture private: - boost::shared_ptr > deinterleaver; + std::shared_ptr > deinterleaver; - boost::shared_ptr > sink_a; - boost::shared_ptr > sink_b; - boost::shared_ptr > sink_c; + std::shared_ptr > sink_a; + std::shared_ptr > sink_b; + std::shared_ptr > sink_c; float * random_data; samplecnt_t samples_per_channel; diff --git a/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc b/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc index b16a47a795..5bafb86a24 100644 --- a/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc +++ b/libs/audiographer/tests/general/interleaver_deinterleaver_test.cc @@ -97,12 +97,12 @@ class InterleaverDeInterleaverTest : public CppUnit::TestFixture } private: - boost::shared_ptr > interleaver; - boost::shared_ptr > deinterleaver; + std::shared_ptr > interleaver; + std::shared_ptr > deinterleaver; - boost::shared_ptr > sink_a; - boost::shared_ptr > sink_b; - boost::shared_ptr > sink_c; + std::shared_ptr > sink_a; + std::shared_ptr > sink_b; + std::shared_ptr > sink_c; float * random_data_a; float * random_data_b; diff --git a/libs/audiographer/tests/general/interleaver_test.cc b/libs/audiographer/tests/general/interleaver_test.cc index 7adc0387a8..566c5d78ff 100644 --- a/libs/audiographer/tests/general/interleaver_test.cc +++ b/libs/audiographer/tests/general/interleaver_test.cc @@ -115,9 +115,9 @@ class InterleaverTest : public CppUnit::TestFixture private: - boost::shared_ptr > interleaver; + std::shared_ptr > interleaver; - boost::shared_ptr > sink; + std::shared_ptr > sink; samplecnt_t channels; float * random_data; diff --git a/libs/audiographer/tests/general/normalizer_test.cc b/libs/audiographer/tests/general/normalizer_test.cc index c06330557b..c886d83626 100644 --- a/libs/audiographer/tests/general/normalizer_test.cc +++ b/libs/audiographer/tests/general/normalizer_test.cc @@ -48,9 +48,9 @@ class NormalizerTest : public CppUnit::TestFixture } private: - boost::shared_ptr normalizer; - boost::shared_ptr peak_reader; - boost::shared_ptr > sink; + std::shared_ptr normalizer; + std::shared_ptr peak_reader; + std::shared_ptr > sink; float * random_data; samplecnt_t samples; diff --git a/libs/audiographer/tests/general/peak_reader_test.cc b/libs/audiographer/tests/general/peak_reader_test.cc index b5f7a6dad1..91052340eb 100644 --- a/libs/audiographer/tests/general/peak_reader_test.cc +++ b/libs/audiographer/tests/general/peak_reader_test.cc @@ -45,7 +45,7 @@ class PeakReaderTest : public CppUnit::TestFixture } private: - boost::shared_ptr reader; + std::shared_ptr reader; float * random_data; samplecnt_t samples; diff --git a/libs/audiographer/tests/general/sample_format_converter_test.cc b/libs/audiographer/tests/general/sample_format_converter_test.cc index 92a559aa33..fe8c11b291 100644 --- a/libs/audiographer/tests/general/sample_format_converter_test.cc +++ b/libs/audiographer/tests/general/sample_format_converter_test.cc @@ -32,7 +32,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testInit() { // Float never uses dithering and should always use full 32 bits of data - boost::shared_ptr > f_converter (new SampleFormatConverter(1)); + std::shared_ptr > f_converter (new SampleFormatConverter(1)); f_converter->init (samples, D_Tri, 32); // Doesn't throw CPPUNIT_ASSERT_THROW (f_converter->init (samples, D_Tri, 24), Exception); CPPUNIT_ASSERT_THROW (f_converter->init (samples, D_Tri, 48), Exception); @@ -40,20 +40,20 @@ class SampleFormatConverterTest : public CppUnit::TestFixture /* Test that too large data widths throw. We are fine with unnecessarily narrow data widths */ - boost::shared_ptr > i_converter (new SampleFormatConverter(1)); + std::shared_ptr > i_converter (new SampleFormatConverter(1)); i_converter->init (samples, D_Tri, 32); // Doesn't throw i_converter->init (samples, D_Tri, 24); // Doesn't throw i_converter->init (samples, D_Tri, 8); // Doesn't throw i_converter->init (samples, D_Tri, 16); // Doesn't throw CPPUNIT_ASSERT_THROW (i_converter->init (samples, D_Tri, 48), Exception); - boost::shared_ptr > i16_converter (new SampleFormatConverter(1)); + std::shared_ptr > i16_converter (new SampleFormatConverter(1)); i16_converter->init (samples, D_Tri, 16); // Doesn't throw i16_converter->init (samples, D_Tri, 8); // Doesn't throw CPPUNIT_ASSERT_THROW (i16_converter->init (samples, D_Tri, 32), Exception); CPPUNIT_ASSERT_THROW (i16_converter->init (samples, D_Tri, 48), Exception); - boost::shared_ptr > ui_converter (new SampleFormatConverter(1)); + std::shared_ptr > ui_converter (new SampleFormatConverter(1)); ui_converter->init (samples, D_Tri, 8); // Doesn't throw ui_converter->init (samples, D_Tri, 4); // Doesn't throw CPPUNIT_ASSERT_THROW (ui_converter->init (samples, D_Tri, 16), Exception); @@ -61,8 +61,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testFrameCount() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); converter->init (samples, D_Tri, 32); converter->add_output (sink); @@ -90,8 +90,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testFloat() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 32); @@ -123,8 +123,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testInt32() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 32); @@ -139,8 +139,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testInt24() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 24); @@ -155,8 +155,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testInt16() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 16); @@ -171,8 +171,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testUint8() { - boost::shared_ptr > converter (new SampleFormatConverter(1)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(1)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 8); @@ -187,8 +187,8 @@ class SampleFormatConverterTest : public CppUnit::TestFixture void testChannelCount() { - boost::shared_ptr > converter (new SampleFormatConverter(3)); - boost::shared_ptr > sink (new VectorSink()); + std::shared_ptr > converter (new SampleFormatConverter(3)); + std::shared_ptr > sink (new VectorSink()); samplecnt_t samples_output = 0; converter->init(samples, D_Tri, 32); diff --git a/libs/audiographer/tests/general/silence_trimmer_test.cc b/libs/audiographer/tests/general/silence_trimmer_test.cc index c6662c92de..8f0a2c7541 100644 --- a/libs/audiographer/tests/general/silence_trimmer_test.cc +++ b/libs/audiographer/tests/general/silence_trimmer_test.cc @@ -168,8 +168,8 @@ class SilenceTrimmerTest : public CppUnit::TestFixture } private: - boost::shared_ptr > trimmer; - boost::shared_ptr > sink; + std::shared_ptr > trimmer; + std::shared_ptr > sink; float * random_data; float * zero_data; diff --git a/libs/audiographer/tests/general/sr_converter_test.cc b/libs/audiographer/tests/general/sr_converter_test.cc index b2b7193ff6..40e6081a22 100644 --- a/libs/audiographer/tests/general/sr_converter_test.cc +++ b/libs/audiographer/tests/general/sr_converter_test.cc @@ -118,9 +118,9 @@ class SampleRateConverterTest : public CppUnit::TestFixture private: - boost::shared_ptr converter; - boost::shared_ptr > sink; - boost::shared_ptr > grabber; + std::shared_ptr converter; + std::shared_ptr > sink; + std::shared_ptr > grabber; float * random_data; samplecnt_t samples; diff --git a/libs/audiographer/tests/general/threader_test.cc b/libs/audiographer/tests/general/threader_test.cc index 8662d61a30..94bcd75962 100644 --- a/libs/audiographer/tests/general/threader_test.cc +++ b/libs/audiographer/tests/general/threader_test.cc @@ -137,15 +137,15 @@ class ThreaderTest : public CppUnit::TestFixture private: Glib::ThreadPool * thread_pool; - boost::shared_ptr > threader; - boost::shared_ptr > sink_a; - boost::shared_ptr > sink_b; - boost::shared_ptr > sink_c; - boost::shared_ptr > sink_d; - boost::shared_ptr > sink_e; - boost::shared_ptr > sink_f; + std::shared_ptr > threader; + std::shared_ptr > sink_a; + std::shared_ptr > sink_b; + std::shared_ptr > sink_c; + std::shared_ptr > sink_d; + std::shared_ptr > sink_e; + std::shared_ptr > sink_f; - boost::shared_ptr > throwing_sink; + std::shared_ptr > throwing_sink; float * random_data; float * zero_data; diff --git a/libs/audiographer/tests/sndfile/tmp_file_test.cc b/libs/audiographer/tests/sndfile/tmp_file_test.cc index 0d62796a02..e87aba6ca5 100644 --- a/libs/audiographer/tests/sndfile/tmp_file_test.cc +++ b/libs/audiographer/tests/sndfile/tmp_file_test.cc @@ -37,7 +37,7 @@ class TmpFileTest : public CppUnit::TestFixture } private: - boost::shared_ptr > file; + std::shared_ptr > file; float * random_data; samplecnt_t samples; diff --git a/libs/audiographer/tests/utils/identity_vertex_test.cc b/libs/audiographer/tests/utils/identity_vertex_test.cc index 81c4e498f2..40c5709f05 100644 --- a/libs/audiographer/tests/utils/identity_vertex_test.cc +++ b/libs/audiographer/tests/utils/identity_vertex_test.cc @@ -87,9 +87,9 @@ class IdentityVertexTest : public CppUnit::TestFixture } private: - boost::shared_ptr > vertex; - boost::shared_ptr > sink_a; - boost::shared_ptr > sink_b; + std::shared_ptr > vertex; + std::shared_ptr > sink_a; + std::shared_ptr > sink_b; float * random_data; float * zero_data; diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 9855f953ce..525f580846 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -1309,7 +1309,7 @@ AlsaAudioBackend::register_system_audio_ports () if (!p) return -1; set_latency_range (p, false, lr); - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + BackendPortPtr ap = std::dynamic_pointer_cast (p); ap->set_hw_port_name (string_compose (_("Main In %1"), i)); _system_inputs.push_back (ap); } @@ -1322,7 +1322,7 @@ AlsaAudioBackend::register_system_audio_ports () if (!p) return -1; set_latency_range (p, true, lr); - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + BackendPortPtr ap = std::dynamic_pointer_cast (p); if (a_out == 2) { ap->set_hw_port_name (i == 1 ? _("Out Left") : _("Out Right")); } else { @@ -1588,8 +1588,8 @@ AlsaAudioBackend::register_system_midi_ports (const std::string device) LatencyRange lr; lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_output_latency); set_latency_range (p, true, lr); - boost::dynamic_pointer_cast (p)->set_n_periods (_periods_per_cycle); // TODO check MIDI alignment - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + std::dynamic_pointer_cast (p)->set_n_periods (_periods_per_cycle); // TODO check MIDI alignment + BackendPortPtr ap = std::dynamic_pointer_cast (p); ap->set_hw_port_name (replace_name_io (i->first, false)); pthread_mutex_lock (&_device_port_mutex); _system_midi_out.push_back (ap); @@ -1632,7 +1632,7 @@ AlsaAudioBackend::register_system_midi_ports (const std::string device) LatencyRange lr; lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_input_latency); set_latency_range (p, false, lr); - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + BackendPortPtr ap = std::dynamic_pointer_cast (p); ap->set_hw_port_name (replace_name_io (i->first, true)); pthread_mutex_lock (&_device_port_mutex); _system_midi_in.push_back (ap); @@ -1733,7 +1733,7 @@ bool void AlsaAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool for_playback, LatencyRange latency_range) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { DEBUG_TRACE (PBD::DEBUG::BackendPorts, "AlsaPort::set_latency_range (): invalid port."); return; @@ -1744,7 +1744,7 @@ AlsaAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool fo LatencyRange AlsaAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool for_playback) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); LatencyRange r; if (!valid_port (port)) { @@ -1794,7 +1794,7 @@ AlsaAudioBackend::port_factory (std::string const& name, ARDOUR::DataType type, void* AlsaAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nframes) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); assert (port); return port->get_buffer (nframes); } @@ -1936,7 +1936,7 @@ AlsaAudioBackend::main_process_thread () } i = 0; for (std::vector::const_iterator it = (*s)->inputs.begin (); it != (*s)->inputs.end (); ++it, ++i) { - (*s)->capt_chan (i, (float*)(boost::dynamic_pointer_cast (*it)->get_buffer (_samples_per_period)), _samples_per_period); + (*s)->capt_chan (i, (float*)(std::dynamic_pointer_cast (*it)->get_buffer (_samples_per_period)), _samples_per_period); } } @@ -1975,14 +1975,14 @@ AlsaAudioBackend::main_process_thread () /* only used when adding/removing MIDI device/system ports */ pthread_mutex_lock (&_device_port_mutex); for (std::vector::iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) { - boost::dynamic_pointer_cast (*it)->next_period (); + std::dynamic_pointer_cast (*it)->next_period (); } /* queue outgoing midi */ i = 0; for (std::vector::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { assert (_rmidi_out.size () > i); - AlsaMidiBuffer const* src = boost::dynamic_pointer_cast (*it)->const_buffer (); + AlsaMidiBuffer const* src = std::dynamic_pointer_cast (*it)->const_buffer (); AlsaMidiOut* rm = _rmidi_out.at (i); rm->sync_time (clock1); for (AlsaMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { @@ -2151,7 +2151,7 @@ AlsaAudioBackend::add_slave (const char* device, if (!p) { goto errout; } - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + BackendPortPtr ap = std::dynamic_pointer_cast (p); ap->set_hw_port_name (string_compose (_("Aux In %1"), n)); s->inputs.push_back (ap); } @@ -2170,7 +2170,7 @@ AlsaAudioBackend::add_slave (const char* device, if (!p) { goto errout; } - BackendPortPtr ap = boost::dynamic_pointer_cast (p); + BackendPortPtr ap = std::dynamic_pointer_cast (p); ap->set_hw_port_name (string_compose (_("Aux Out %1"), n)); s->outputs.push_back (ap); } @@ -2258,9 +2258,9 @@ AlsaAudioBackend::AudioSlave::update_latencies (uint32_t play, uint32_t capt) /******************************************************************************/ -static boost::shared_ptr _instance; +static std::shared_ptr _instance; -static boost::shared_ptr backend_factory (AudioEngine& e); +static std::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); @@ -2275,7 +2275,7 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& e) { if (!_instance) { @@ -2338,11 +2338,11 @@ AlsaAudioPort::get_buffer (pframes_t n_samples) if (it == connections.end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { - boost::shared_ptr source = boost::dynamic_pointer_cast (*it); + std::shared_ptr source = std::dynamic_pointer_cast (*it); assert (source && source->is_output ()); memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); while (++it != connections.end ()) { - source = boost::dynamic_pointer_cast (*it); + source = std::dynamic_pointer_cast (*it); assert (source && source->is_output ()); Sample* dst = buffer (); const Sample* src = source->const_buffer (); @@ -2388,7 +2388,7 @@ void* AlsaMidiPort::get_buffer (pframes_t /* nframes */) for (std::set::const_iterator i = connections.begin (); i != connections.end (); ++i) { - const AlsaMidiBuffer* src = boost::dynamic_pointer_cast (*i)->const_buffer (); + const AlsaMidiBuffer* src = std::dynamic_pointer_cast (*i)->const_buffer (); for (AlsaMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { (_buffer[_bufperiod]).push_back (*it); } diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 9138294854..7fd308f8df 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -985,7 +985,7 @@ CoreAudioBackend::register_system_audio_ports() PortPtr p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsOutput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, false, lr); - BackendPortPtr cp = boost::dynamic_pointer_cast(p); + BackendPortPtr cp = std::dynamic_pointer_cast(p); cp->set_hw_port_name (_pcmio->cached_port_name(i, true)); _system_inputs.push_back(cp); } @@ -997,7 +997,7 @@ CoreAudioBackend::register_system_audio_ports() PortPtr p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsInput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, true, lr); - BackendPortPtr cp = boost::dynamic_pointer_cast(p); + BackendPortPtr cp = std::dynamic_pointer_cast(p); cp->set_hw_port_name (_pcmio->cached_port_name(i, false)); _system_outputs.push_back(cp); } @@ -1069,7 +1069,7 @@ CoreAudioBackend::coremidi_rediscover() LatencyRange lr; lr.min = lr.max = _samples_per_period; // TODO add per-port midi-systemic latency set_latency_range (p, false, lr); - BackendPortPtr pp = boost::dynamic_pointer_cast(p); + BackendPortPtr pp = std::dynamic_pointer_cast(p); pp->set_hw_port_name(_midiio->port_name(i, true)); _system_midi_in.push_back(pp); g_atomic_int_set (&_port_change_flag, 1); @@ -1092,7 +1092,7 @@ CoreAudioBackend::coremidi_rediscover() LatencyRange lr; lr.min = lr.max = _samples_per_period; // TODO add per-port midi-systemic latency set_latency_range (p, false, lr); - BackendPortPtr pp = boost::dynamic_pointer_cast(p); + BackendPortPtr pp = std::dynamic_pointer_cast(p); pp->set_hw_port_name(_midiio->port_name(i, false)); _system_midi_out.push_back(pp); g_atomic_int_set (&_port_change_flag, 1); @@ -1215,7 +1215,7 @@ CoreAudioBackend::monitoring_input (PortEngine::PortHandle) void CoreAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool for_playback, LatencyRange latency_range) { - boost::shared_ptr port = boost::dynamic_pointer_cast (port_handle); + std::shared_ptr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { DEBUG_TRACE (PBD::DEBUG::BackendPorts, "BackendPort::set_latency_range (): invalid port."); return; @@ -1226,7 +1226,7 @@ CoreAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool fo LatencyRange CoreAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool for_playback) { - boost::shared_ptr port = boost::dynamic_pointer_cast (port_handle); + std::shared_ptr port = std::dynamic_pointer_cast (port_handle); LatencyRange r; if (!valid_port (port)) { DEBUG_TRACE (PBD::DEBUG::BackendPorts, "BackendPort::get_latency_range (): invalid port."); @@ -1254,7 +1254,7 @@ CoreAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool fo void* CoreAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nframes) { - boost::shared_ptr port = boost::dynamic_pointer_cast (port_handle); + std::shared_ptr port = std::dynamic_pointer_cast (port_handle); assert (port); return port->get_buffer (nframes); } @@ -1296,7 +1296,7 @@ void CoreAudioBackend::reset_midi_parsers () { for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it) { - boost::shared_ptr port = boost::dynamic_pointer_cast(*it); + std::shared_ptr port = std::dynamic_pointer_cast(*it); if (port) { port->reset_parser (); } @@ -1447,7 +1447,7 @@ CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t hos /* get midi */ i=0; for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++i) { - boost::shared_ptr port = boost::dynamic_pointer_cast (*it); + std::shared_ptr port = std::dynamic_pointer_cast (*it); if (!port) { continue; } @@ -1495,7 +1495,7 @@ CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t hos /* queue outgoing midi */ i = 0; for (std::vector::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { - const CoreMidiBuffer *src = boost::dynamic_pointer_cast(*it)->const_buffer(); + const CoreMidiBuffer *src = std::dynamic_pointer_cast(*it)->const_buffer(); for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { _midiio->send_event (i, mit->timestamp (), mit->data (), mit->size ()); } @@ -1573,9 +1573,9 @@ CoreAudioBackend::hw_changed_callback () /******************************************************************************/ -static boost::shared_ptr _instance; +static std::shared_ptr _instance; -static boost::shared_ptr backend_factory (AudioEngine& e); +static std::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); @@ -1590,7 +1590,7 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& e) { if (!_instance) { @@ -1653,11 +1653,11 @@ CoreAudioPort::get_buffer (pframes_t n_samples) if (it == connections.end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { - boost::shared_ptr source = boost::dynamic_pointer_cast(*it); + std::shared_ptr source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); while (++it != connections.end ()) { - source = boost::dynamic_pointer_cast(*it); + source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); Sample* dst = buffer (); const Sample* src = source->const_buffer (); @@ -1706,7 +1706,7 @@ void* CoreMidiPort::get_buffer (pframes_t /* nframes */) for (std::set::const_iterator i = connections.begin (); i != connections.end (); ++i) { - const CoreMidiBuffer * src = boost::dynamic_pointer_cast(*i)->const_buffer (); + const CoreMidiBuffer * src = std::dynamic_pointer_cast(*i)->const_buffer (); for (CoreMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { (_buffer[_bufperiod]).push_back (*it); } diff --git a/libs/backends/coreaudio/coremidi_io.cc b/libs/backends/coreaudio/coremidi_io.cc index 338613e02a..df65dca4ee 100644 --- a/libs/backends/coreaudio/coremidi_io.cc +++ b/libs/backends/coreaudio/coremidi_io.cc @@ -259,7 +259,7 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin assert(rv == sizeof(uint32_t)); rv = _rb[port]->read((uint8_t*)&packet, s); assert(rv == s); - _input_queue[port].push_back(boost::shared_ptr(new _CoreMIDIPacket (&packet))); + _input_queue[port].push_back(std::shared_ptr(new _CoreMIDIPacket (&packet))); } UInt64 start = _time_at_cycle_start; diff --git a/libs/backends/coreaudio/coremidi_io.h b/libs/backends/coreaudio/coremidi_io.h index bd567aff40..a97b3b0a2f 100644 --- a/libs/backends/coreaudio/coremidi_io.h +++ b/libs/backends/coreaudio/coremidi_io.h @@ -62,7 +62,7 @@ typedef struct _CoreMIDIPacket { } } CoreMIDIPacket; -typedef std::vector > CoreMIDIQueue; +typedef std::vector > CoreMIDIQueue; class CoreMidiIo { public: diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index 8c96b2ff59..94e3d6658c 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -687,7 +687,7 @@ DummyAudioBackend::register_system_ports() if (!p) return -1; set_latency_range (p, false, lr); - boost::shared_ptr dp = boost::dynamic_pointer_cast(p); + std::shared_ptr dp = std::dynamic_pointer_cast(p); _system_inputs.push_back (dp); @@ -705,7 +705,7 @@ DummyAudioBackend::register_system_ports() PortPtr p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsInput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, true, lr); - _system_outputs.push_back (boost::dynamic_pointer_cast(p)); + _system_outputs.push_back (std::dynamic_pointer_cast(p)); } /* midi ports */ @@ -717,7 +717,7 @@ DummyAudioBackend::register_system_ports() if (!p) return -1; set_latency_range (p, false, lr); - boost::shared_ptr dp = boost::dynamic_pointer_cast(p); + std::shared_ptr dp = std::dynamic_pointer_cast(p); _system_midi_in.push_back (dp); @@ -743,7 +743,7 @@ DummyAudioBackend::register_system_ports() if (!p) return -1; set_latency_range (p, true, lr); - boost::shared_ptr dp = boost::dynamic_pointer_cast(p); + std::shared_ptr dp = std::dynamic_pointer_cast(p); _system_midi_out.push_back (dp); if (_device == _("Loopback") && _midi_mode == MidiToAudio) { @@ -812,7 +812,7 @@ DummyAudioBackend::midi_event_put ( // nevermind, ::get_buffer() sorts events, but always print warning fprintf (stderr, "DummyMidiBuffer: it's too late for this event %d > %d.\n", (pframes_t)dst.back ()->timestamp (), timestamp); } - dst.push_back (boost::shared_ptr(new DummyMidiEvent (timestamp, buffer, size))); + dst.push_back (std::shared_ptr(new DummyMidiEvent (timestamp, buffer, size))); #if 0 // DEBUG MIDI EVENTS printf("DummyAudioBackend::midi_event_put %d, %zu: ", timestamp, size); for (size_t xx = 0; xx < size; ++xx) { @@ -870,7 +870,7 @@ DummyAudioBackend::monitoring_input (PortEngine::PortHandle) void DummyAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool for_playback, LatencyRange latency_range) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { DEBUG_TRACE (PBD::DEBUG::BackendPorts, "DummyPort::set_latency_range (): invalid port."); return; @@ -882,7 +882,7 @@ LatencyRange DummyAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool for_playback) { LatencyRange r; - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { DEBUG_TRACE (PBD::DEBUG::BackendPorts, "DummyPort::get_latency_range (): invalid port."); r.min = 0; @@ -915,7 +915,7 @@ DummyAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool f void* DummyAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nframes) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); assert (port); assert (valid_port (port)); return port->get_buffer (nframes); @@ -944,10 +944,10 @@ DummyAudioBackend::main_process_thread () // re-set input buffers, generate on demand. for (std::vector::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) { - boost::dynamic_pointer_cast(*it)->next_period (); + std::dynamic_pointer_cast(*it)->next_period (); } for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it) { - boost::dynamic_pointer_cast(*it)->next_period (); + std::dynamic_pointer_cast(*it)->next_period (); } if (engine.process_callback (samples_per_period)) { @@ -960,7 +960,7 @@ DummyAudioBackend::main_process_thread () int opc = _system_outputs.size(); for (std::vector::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it, ++opn) { BackendPortPtr op = _system_outputs[(opn % opc)]; - boost::dynamic_pointer_cast(*it)->fill_wavetable ((const float*)op->get_buffer (samples_per_period), samples_per_period); + std::dynamic_pointer_cast(*it)->fill_wavetable ((const float*)op->get_buffer (samples_per_period), samples_per_period); } } @@ -968,18 +968,18 @@ DummyAudioBackend::main_process_thread () int opn = 0; int opc = _system_midi_out.size(); for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++opn) { - boost::shared_ptr op = boost::dynamic_pointer_cast (_system_midi_out[(opn % opc)]); + std::shared_ptr op = std::dynamic_pointer_cast (_system_midi_out[(opn % opc)]); op->get_buffer(0); // mix-down - boost::dynamic_pointer_cast(*it)->set_loopback (op->const_buffer()); + std::dynamic_pointer_cast(*it)->set_loopback (op->const_buffer()); } } else if (_midi_mode == MidiToAudio) { int opn = 0; int opc = _system_midi_out.size(); for (std::vector::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it, ++opn) { - boost::shared_ptr op = boost::dynamic_pointer_cast (_system_midi_out[(opn % opc)]); + std::shared_ptr op = std::dynamic_pointer_cast (_system_midi_out[(opn % opc)]); op->get_buffer(0); // mix-down - boost::dynamic_pointer_cast(*it)->midi_to_wavetable (op->const_buffer(), samples_per_period); + std::dynamic_pointer_cast(*it)->midi_to_wavetable (op->const_buffer(), samples_per_period); } } @@ -1042,9 +1042,9 @@ DummyAudioBackend::main_process_thread () /******************************************************************************/ -static boost::shared_ptr _instance; +static std::shared_ptr _instance; -static boost::shared_ptr backend_factory (AudioEngine& e); +static std::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); @@ -1059,7 +1059,7 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& e) { if (!_instance) { @@ -1619,14 +1619,14 @@ DummyAudioPort::get_buffer (pframes_t n_samples) if (it == connections.end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { - boost::shared_ptr source = boost::dynamic_pointer_cast(*it); + std::shared_ptr source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); if (source->is_physical() && source->is_terminal()) { source->get_buffer(n_samples); // generate signal. } memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); while (++it != connections.end ()) { - source = boost::dynamic_pointer_cast(*it); + source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); Sample* dst = buffer (); if (source->is_physical() && source->is_terminal()) { @@ -1664,7 +1664,7 @@ DummyMidiPort::~DummyMidiPort () { } struct MidiEventSorter { - bool operator() (const boost::shared_ptr& a, const boost::shared_ptr& b) { + bool operator() (const std::shared_ptr& a, const std::shared_ptr& b) { return *a < *b; } }; @@ -1673,7 +1673,7 @@ void DummyMidiPort::set_loopback (DummyMidiBuffer const * const src) { _loopback.clear (); for (DummyMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { - _loopback.push_back (boost::shared_ptr(new DummyMidiEvent (**it))); + _loopback.push_back (std::shared_ptr(new DummyMidiEvent (**it))); } } @@ -1722,17 +1722,17 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) pframes_t pp = pulse_position (); if (pp < n_samples - 1) { uint8_t md[3] = {0x90, 0x3c, 0x7f}; - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (pp, md, 3))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (pp, md, 3))); md[0] = 0x80; md[2] = 0; - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (pp + 1, md, 3))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (pp + 1, md, 3))); } return; } if (_midi_seq_spb == 0 || !_midi_seq_dat) { for (DummyMidiBuffer::const_iterator it = _loopback.begin (); it != _loopback.end (); ++it) { - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (**it))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (**it))); } return; } @@ -1765,7 +1765,7 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) case 6: buf[1] = 0x60 | ((/* 25fps*/ 0x20 | hour) & 0x0f); break; case 7: buf[1] = 0x70 | (((/* 25fps*/ 0x20 | hour) & 0xf0)>>4); break; } - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (tc_sample - _midi_seq_time, buf, 2))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (tc_sample - _midi_seq_time, buf, 2))); } tc_sample += audio_samples_per_qf; if (++qf == 8) { @@ -1791,7 +1791,7 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) buf[0] = 0xf2; buf[1] = bcnt & 0x7f; // LSB buf[2] = (bcnt >> 7) & 0x7f; // MSB - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (0, buf, 3))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (0, buf, 3))); } /* MIDI System Real-Time Messages */ @@ -1803,7 +1803,7 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) if (_midi_seq_time == 0) { /* start */ buf[0] = MIDI_RT_START; - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (0, buf, 1))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (0, buf, 1))); } const int clock_tick_interval = _midi_seq_spb; // samples per clock-tick @@ -1813,7 +1813,7 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) while (clk_sample < _midi_seq_time + n_samples) { if (clk_sample >= _midi_seq_time) { buf[0] = MIDI_RT_CLOCK; - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (clk_sample - _midi_seq_time, buf, 1))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (clk_sample - _midi_seq_time, buf, 1))); } clk_sample += clock_tick_interval; } @@ -1834,7 +1834,7 @@ void DummyMidiPort::midi_generate (const pframes_t n_samples) if ((pframes_t) ev_beat_time >= n_samples) { break; } - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent ( + _buffer.push_back (std::shared_ptr(new DummyMidiEvent ( ev_beat_time, _midi_seq_dat[_midi_seq_pos].event, _midi_seq_dat[_midi_seq_pos].size @@ -1858,13 +1858,13 @@ void* DummyMidiPort::get_buffer (pframes_t n_samples) for (std::set::const_iterator i = connections.begin (); i != connections.end (); ++i) { - boost::shared_ptr source = boost::dynamic_pointer_cast(*i); + std::shared_ptr source = std::dynamic_pointer_cast(*i); if (source->is_physical() && source->is_terminal()) { source->get_buffer(n_samples); // generate signal. } const DummyMidiBuffer *src = source->const_buffer (); for (DummyMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { - _buffer.push_back (boost::shared_ptr(new DummyMidiEvent (**it))); + _buffer.push_back (std::shared_ptr(new DummyMidiEvent (**it))); } } std::stable_sort (_buffer.begin (), _buffer.end (), MidiEventSorter()); diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h index 832ef2f07e..4256e581b5 100644 --- a/libs/backends/dummy/dummy_audiobackend.h +++ b/libs/backends/dummy/dummy_audiobackend.h @@ -65,7 +65,7 @@ class DummyMidiEvent : public BackendMIDIEvent { uint8_t *_data; }; -typedef std::vector > DummyMidiBuffer; +typedef std::vector > DummyMidiBuffer; class DummyPort : public BackendPort { protected: diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc index 2caf64da7e..6519e6276d 100644 --- a/libs/backends/jack/jack_api.cc +++ b/libs/backends/jack/jack_api.cc @@ -21,10 +21,10 @@ using namespace ARDOUR; -static boost::shared_ptr backend; -static boost::shared_ptr jack_connection; +static std::shared_ptr backend; +static std::shared_ptr jack_connection; -static boost::shared_ptr backend_factory (AudioEngine& ae); +static std::shared_ptr backend_factory (AudioEngine& ae); static int instantiate (const std::string& arg1, const std::string& arg2); static int deinstantiate (); static bool already_configured (); @@ -39,11 +39,11 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& ae) { if (!jack_connection) { - return boost::shared_ptr(); + return std::shared_ptr(); } if (!backend) { diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index e981212009..c1ca64e689 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -49,7 +49,7 @@ using std::vector; #define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; } #define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; } -JACKAudioBackend::JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, boost::shared_ptr jc) +JACKAudioBackend::JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, std::shared_ptr jc) : AudioBackend (e, info) , _jack_connection (jc) , _running (false) @@ -75,7 +75,7 @@ JACKAudioBackend::~JACKAudioBackend() { { RCUWriter writer (_jack_ports); - boost::shared_ptr jp = writer.get_copy (); + std::shared_ptr jp = writer.get_copy (); jp->clear (); } @@ -1099,7 +1099,7 @@ JACKAudioBackend::n_physical (unsigned long flags) const if (ports) { for (uint32_t i = 0; ports[i]; ++i) { if (!strstr (ports[i], "Midi-Through")) { - boost::shared_ptr jp (new JackPort (jack_port_by_name (_priv_jack, ports[i]))); + std::shared_ptr jp (new JackPort (jack_port_by_name (_priv_jack, ports[i]))); DataType t = port_data_type (jp); if (t != DataType::NIL) { c.set (t, c.get (t) + 1); diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index 8b7a96ba5f..4bda9a5e3f 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -51,7 +51,7 @@ class JackPort : public ProtoPort class JACKAudioBackend : public AudioBackend { public: - JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, boost::shared_ptr); + JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, std::shared_ptr); ~JACKAudioBackend (); /* AUDIOBACKEND API */ @@ -226,7 +226,7 @@ class JACKAudioBackend : public AudioBackend { bool speed_and_position (double& sp, samplepos_t& pos); private: - boost::shared_ptr _jack_connection; + std::shared_ptr _jack_connection; bool _running; bool _freewheeling; std::map _raw_buffer_sizes; @@ -307,7 +307,7 @@ class JACKAudioBackend : public AudioBackend { */ void jack_registration_callback (jack_port_id_t, int); - typedef std::map > JackPorts; + typedef std::map > JackPorts; mutable SerializedRCUManager _jack_ports; /* can be modified in ::get_port_by_name () */ void connect_callback (jack_port_id_t, jack_port_id_t, int); diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc index 9ca54ea2dd..46e0953ae5 100644 --- a/libs/backends/jack/jack_portengine.cc +++ b/libs/backends/jack/jack_portengine.cc @@ -110,12 +110,12 @@ JACKAudioBackend::set_port_name (PortHandle port, const std::string& name) #if HAVE_JACK_PORT_RENAME jack_client_t* client = _jack_connection->jack(); if (client) { - return jack_port_rename (client, boost::dynamic_pointer_cast(port)->jack_ptr, name.c_str()); + return jack_port_rename (client, std::dynamic_pointer_cast(port)->jack_ptr, name.c_str()); } else { return -1; } #else - return jack_port_set_name (boost::dynamic_pointer_cast(port)->jack_ptr, name.c_str()); + return jack_port_set_name (std::dynamic_pointer_cast(port)->jack_ptr, name.c_str()); #endif } @@ -127,7 +127,7 @@ JACKAudioBackend::get_port_name (PortHandle port) const return string(); } - jack_port_t* jp = boost::dynamic_pointer_cast(port)->jack_ptr; + jack_port_t* jp = std::dynamic_pointer_cast(port)->jack_ptr; if (!jp) { error << _("Fetching port name for non-existent JACK port!") << endmsg; @@ -140,7 +140,7 @@ JACKAudioBackend::get_port_name (PortHandle port) const PortFlags JACKAudioBackend::get_port_flags (PortHandle port) const { - return PortFlags (jack_port_flags (boost::dynamic_pointer_cast(port)->jack_ptr)); + return PortFlags (jack_port_flags (std::dynamic_pointer_cast(port)->jack_ptr)); } int @@ -151,7 +151,7 @@ JACKAudioBackend::get_port_property (PortHandle port, const std::string& key, st char *cvalue = NULL; char *ctype = NULL; - jack_uuid_t uuid = jack_port_uuid (boost::dynamic_pointer_cast(port)->jack_ptr); + jack_uuid_t uuid = jack_port_uuid (std::dynamic_pointer_cast(port)->jack_ptr); rv = jack_get_property (uuid, key.c_str(), &cvalue, &ctype); if (0 == rv && cvalue) { @@ -177,7 +177,7 @@ JACKAudioBackend::set_port_property (PortHandle port, const std::string& key, co #ifdef HAVE_JACK_METADATA // really everyone ought to have this by now. int rv = -1; jack_client_t* client = _jack_connection->jack(); - jack_uuid_t uuid = jack_port_uuid (boost::dynamic_pointer_cast(port)->jack_ptr); + jack_uuid_t uuid = jack_port_uuid (std::dynamic_pointer_cast(port)->jack_ptr); return jack_set_property(client, uuid, key.c_str(), value.c_str(), type.c_str()); return rv; #else @@ -189,7 +189,7 @@ PortEngine::PortPtr JACKAudioBackend::get_port_by_name (const std::string& name) const { { - boost::shared_ptr ports = _jack_ports.reader (); + std::shared_ptr ports = _jack_ports.reader (); JackPorts::iterator p = ports->find (name); if (p != ports->end()) { @@ -207,11 +207,11 @@ JACKAudioBackend::get_port_by_name (const std::string& name) const return PortEngine::PortPtr(); } - boost::shared_ptr jp; + std::shared_ptr jp; { RCUWriter writer (_jack_ports); - boost::shared_ptr ports = writer.get_copy(); + std::shared_ptr ports = writer.get_copy(); jp.reset (new JackPort (jack_port)); ports->insert (std::make_pair (name, jp)); } @@ -266,7 +266,7 @@ JACKAudioBackend::jack_registration_callback (jack_port_id_t id, int reg) const char* name = jack_port_name (jack_port); - boost::shared_ptr ports = _jack_ports.write_copy(); + std::shared_ptr ports = _jack_ports.write_copy(); if (!reg) { if (ports->erase (name)) { @@ -281,7 +281,7 @@ JACKAudioBackend::jack_registration_callback (jack_port_id_t id, int reg) ports->erase (name); } - boost::shared_ptr jp (new JackPort (jack_port)); + std::shared_ptr jp (new JackPort (jack_port)); ports->insert (std::make_pair (name, jp)); _jack_ports.update (ports); @@ -320,7 +320,7 @@ bool JACKAudioBackend::connected (PortHandle p, bool process_callback_safe) { bool ret = false; - jack_port_t* port = boost::dynamic_pointer_cast(p)->jack_ptr; + jack_port_t* port = std::dynamic_pointer_cast(p)->jack_ptr; const char** ports; if (process_callback_safe) { @@ -344,7 +344,7 @@ JACKAudioBackend::connected_to (PortHandle p, const std::string& other, bool pro { bool ret = false; const char** ports; - jack_port_t* port = boost::dynamic_pointer_cast(p)->jack_ptr; + jack_port_t* port = std::dynamic_pointer_cast(p)->jack_ptr; if (process_callback_safe) { ports = jack_port_get_connections (port); @@ -369,7 +369,7 @@ bool JACKAudioBackend::physically_connected (PortHandle p, bool process_callback_safe) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false); - jack_port_t* port = boost::dynamic_pointer_cast(p)->jack_ptr; + jack_port_t* port = std::dynamic_pointer_cast(p)->jack_ptr; const char** ports; @@ -400,7 +400,7 @@ bool JACKAudioBackend::externally_connected (PortHandle p, bool process_callback_safe) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false); - jack_port_t* port = boost::dynamic_pointer_cast(p)->jack_ptr; + jack_port_t* port = std::dynamic_pointer_cast(p)->jack_ptr; const char** ports; @@ -433,7 +433,7 @@ int JACKAudioBackend::get_connections (PortHandle p, vector& s, bool process_callback_safe) { const char** ports; - jack_port_t* port = boost::dynamic_pointer_cast(p)->jack_ptr; + jack_port_t* port = std::dynamic_pointer_cast(p)->jack_ptr; if (process_callback_safe) { ports = jack_port_get_connections (port); @@ -455,7 +455,7 @@ JACKAudioBackend::get_connections (PortHandle p, vector& s, bool process DataType JACKAudioBackend::port_data_type (PortHandle port) const { - return jack_port_type_to_ardour_data_type (jack_port_type (boost::dynamic_pointer_cast(port)->jack_ptr)); + return jack_port_type_to_ardour_data_type (jack_port_type (std::dynamic_pointer_cast(port)->jack_ptr)); } const string& @@ -471,7 +471,7 @@ JACKAudioBackend::port_is_physical (PortHandle port) const return false; } - return jack_port_flags (boost::dynamic_pointer_cast(port)->jack_ptr) & JackPortIsPhysical; + return jack_port_flags (std::dynamic_pointer_cast(port)->jack_ptr) & JackPortIsPhysical; } int @@ -567,17 +567,17 @@ JACKAudioBackend::can_monitor_input () const int JACKAudioBackend::request_input_monitoring (PortHandle port, bool yn) { - return jack_port_request_monitor (boost::dynamic_pointer_cast(port)->jack_ptr, yn); + return jack_port_request_monitor (std::dynamic_pointer_cast(port)->jack_ptr, yn); } int JACKAudioBackend::ensure_input_monitoring (PortHandle port, bool yn) { - return jack_port_ensure_monitor (boost::dynamic_pointer_cast(port)->jack_ptr, yn); + return jack_port_ensure_monitor (std::dynamic_pointer_cast(port)->jack_ptr, yn); } bool JACKAudioBackend::monitoring_input (PortHandle port) { - return jack_port_monitoring_input (boost::dynamic_pointer_cast(port)->jack_ptr); + return jack_port_monitoring_input (std::dynamic_pointer_cast(port)->jack_ptr); } PortEngine::PortPtr @@ -592,11 +592,11 @@ JACKAudioBackend::register_port (const std::string& shortname, ARDOUR::DataType return PortEngine::PortPtr(); } - boost::shared_ptr jp; + std::shared_ptr jp; { RCUWriter writer (_jack_ports); - boost::shared_ptr ports = writer.get_copy(); + std::shared_ptr ports = writer.get_copy(); jp.reset (new JackPort (jack_port)); @@ -612,12 +612,12 @@ void JACKAudioBackend::unregister_port (PortHandle port) { GET_PRIVATE_JACK_POINTER (_priv_jack); - boost::shared_ptr jp = boost::dynamic_pointer_cast(port); + std::shared_ptr jp = std::dynamic_pointer_cast(port); const std::string name = jack_port_name (jp->jack_ptr); { RCUWriter writer (_jack_ports); - boost::shared_ptr ports = writer.get_copy(); + std::shared_ptr ports = writer.get_copy(); ports->erase (name); } @@ -630,7 +630,7 @@ int JACKAudioBackend::connect (PortHandle port, const std::string& other) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); - int r = jack_connect (_priv_jack, jack_port_name (boost::dynamic_pointer_cast(port)->jack_ptr), other.c_str()); + int r = jack_connect (_priv_jack, jack_port_name (std::dynamic_pointer_cast(port)->jack_ptr), other.c_str()); if (r == 0 || r == EEXIST) { return 0; } @@ -652,7 +652,7 @@ int JACKAudioBackend::disconnect (PortHandle port, const std::string& other) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); - return jack_disconnect (_priv_jack, jack_port_name (boost::dynamic_pointer_cast(port)->jack_ptr), other.c_str()); + return jack_disconnect (_priv_jack, jack_port_name (std::dynamic_pointer_cast(port)->jack_ptr), other.c_str()); } int @@ -666,7 +666,7 @@ int JACKAudioBackend::disconnect_all (PortHandle port) { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); - return jack_port_disconnect (_priv_jack, boost::dynamic_pointer_cast(port)->jack_ptr); + return jack_port_disconnect (_priv_jack, std::dynamic_pointer_cast(port)->jack_ptr); } int @@ -710,7 +710,7 @@ JACKAudioBackend::set_latency_range (PortHandle port, bool for_playback, Latency range.min = r.min; range.max = r.max; - jack_port_set_latency_range (boost::dynamic_pointer_cast(port)->jack_ptr, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range); + jack_port_set_latency_range (std::dynamic_pointer_cast(port)->jack_ptr, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range); } LatencyRange @@ -719,7 +719,7 @@ JACKAudioBackend::get_latency_range (PortHandle port, bool for_playback) jack_latency_range_t range; LatencyRange ret; - jack_port_get_latency_range (boost::dynamic_pointer_cast(port)->jack_ptr, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range); + jack_port_get_latency_range (std::dynamic_pointer_cast(port)->jack_ptr, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range); ret.min = range.min; ret.max = range.max; @@ -730,7 +730,7 @@ JACKAudioBackend::get_latency_range (PortHandle port, bool for_playback) void* JACKAudioBackend::get_buffer (PortHandle port, pframes_t nframes) { - return jack_port_get_buffer (boost::dynamic_pointer_cast(port)->jack_ptr, nframes); + return jack_port_get_buffer (std::dynamic_pointer_cast(port)->jack_ptr, nframes); } uint32_t diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index d476c50204..a5b94ace52 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -1214,7 +1214,7 @@ PortAudioBackend::register_system_audio_ports() PortPtr p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsOutput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, false, lr); - boost::shared_ptr audio_port = boost::dynamic_pointer_cast(p); + std::shared_ptr audio_port = std::dynamic_pointer_cast(p); audio_port->set_hw_port_name ( _pcmio->get_input_channel_name (name_to_id (_input_audio_device), i)); _system_inputs.push_back (audio_port); @@ -1227,7 +1227,7 @@ PortAudioBackend::register_system_audio_ports() PortPtr p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsInput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, true, lr); - boost::shared_ptr audio_port = boost::dynamic_pointer_cast(p); + std::shared_ptr audio_port = std::dynamic_pointer_cast(p); audio_port->set_hw_port_name ( _pcmio->get_output_channel_name (name_to_id (_output_audio_device), i)); _system_outputs.push_back(audio_port); @@ -1264,7 +1264,7 @@ PortAudioBackend::register_system_midi_ports() } set_latency_range (p, false, lr); - boost::shared_ptr midi_port = boost::dynamic_pointer_cast(p); + std::shared_ptr midi_port = std::dynamic_pointer_cast(p); midi_port->set_hw_port_name ((*i)->name()); _system_midi_in.push_back (midi_port); DEBUG_MIDI (string_compose ("Registered MIDI input port: %1\n", port_name)); @@ -1288,7 +1288,7 @@ PortAudioBackend::register_system_midi_ports() } set_latency_range (p, false, lr); - boost::shared_ptr midi_port = boost::dynamic_pointer_cast(p); + std::shared_ptr midi_port = std::dynamic_pointer_cast(p); midi_port->set_n_periods(2); midi_port->set_hw_port_name ((*i)->name()); _system_midi_out.push_back (midi_port); @@ -1404,7 +1404,7 @@ PortAudioBackend::monitoring_input (PortEngine::PortHandle) void PortAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool for_playback, LatencyRange latency_range) { - boost::shared_ptr port = boost::dynamic_pointer_cast(port_handle); + std::shared_ptr port = std::dynamic_pointer_cast(port_handle); if (!valid_port (port)) { DEBUG_PORTS("BackendPort::set_latency_range (): invalid port.\n"); return; @@ -1415,7 +1415,7 @@ PortAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool fo LatencyRange PortAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool for_playback) { - boost::shared_ptr port = boost::dynamic_pointer_cast(port_handle); + std::shared_ptr port = std::dynamic_pointer_cast(port_handle); LatencyRange r; if (!valid_port (port)) { DEBUG_PORTS("BackendPort::get_latency_range (): invalid port.\n"); @@ -1445,7 +1445,7 @@ PortAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool fo void* PortAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nframes) { - boost::shared_ptr port = boost::dynamic_pointer_cast(port_handle); + std::shared_ptr port = std::dynamic_pointer_cast(port_handle); assert (port); return port->get_buffer (nframes); } @@ -1702,7 +1702,7 @@ PortAudioBackend::process_outgoing_midi () for (std::vector::iterator it = _system_midi_out.begin(); it != _system_midi_out.end(); ++it) { - boost::dynamic_pointer_cast(*it)->next_period(); + std::dynamic_pointer_cast(*it)->next_period(); } /* queue outgoing midi */ uint32_t i = 0; @@ -1710,7 +1710,7 @@ PortAudioBackend::process_outgoing_midi () it != _system_midi_out.end(); ++it, ++i) { const PortMidiBuffer* src = - boost::dynamic_pointer_cast(*it)->const_buffer(); + std::dynamic_pointer_cast(*it)->const_buffer(); for (PortMidiBuffer::const_iterator mit = src->begin(); mit != src->end(); ++mit) { @@ -1762,9 +1762,9 @@ PortAudioBackend::process_port_connection_changes () /******************************************************************************/ -static boost::shared_ptr _instance; +static std::shared_ptr _instance; -static boost::shared_ptr backend_factory (AudioEngine& e); +static std::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); @@ -1779,7 +1779,7 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& e) { if (!_instance) { @@ -1842,11 +1842,11 @@ void* PortAudioPort::get_buffer (pframes_t n_samples) if (it == get_connections ().end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { - boost::shared_ptr source = boost::dynamic_pointer_cast(*it); + std::shared_ptr source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); while (++it != get_connections ().end ()) { - source = boost::dynamic_pointer_cast(*it); + source = std::dynamic_pointer_cast(*it); assert (source && source->is_output ()); Sample* dst = buffer (); const Sample* src = source->const_buffer (); @@ -1887,7 +1887,7 @@ void* PortMidiPort::get_buffer (pframes_t /* nframes */) for (std::set::const_iterator i = get_connections ().begin (); i != get_connections ().end (); ++i) { - const PortMidiBuffer * src = boost::dynamic_pointer_cast(*i)->const_buffer (); + const PortMidiBuffer * src = std::dynamic_pointer_cast(*i)->const_buffer (); for (PortMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { (_buffer[_bufperiod]).push_back (*it); } diff --git a/libs/backends/portaudio/winmmemidi_io.h b/libs/backends/portaudio/winmmemidi_io.h index d482d7655c..2a4b92980c 100644 --- a/libs/backends/portaudio/winmmemidi_io.h +++ b/libs/backends/portaudio/winmmemidi_io.h @@ -54,7 +54,7 @@ struct WinMMEMIDIPacket { uint8_t data[MaxWinMidiEventSize]; }; -typedef std::vector > WinMMEMIDIQueue; +typedef std::vector > WinMMEMIDIQueue; class WinMMEMidiIO { public: diff --git a/libs/backends/pulseaudio/pulseaudio_backend.cc b/libs/backends/pulseaudio/pulseaudio_backend.cc index 3993133153..f95d97e3a2 100644 --- a/libs/backends/pulseaudio/pulseaudio_backend.cc +++ b/libs/backends/pulseaudio/pulseaudio_backend.cc @@ -878,7 +878,7 @@ PulseAudioBackend::midi_event_put ( { assert (buffer && port_buffer); PulseMidiBuffer& dst = *static_cast (port_buffer); - dst.push_back (boost::shared_ptr (new PulseMidiEvent (timestamp, buffer, size))); + dst.push_back (std::shared_ptr (new PulseMidiEvent (timestamp, buffer, size))); return 0; } @@ -929,7 +929,7 @@ bool void PulseAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool for_playback, LatencyRange latency_range) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); if (!valid_port (port)) { PBD::error << _("PulsePort::set_latency_range (): invalid port.") << endmsg; } @@ -939,7 +939,7 @@ PulseAudioBackend::set_latency_range (PortEngine::PortHandle port_handle, bool f LatencyRange PulseAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool for_playback) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); LatencyRange r; if (!valid_port (port)) { @@ -970,7 +970,7 @@ PulseAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool f void* PulseAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nframes) { - BackendPortPtr port = boost::dynamic_pointer_cast (port_handle); + BackendPortPtr port = std::dynamic_pointer_cast (port_handle); assert (port); return port->get_buffer (nframes); } @@ -1127,9 +1127,9 @@ PulseAudioBackend::main_process_thread () /******************************************************************************/ -static boost::shared_ptr _instance; +static std::shared_ptr _instance; -static boost::shared_ptr backend_factory (AudioEngine& e); +static std::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); @@ -1144,7 +1144,7 @@ static ARDOUR::AudioBackendInfo _descriptor = { available }; -static boost::shared_ptr +static std::shared_ptr backend_factory (AudioEngine& e) { if (!_instance) { @@ -1209,11 +1209,11 @@ PulseAudioPort::get_buffer (pframes_t n_samples) if (it == connections.end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { - boost::shared_ptr source = boost::dynamic_pointer_cast (*it); + std::shared_ptr source = std::dynamic_pointer_cast (*it); assert (source && source->is_output ()); memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); while (++it != connections.end ()) { - source = boost::dynamic_pointer_cast (*it); + source = std::dynamic_pointer_cast (*it); assert (source && source->is_output ()); Sample* dst = _buffer; const Sample* src = source->const_buffer (); @@ -1239,7 +1239,7 @@ PulseMidiPort::~PulseMidiPort () struct MidiEventSorter { bool - operator() (const boost::shared_ptr& a, const boost::shared_ptr& b) + operator() (const std::shared_ptr& a, const std::shared_ptr& b) { return *a < *b; } @@ -1253,7 +1253,7 @@ void* PulseMidiPort::get_buffer (pframes_t /*n_samples*/) for (std::set::const_iterator i = connections.begin (); i != connections.end (); ++i) { - const PulseMidiBuffer* src = boost::dynamic_pointer_cast (*i)->const_buffer (); + const PulseMidiBuffer* src = std::dynamic_pointer_cast (*i)->const_buffer (); for (PulseMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { _buffer.push_back (*it); } diff --git a/libs/backends/pulseaudio/pulseaudio_backend.h b/libs/backends/pulseaudio/pulseaudio_backend.h index 699f58d8ff..077d1ef2f6 100644 --- a/libs/backends/pulseaudio/pulseaudio_backend.h +++ b/libs/backends/pulseaudio/pulseaudio_backend.h @@ -59,7 +59,7 @@ private: uint8_t _data[MaxPulseMidiEventSize]; }; -typedef std::vector > PulseMidiBuffer; +typedef std::vector > PulseMidiBuffer; class PulseAudioPort : public BackendPort diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h index d69447f042..5f5a760455 100644 --- a/libs/canvas/canvas/image.h +++ b/libs/canvas/canvas/image.h @@ -78,7 +78,7 @@ public: * ... to avoid collisions with Image deletion, some synchronization method * may be required or the use of shared_ptr or similar. */ - boost::shared_ptr get_image (bool allocate_data = true); + std::shared_ptr get_image (bool allocate_data = true); /** @@ -90,7 +90,7 @@ public: * ... to avoid collisions with Image deletion, some synchronization method * may be required or the use of shared_ptr or similar. */ - void put_image (boost::shared_ptr); + void put_image (std::shared_ptr); void render (Rect const &, Cairo::RefPtr) const; void compute_bounding_box () const; @@ -99,8 +99,8 @@ private: Cairo::Format _format; int _width; int _height; - mutable boost::shared_ptr _current; - boost::shared_ptr _pending; + mutable std::shared_ptr _current; + std::shared_ptr _pending; mutable bool _need_render; mutable Cairo::RefPtr _surface; diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc index 0c56e2369a..fd8dcf6261 100644 --- a/libs/canvas/image.cc +++ b/libs/canvas/image.cc @@ -72,23 +72,23 @@ Image::compute_bounding_box () const set_bbox_clean (); } -boost::shared_ptr +std::shared_ptr Image::get_image (bool allocate_data) { /* can be called by any thread */ int stride = Cairo::ImageSurface::format_stride_for_width (_format, _width); if (allocate_data) { - boost::shared_ptr d (new Data (new uint8_t[stride*_height], _width, _height, stride, _format)); + std::shared_ptr d (new Data (new uint8_t[stride*_height], _width, _height, stride, _format)); return d; } else { - boost::shared_ptr d (new Data (NULL, _width, _height, stride, _format)); + std::shared_ptr d (new Data (NULL, _width, _height, stride, _format)); return d; } } void -Image::put_image (boost::shared_ptr d) +Image::put_image (std::shared_ptr d) { /* can be called by any thread */ diff --git a/libs/ctrl-interface/control_protocol/basic_ui.cc b/libs/ctrl-interface/control_protocol/basic_ui.cc index d6b0fe027a..7e6b37b443 100644 --- a/libs/ctrl-interface/control_protocol/basic_ui.cc +++ b/libs/ctrl-interface/control_protocol/basic_ui.cc @@ -448,7 +448,7 @@ BasicUI::trigger_cue_row (int cue_idx) void BasicUI::trigger_stop_col (int col, bool immediately) { - boost::shared_ptr tb = session->triggerbox_at (col); + std::shared_ptr tb = session->triggerbox_at (col); if (tb) { if (immediately) { tb->stop_all_immediately (); @@ -615,7 +615,7 @@ void BasicUI::toggle_monitor_mute () { if (session->monitor_out()) { - boost::shared_ptr mon = session->monitor_out()->monitor_control(); + std::shared_ptr mon = session->monitor_out()->monitor_control(); if (mon->cut_all ()) { mon->set_cut_all (false); } else { @@ -628,7 +628,7 @@ void BasicUI::toggle_monitor_dim () { if (session->monitor_out()) { - boost::shared_ptr mon = session->monitor_out()->monitor_control(); + std::shared_ptr mon = session->monitor_out()->monitor_control(); if (mon->dim_all ()) { mon->set_dim_all (false); } else { @@ -641,7 +641,7 @@ void BasicUI::toggle_monitor_mono () { if (session->monitor_out()) { - boost::shared_ptr mon = session->monitor_out()->monitor_control(); + std::shared_ptr mon = session->monitor_out()->monitor_control(); if (mon->mono()) { mon->set_mono (false); } else { @@ -845,11 +845,11 @@ BasicUI::goto_nth_marker (int n) ARDOUR::TriggerPtr BasicUI::find_trigger (int x, int y) { - boost::shared_ptr r = session->get_remote_nth_route (x); + std::shared_ptr r = session->get_remote_nth_route (x); if (!r) { return TriggerPtr(); } - boost::shared_ptr tb = r->triggerbox(); + std::shared_ptr tb = r->triggerbox(); if (!tb || !tb->active()) { return TriggerPtr(); @@ -867,7 +867,7 @@ BasicUI::find_trigger (int x, int y) float BasicUI::trigger_progress_at (int x) { - boost::shared_ptr tb = session->triggerbox_at (_tbank_start_route + x); + std::shared_ptr tb = session->triggerbox_at (_tbank_start_route + x); if (tb) { ARDOUR::TriggerPtr trigger = tb->currently_playing (); if (trigger) { @@ -882,7 +882,7 @@ BasicUI::trigger_display_at (int x, int y) { TriggerDisplay disp; - boost::shared_ptr tb = session->triggerbox_at (_tbank_start_route + x); + std::shared_ptr tb = session->triggerbox_at (_tbank_start_route + x); if (tb) { ARDOUR::TriggerPtr current = tb->currently_playing (); TriggerPtr tp = tb->trigger (_tbank_start_row + y); @@ -916,12 +916,12 @@ BasicUI::unbang_trigger_at (int x, int y) this stuff is waiting to go in so that all UIs can offer complex solo/mute functionality void -BasicUI::solo_release (boost::shared_ptr r) +BasicUI::solo_release (std::shared_ptr r) { } void -BasicUI::solo_press (boost::shared_ptr r, bool momentary, bool global, bool exclusive, bool isolate, bool solo_group) +BasicUI::solo_press (std::shared_ptr r, bool momentary, bool global, bool exclusive, bool isolate, bool solo_group) { if (momentary) { _solo_release = new SoloMuteRelease (_route->soloed()); @@ -944,7 +944,7 @@ BasicUI::solo_press (boost::shared_ptr r, bool momentary, bool global, bo if (_solo_release) { _solo_release->exclusive = true; - boost::shared_ptr routes = _session->get_routes(); + std::shared_ptr routes = _session->get_routes(); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i)->soloed ()) { @@ -992,7 +992,7 @@ BasicUI::solo_press (boost::shared_ptr r, bool momentary, bool global, bo /* click: solo this route */ - boost::shared_ptr rl (new RouteList); + std::shared_ptr rl (new RouteList); rl->push_back (route()); if (_solo_release) { diff --git a/libs/ctrl-interface/control_protocol/control_protocol.cc b/libs/ctrl-interface/control_protocol/control_protocol.cc index 864ed0b1d2..93dc37ce75 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol.cc +++ b/libs/ctrl-interface/control_protocol/control_protocol.cc @@ -119,12 +119,12 @@ void ControlProtocol::set_route_table_size (uint32_t size) { while (route_table.size() < size) { - route_table.push_back (boost::shared_ptr ((Route*) 0)); + route_table.push_back (std::shared_ptr ((Route*) 0)); } } void -ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr r) +ControlProtocol::set_route_table (uint32_t table_index, std::shared_ptr r) { if (table_index >= route_table.size()) { return; @@ -139,7 +139,7 @@ bool ControlProtocol::set_route_table (uint32_t table_index, uint32_t remote_control_id) { #if 0 // STRIPABLE - boost::shared_ptr r = session->route_by_remote_id (remote_control_id); + std::shared_ptr r = session->route_by_remote_id (remote_control_id); if (!r) { return false; @@ -157,9 +157,9 @@ ControlProtocol::route_set_rec_enable (uint32_t table_index, bool yn) return; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; - boost::shared_ptr at = boost::dynamic_pointer_cast(r); + std::shared_ptr at = std::dynamic_pointer_cast(r); if (at) { at->rec_enable_control()->set_value (1.0, Controllable::UseGroup); @@ -173,9 +173,9 @@ ControlProtocol::route_get_rec_enable (uint32_t table_index) return false; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; - boost::shared_ptr at = boost::dynamic_pointer_cast(r); + std::shared_ptr at = std::dynamic_pointer_cast(r); if (at) { return at->rec_enable_control()->get_value(); @@ -192,7 +192,7 @@ ControlProtocol::route_get_gain (uint32_t table_index) return 0.0f; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return 0.0f; @@ -208,7 +208,7 @@ ControlProtocol::route_set_gain (uint32_t table_index, float gain) return; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r != 0) { r->gain_control()->set_value (gain, Controllable::UseGroup); @@ -222,7 +222,7 @@ ControlProtocol::route_get_effective_gain (uint32_t table_index) return 0.0f; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return 0.0f; @@ -239,7 +239,7 @@ ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t whic return 0.0f; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return 0.0f; @@ -255,7 +255,7 @@ ControlProtocol::route_get_muted (uint32_t table_index) return false; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return false; @@ -271,7 +271,7 @@ ControlProtocol::route_set_muted (uint32_t table_index, bool yn) return; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r != 0) { r->mute_control()->set_value (yn ? 1.0 : 0.0, Controllable::UseGroup); @@ -286,7 +286,7 @@ ControlProtocol::route_get_soloed (uint32_t table_index) return false; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return false; @@ -302,7 +302,7 @@ ControlProtocol::route_set_soloed (uint32_t table_index, bool yn) return; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r != 0) { session->set_control (r->solo_control(), yn ? 1.0 : 0.0, Controllable::UseGroup); @@ -316,7 +316,7 @@ ControlProtocol:: route_get_name (uint32_t table_index) return ""; } - boost::shared_ptr r = route_table[table_index]; + std::shared_ptr r = route_table[table_index]; if (r == 0) { return ""; @@ -325,10 +325,10 @@ ControlProtocol:: route_get_name (uint32_t table_index) return r->name(); } -list > +list > ControlProtocol::bundles () { - return list > (); + return list > (); } XMLNode& @@ -353,49 +353,49 @@ ControlProtocol::set_state (XMLNode const & node, int /* version */) return 0; } -boost::shared_ptr +std::shared_ptr ControlProtocol::first_selected_stripable () const { return session->selection().first_selected_stripable (); } void -ControlProtocol::add_stripable_to_selection (boost::shared_ptr s) +ControlProtocol::add_stripable_to_selection (std::shared_ptr s) { - session->selection().add (s, boost::shared_ptr()); + session->selection().add (s, std::shared_ptr()); } void -ControlProtocol::set_stripable_selection (boost::shared_ptr s) +ControlProtocol::set_stripable_selection (std::shared_ptr s) { session->selection().select_stripable_and_maybe_group (s, true, true, 0); } void -ControlProtocol::toggle_stripable_selection (boost::shared_ptr s) +ControlProtocol::toggle_stripable_selection (std::shared_ptr s) { - session->selection().toggle (s, boost::shared_ptr()); + session->selection().toggle (s, std::shared_ptr()); } void -ControlProtocol::remove_stripable_from_selection (boost::shared_ptr s) +ControlProtocol::remove_stripable_from_selection (std::shared_ptr s) { - session->selection().remove (s, boost::shared_ptr()); + session->selection().remove (s, std::shared_ptr()); } void ControlProtocol::add_rid_to_selection (int rid) { - boost::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); + std::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); if (s) { - session->selection().add (s, boost::shared_ptr()); + session->selection().add (s, std::shared_ptr()); } } void ControlProtocol::set_rid_selection (int rid) { - boost::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); + std::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); if (s) { session->selection().select_stripable_and_maybe_group (s, true, true, 0); } @@ -404,18 +404,18 @@ ControlProtocol::set_rid_selection (int rid) void ControlProtocol::toggle_rid_selection (int rid) { - boost::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); + std::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); if (s) { - session->selection().toggle (s, boost::shared_ptr()); + session->selection().toggle (s, std::shared_ptr()); } } void ControlProtocol::remove_rid_from_selection (int rid) { - boost::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); + std::shared_ptr s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables); if (s) { - session->selection().remove (s, boost::shared_ptr()); + session->selection().remove (s, std::shared_ptr()); } } diff --git a/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h b/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h index a062e1d1af..431b9fe3a9 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h @@ -194,7 +194,7 @@ class LIBCONTROLCP_API BasicUI { void unbang_trigger_at (int x, int y); /* it would be nice to use TriggerPtr here but that implies including ardour/triggerbox.h */ - boost::shared_ptr find_trigger (int x, int y); + std::shared_ptr find_trigger (int x, int y); protected: BasicUI (); diff --git a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h index b4c03dc3eb..20bc49b309 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h @@ -83,10 +83,10 @@ public: static PBD::Signal0 StepTracksDown; static PBD::Signal0 StepTracksUp; - void add_stripable_to_selection (boost::shared_ptr); - void set_stripable_selection (boost::shared_ptr); - void toggle_stripable_selection (boost::shared_ptr); - void remove_stripable_from_selection (boost::shared_ptr); + void add_stripable_to_selection (std::shared_ptr); + void set_stripable_selection (std::shared_ptr); + void toggle_stripable_selection (std::shared_ptr); + void remove_stripable_from_selection (std::shared_ptr); void clear_stripable_selection (); virtual void add_rid_to_selection (int rid); @@ -94,7 +94,7 @@ public: virtual void toggle_rid_selection (int rid); virtual void remove_rid_from_selection (int rid); - boost::shared_ptr first_selected_stripable () const; + std::shared_ptr first_selected_stripable () const; /* the model here is as follows: @@ -113,7 +113,7 @@ public: */ void set_route_table_size (uint32_t size); - void set_route_table (uint32_t table_index, boost::shared_ptr); + void set_route_table (uint32_t table_index, std::shared_ptr); bool set_route_table (uint32_t table_index, uint32_t remote_control_id); void route_set_rec_enable (uint32_t table_index, bool yn); @@ -133,7 +133,7 @@ public: std::string route_get_name (uint32_t table_index); - virtual std::list > bundles (); + virtual std::list > bundles (); virtual bool has_editor () const { return false; } virtual void* get_gui () const { return 0; } @@ -151,7 +151,7 @@ protected: void next_track (uint32_t initial_id); void prev_track (uint32_t initial_id); - std::vector > route_table; + std::vector > route_table; std::string _name; GlibEventLoopCallback glib_event_callback; virtual void event_loop_precall (); diff --git a/libs/ctrl-interface/control_protocol/control_protocol/types.h b/libs/ctrl-interface/control_protocol/control_protocol/types.h index 4160363778..5e5335c79a 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/types.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/types.h @@ -26,13 +26,13 @@ namespace ARDOUR { class Route; class Stripable; - typedef std::vector > RouteNotificationList; - typedef boost::shared_ptr RouteNotificationListPtr; - typedef std::vector > StrongRouteNotificationList; + typedef std::vector > RouteNotificationList; + typedef std::shared_ptr RouteNotificationListPtr; + typedef std::vector > StrongRouteNotificationList; - typedef std::vector > StripableNotificationList; - typedef boost::shared_ptr StripableNotificationListPtr; - typedef std::vector > StrongStripableNotificationList; + typedef std::vector > StripableNotificationList; + typedef std::shared_ptr StripableNotificationListPtr; + typedef std::vector > StrongStripableNotificationList; } #endif /* __ardour_control_protocol_types_h__ */ diff --git a/libs/ctrl-interface/midi_surface/midi_surface.cc b/libs/ctrl-interface/midi_surface/midi_surface.cc index 36fc11bccf..87b2316938 100644 --- a/libs/ctrl-interface/midi_surface/midi_surface.cc +++ b/libs/ctrl-interface/midi_surface/midi_surface.cc @@ -93,8 +93,8 @@ MIDISurface::ports_acquire () * really insist on that (and use JACK) */ - _input_port = boost::dynamic_pointer_cast(_async_in).get(); - _output_port = boost::dynamic_pointer_cast(_async_out).get(); + _input_port = std::dynamic_pointer_cast(_async_in).get(); + _output_port = std::dynamic_pointer_cast(_async_out).get(); /* Create a shadow port where, depending on the state of the surface, * we will make pad note on/off events appear. The surface code will @@ -102,8 +102,8 @@ MIDISurface::ports_acquire () */ if (with_pad_filter) { - boost::dynamic_pointer_cast(_async_in)->add_shadow_port (string_compose (_("%1 Pads"), port_name_prefix), boost::bind (&MIDISurface::pad_filter, this, _1, _2)); - boost::shared_ptr shadow_port = boost::dynamic_pointer_cast(_async_in)->shadow_port(); + std::dynamic_pointer_cast(_async_in)->add_shadow_port (string_compose (_("%1 Pads"), port_name_prefix), boost::bind (&MIDISurface::pad_filter, this, _1, _2)); + std::shared_ptr shadow_port = std::dynamic_pointer_cast(_async_in)->shadow_port(); if (shadow_port) { @@ -184,15 +184,15 @@ MIDISurface::port_registration_handler () } bool -MIDISurface::connection_handler (boost::weak_ptr, std::string name1, boost::weak_ptr, std::string name2, bool yn) +MIDISurface::connection_handler (std::weak_ptr, std::string name1, std::weak_ptr, std::string name2, bool yn) { DEBUG_TRACE (DEBUG::MIDISurface, "FaderPort::connection_handler start\n"); if (!_input_port || !_output_port) { return false; } - std::string ni = ARDOUR::AudioEngine::instance()->make_port_name_non_relative (boost::shared_ptr(_async_in)->name()); - std::string no = ARDOUR::AudioEngine::instance()->make_port_name_non_relative (boost::shared_ptr(_async_out)->name()); + std::string ni = ARDOUR::AudioEngine::instance()->make_port_name_non_relative (std::shared_ptr(_async_in)->name()); + std::string no = ARDOUR::AudioEngine::instance()->make_port_name_non_relative (std::shared_ptr(_async_out)->name()); if (ni == name1 || ni == name2) { if (yn) { @@ -245,13 +245,13 @@ MIDISurface::connection_handler (boost::weak_ptr, std::string name return true; /* connection status changed */ } -boost::shared_ptr +std::shared_ptr MIDISurface::output_port() { return _async_out; } -boost::shared_ptr +std::shared_ptr MIDISurface::input_port() { return _async_in; @@ -424,10 +424,10 @@ MIDISurface::stop_using_device () return 0; } -std::list > +std::list > MIDISurface::bundles () { - std::list > b; + std::list > b; if (_output_bundle) { b.push_back (_output_bundle); diff --git a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h index 46a40b84ec..9b4fc736f6 100644 --- a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h +++ b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h @@ -50,13 +50,13 @@ class MIDISurface : public ARDOUR::ControlProtocol static void* request_factory (uint32_t num_requests); - boost::shared_ptr input_port(); - boost::shared_ptr output_port(); + std::shared_ptr input_port(); + std::shared_ptr output_port(); // Bundle to represent our input ports - boost::shared_ptr _input_bundle; + std::shared_ptr _input_bundle; // Bundle to represent our output ports - boost::shared_ptr _output_bundle; + std::shared_ptr _output_bundle; ARDOUR::Session & get_session() { return *session; } @@ -69,7 +69,7 @@ class MIDISurface : public ARDOUR::ControlProtocol XMLNode& get_state() const; int set_state (const XMLNode & node, int version); - std::list > bundles (); + std::list > bundles (); PBD::Signal0 ConnectionChange; @@ -82,8 +82,8 @@ class MIDISurface : public ARDOUR::ControlProtocol MIDI::Port* _input_port; MIDI::Port* _output_port; - boost::shared_ptr _async_in; - boost::shared_ptr _async_out; + std::shared_ptr _async_in; + std::shared_ptr _async_out; void do_request (MidiSurfaceRequest*); @@ -118,7 +118,7 @@ class MIDISurface : public ARDOUR::ControlProtocol int _connection_state; - virtual bool connection_handler (boost::weak_ptr, std::string name1, boost::weak_ptr, std::string name2, bool yn); + virtual bool connection_handler (std::weak_ptr, std::string name1, std::weak_ptr, std::string name2, bool yn); PBD::ScopedConnectionList port_connections; virtual int ports_acquire (); diff --git a/libs/evoral/Control.cc b/libs/evoral/Control.cc index ec97aaa990..1d0b04b734 100644 --- a/libs/evoral/Control.cc +++ b/libs/evoral/Control.cc @@ -30,7 +30,7 @@ namespace Evoral { Control::Control(const Parameter& parameter, const ParameterDescriptor& desc, - boost::shared_ptr list) + std::shared_ptr list) : _parameter(parameter) , _user_value(desc.normal) { @@ -53,7 +53,7 @@ Control::set_double (double value, Temporal::timepos_t const & when, bool to_lis void -Control::set_list(boost::shared_ptr list) +Control::set_list(std::shared_ptr list) { _list_marked_dirty_connection.disconnect (); diff --git a/libs/evoral/ControlList.cc b/libs/evoral/ControlList.cc index 7dc205973c..861165a2db 100644 --- a/libs/evoral/ControlList.cc +++ b/libs/evoral/ControlList.cc @@ -125,7 +125,7 @@ ControlList::ControlList (const ControlList& other, timepos_t const& start, time /* now grab the relevant points, and shift them back if necessary */ - boost::shared_ptr section = const_cast (&other)->copy (start, end); + std::shared_ptr section = const_cast (&other)->copy (start, end); if (!section->empty ()) { // XXX copy_events() emits Dirty, but this is just assignment copy/construction @@ -151,10 +151,10 @@ ControlList::~ControlList () delete _curve; } -boost::shared_ptr +std::shared_ptr ControlList::create (const Parameter& id, const ParameterDescriptor& desc, TimeDomain time_style) { - return boost::shared_ptr (new ControlList (id, desc, time_style)); + return std::shared_ptr (new ControlList (id, desc, time_style)); } bool @@ -1831,10 +1831,10 @@ ControlList::rt_safe_earliest_event_linear_unlocked (Temporal::timepos_t const& * @param end End position in model coordinates. * @param op 0 = cut, 1 = copy, 2 = clear. */ -boost::shared_ptr +std::shared_ptr ControlList::cut_copy_clear (timepos_t const& start_time, timepos_t const& end_time, int op) { - boost::shared_ptr nal = create (_parameter, _desc, _time_domain); + std::shared_ptr nal = create (_parameter, _desc, _time_domain); iterator s, e; timepos_t start = start_time; @@ -1917,13 +1917,13 @@ ControlList::cut_copy_clear (timepos_t const& start_time, timepos_t const& end_t return nal; } -boost::shared_ptr +std::shared_ptr ControlList::cut (timepos_t const& start, timepos_t const& end) { return cut_copy_clear (start, end, 0); } -boost::shared_ptr +std::shared_ptr ControlList::copy (timepos_t const& start, timepos_t const& end) { return cut_copy_clear (start, end, 1); diff --git a/libs/evoral/ControlSet.cc b/libs/evoral/ControlSet.cc index b0aba9ce9d..7c01bfe467 100644 --- a/libs/evoral/ControlSet.cc +++ b/libs/evoral/ControlSet.cc @@ -41,7 +41,7 @@ ControlSet::ControlSet (ControlSet const & other) } void -ControlSet::add_control(boost::shared_ptr ac) +ControlSet::add_control(std::shared_ptr ac) { _controls[ac->parameter()] = ac; @@ -71,7 +71,7 @@ ControlSet::what_has_data (set& s) const * a control will be created, added to this set, and returned. * If \a create_if_missing is false this function may return null. */ -boost::shared_ptr +std::shared_ptr ControlSet::control (const Parameter& parameter, bool create_if_missing) { Controls::iterator i = _controls.find(parameter); @@ -80,12 +80,12 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing) return i->second; } else if (create_if_missing) { - boost::shared_ptr ac(control_factory(parameter)); + std::shared_ptr ac(control_factory(parameter)); add_control(ac); return ac; } else { - return boost::shared_ptr(); + return std::shared_ptr(); } } diff --git a/libs/evoral/Sequence.cc b/libs/evoral/Sequence.cc index d45c3e7655..083f62f4cb 100644 --- a/libs/evoral/Sequence.cc +++ b/libs/evoral/Sequence.cc @@ -67,7 +67,7 @@ namespace Evoral { template Sequence