#include "ardour/ardour.h"
#include "ardour/chan_count.h"
-#include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/session_configuration.h"
#include "ardour/location.h"
#include "ardour/smpte.h"
+#include "ardour/interpolation.h"
class XMLTree;
class XMLNode;
class PortInsert;
class Processor;
class Region;
+class Return;
class Route;
class RouteGroup;
class SMFSource;
class TempoMap;
class VSTPlugin;
-using std::vector;
-using std::string;
-using std::map;
-using std::set;
-
class Session : public PBD::StatefulDestructible, public boost::noncopyable
{
private:
typedef std::pair<boost::weak_ptr<Route>,bool> RouteBooleanState;
- typedef vector<RouteBooleanState> GlobalRouteBooleanState;
+ typedef std::vector<RouteBooleanState> GlobalRouteBooleanState;
typedef std::pair<boost::weak_ptr<Route>,MeterPoint> RouteMeterState;
- typedef vector<RouteMeterState> GlobalRouteMeterState;
+ typedef std::vector<RouteMeterState> GlobalRouteMeterState;
public:
enum RecordState {
Route* route;
};
- list<AudioRange> audio_range;
- list<MusicRange> music_range;
-
+ std::list<AudioRange> audio_range;
+ std::list<MusicRange> music_range;
+
boost::shared_ptr<Region> region;
Event(Type t, Action a, nframes_t when, nframes_t where, double spd, bool yn = false)
return e1->before (*e2);
}
- void *operator new (size_t ignored) {
+ void *operator new (size_t) {
return pool.alloc ();
}
- void operator delete(void *ptr, size_t size) {
+ void operator delete (void *ptr, size_t /*size*/) {
pool.release (ptr);
}
/* creating from an XML file */
Session (AudioEngine&,
- const string& fullpath,
- const string& snapshot_name,
- string mix_template = "");
+ const std::string& fullpath,
+ const std::string& snapshot_name,
+ std::string mix_template = "");
/* creating a new Session */
Session (AudioEngine&,
- string fullpath,
- string snapshot_name,
+ std::string fullpath,
+ std::string snapshot_name,
AutoConnectOption input_auto_connect,
AutoConnectOption output_auto_connect,
uint32_t control_out_channels,
virtual ~Session ();
- string path() const { return _path; }
- string name() const { return _name; }
- string snap_name() const { return _current_snapshot_name; }
- string raid_path () const;
+ std::string path() const { return _path; }
+ std::string name() const { return _name; }
+ std::string snap_name() const { return _current_snapshot_name; }
+ std::string raid_path () const;
void set_snap_name ();
+ bool writable() const { return _writable; }
void set_dirty ();
void set_clean ();
bool dirty() const { return _state_of_the_state & Dirty; }
void set_deletion_in_progress ();
+ void clear_deletion_in_progress ();
bool deletion_in_progress() const { return _state_of_the_state & Deletion; }
sigc::signal<void> DirtyChanged;
Glib::ustring peak_path (Glib::ustring) const;
- static string change_source_path_by_name (string oldpath, string oldname, string newname, bool destructive);
+ static std::string change_source_path_by_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
- string peak_path_from_audio_path (string) const;
- string new_audio_source_name (const string&, uint32_t nchans, uint32_t chan, bool destructive);
- string new_midi_source_name (const string&);
- string new_source_path_from_name (DataType type, const string&);
+ std::string peak_path_from_audio_path (std::string) const;
+ std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
+ std::string new_midi_source_name (const std::string&);
+ std::string new_source_path_from_name (DataType type, const std::string&);
RouteList new_route_from_template (uint32_t how_many, const std::string& template_path);
void process (nframes_t nframes);
void add_diskstream (boost::shared_ptr<Diskstream>);
boost::shared_ptr<Diskstream> diskstream_by_id (const PBD::ID& id);
- boost::shared_ptr<Diskstream> diskstream_by_name (string name);
+ boost::shared_ptr<Diskstream> diskstream_by_name (std::string name);
+ bool have_rec_enabled_diskstream () const;
bool have_captured() const { return _have_captured; }
typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
- int load_routes (const XMLNode&);
+ int load_routes (const XMLNode&, int);
boost::shared_ptr<RouteList> get_routes() const {
return routes.reader ();
}
}
struct RoutePublicOrderSorter {
- bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b);
+ bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b);
};
-
- void sync_order_keys (const char* base);
+
+ void sync_order_keys (std::string const &);
template<class T> void foreach_route (T *obj, void (T::*func)(Route&));
template<class T> void foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>));
template<class T, class A> void foreach_route (T *obj, void (T::*func)(Route&, A), A arg);
- boost::shared_ptr<Route> route_by_name (string);
+ boost::shared_ptr<Route> route_by_name (std::string);
boost::shared_ptr<Route> route_by_id (PBD::ID);
boost::shared_ptr<Route> route_by_remote_id (uint32_t id);
- bool route_name_unique (string) const;
- bool route_name_internal (string) const;
+ bool route_name_unique (std::string) const;
+ bool route_name_internal (std::string) const;
bool get_record_enabled() const {
return (record_status () >= Enabled);
sigc::signal<void> Located;
sigc::signal<void,RouteList&> RouteAdded;
+ sigc::signal<void> RouteGroupChanged;
void request_roll_at_and_return (nframes_t start, nframes_t return_to);
void request_bounded_roll (nframes_t start, nframes_t end);
void goto_end () { request_locate (end_location->start(), false);}
void goto_start () { request_locate (start_location->start(), false); }
void set_session_start (nframes_t start) { start_location->set_start(start); }
- void set_session_end (nframes_t end) { end_location->set_start(end); _end_location_is_free = false; }
+ void set_session_end (nframes_t end) { end_location->set_start(end); config.set_end_marker_is_free (false); }
void use_rf_shuttle_speed ();
void allow_auto_play (bool yn);
void request_transport_speed (double speed);
double frames_per_smpte_frame() const { return _frames_per_smpte_frame; }
nframes_t smpte_frames_per_hour() const { return _smpte_frames_per_hour; }
- MIDI::byte get_mtc_smpte_bits() const {
+ MIDI::byte get_mtc_smpte_bits() const {
return mtc_smpte_bits; /* encoding of SMTPE type for MTC */
}
void set_auto_punch_location (Location *);
void set_auto_loop_location (Location *);
- int location_name(string& result, string base = string(""));
+ int location_name(std::string& result, std::string base = std::string(""));
void reset_input_monitor_state ();
static int rename_template (std::string old_name, std::string new_name);
static int delete_template (std::string name);
- sigc::signal<void,string> StateSaved;
+ sigc::signal<void,std::string> StateSaved;
sigc::signal<void> StateReady;
- vector<string*>* possible_states() const;
- static vector<string*>* possible_states(string path);
+ std::vector<std::string*>* possible_states() const;
+ static std::vector<std::string*>* possible_states (std::string path);
XMLNode& get_state();
- int set_state(const XMLNode& node); // not idempotent
+ int set_state(const XMLNode& node, int version); // not idempotent
XMLNode& get_template();
/// The instant xml file is written to the session directory
StateOfTheState state_of_the_state() const { return _state_of_the_state; }
- RouteGroup* add_edit_group (string);
- RouteGroup* add_mix_group (string);
-
- void remove_edit_group (RouteGroup&);
- void remove_mix_group (RouteGroup&);
+ void add_route_group (RouteGroup *);
+ void remove_route_group (RouteGroup&);
- RouteGroup *mix_group_by_name (string);
- RouteGroup *edit_group_by_name (string);
+ RouteGroup *route_group_by_name (std::string);
- sigc::signal<void,RouteGroup*> edit_group_added;
- sigc::signal<void,RouteGroup*> mix_group_added;
- sigc::signal<void> edit_group_removed;
- sigc::signal<void> mix_group_removed;
-
- void foreach_edit_group (sigc::slot<void,RouteGroup*> sl) {
- for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); i++) {
- sl (*i);
- }
- }
+ sigc::signal<void,RouteGroup*> route_group_added;
+ sigc::signal<void> route_group_removed;
- void foreach_mix_group (sigc::slot<void,RouteGroup*> sl) {
- for (list<RouteGroup *>::iterator i = mix_groups.begin(); i != mix_groups.end(); i++) {
+ void foreach_route_group (sigc::slot<void,RouteGroup*> sl) {
+ for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); i++) {
sl (*i);
}
}
/* fundamental operations. duh. */
std::list<boost::shared_ptr<AudioTrack> > new_audio_track (
- int input_channels, int output_channels, TrackMode mode = Normal, uint32_t how_many = 1);
-
- RouteList new_audio_route (int input_channels, int output_channels, uint32_t how_many);
+ int input_channels, int output_channels, TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+ );
+
+ RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many);
std::list<boost::shared_ptr<MidiTrack> > new_midi_track (
- TrackMode mode = Normal, uint32_t how_many = 1);
+ TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+ );
void remove_route (boost::shared_ptr<Route>);
void resort_routes ();
pullup_Minus4Minus1
};
- int set_smpte_format (SmpteFormat);
void sync_time_vars();
void bbt_time (nframes_t when, BBT_Time&);
/// signals the current transport position in frames, bbt and smpte time (in that order)
sigc::signal<void, const nframes_t&, const BBT_Time&, const SMPTE::Time&> tick;
-
+
/* region info */
void add_regions (std::vector<boost::shared_ptr<Region> >&);
sigc::signal<void,std::vector<boost::weak_ptr<Region> >& > RegionsAdded;
sigc::signal<void,boost::weak_ptr<Region> > RegionRemoved;
- int region_name (string& result, string base = string(""), bool newlevel = false);
- string new_region_name (string);
- string path_from_region_name (DataType type, string name, string identifier);
+ int region_name (std::string& result, std::string base = std::string(""), bool newlevel = false);
+ std::string new_region_name (std::string);
+ std::string path_from_region_name (DataType type, std::string name, std::string identifier);
boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>);
/* source management */
struct ImportStatus : public InterThreadInfo {
- string doing_what;
+ std::string doing_what;
/* control info */
uint32_t total;
};
void import_audiofiles (ImportStatus&);
- bool sample_rate_convert (ImportStatus&, string infile, string& outfile);
- string build_tmp_convert_name (string file);
+ bool sample_rate_convert (ImportStatus&, std::string infile, std::string& outfile);
+ std::string build_tmp_convert_name (std::string file);
boost::shared_ptr<ExportHandler> get_export_handler ();
boost::shared_ptr<ExportStatus> get_export_status ();
- int start_audio_export (nframes_t position, bool realtime);
+ int start_audio_export (nframes_t position, bool realtime);
sigc::signal<int, nframes_t> ProcessExport;
sigc::signal<void> ExportReadFinished;
void remove_source (boost::weak_ptr<Source>);
struct cleanup_report {
- vector<string> paths;
+ std::vector<std::string> paths;
int64_t space;
};
/* playlist management */
- boost::shared_ptr<Playlist> playlist_by_name (string name);
+ boost::shared_ptr<Playlist> playlist_by_name (std::string name);
void unassigned_playlists (std::list<boost::shared_ptr<Playlist> > & list);
void add_playlist (boost::shared_ptr<Playlist>, bool unused = false);
sigc::signal<void,boost::shared_ptr<Playlist> > PlaylistAdded;
/* named selections */
- NamedSelection* named_selection_by_name (string name);
+ NamedSelection* named_selection_by_name (std::string name);
void add_named_selection (NamedSelection *);
void remove_named_selection (NamedSelection *);
/* flattening stuff */
boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end,
- bool overwrite, vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
+ bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
bool enable_processing = true);
int freeze (InterThreadInfo&);
/* session-wide solo/mute/rec-enable */
- bool soloing() const { return currently_soloing; }
+ bool soloing() const { return _non_soloed_outs_muted; }
+ bool listening() const { return _listen_cnt > 0; }
void set_all_solo (bool);
void set_all_mute (bool);
+ void set_all_listen (bool);
sigc::signal<void,bool> SoloActive;
sigc::signal<void> SoloChanged;
/* control/master out */
- boost::shared_ptr<IO> control_out() const { return _control_out; }
- boost::shared_ptr<IO> master_out() const { return _master_out; }
-
- /* insert/send management */
+ boost::shared_ptr<Route> control_out() const { return _control_out; }
+ boost::shared_ptr<Route> master_out() const { return _master_out; }
- uint32_t n_port_inserts() const { return _port_inserts.size(); }
- uint32_t n_plugin_inserts() const { return _plugin_inserts.size(); }
- uint32_t n_sends() const { return _sends.size(); }
+ void globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p);
+ void globally_set_send_gains_from_track (boost::shared_ptr<Route> dest);
+ void globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest);
+ void globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest);
+ void add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders);
static void set_disable_all_loaded_plugins (bool yn) {
_disable_all_loaded_plugins = yn;
}
uint32_t next_send_id();
+ uint32_t next_return_id();
uint32_t next_insert_id();
void mark_send_id (uint32_t);
+ void mark_return_id (uint32_t);
void mark_insert_id (uint32_t);
/* s/w "RAID" management */
void add_bundle (boost::shared_ptr<Bundle>);
void remove_bundle (boost::shared_ptr<Bundle>);
- boost::shared_ptr<Bundle> bundle_by_name (string) const;
+ boost::shared_ptr<Bundle> bundle_by_name (std::string) const;
sigc::signal<void,boost::shared_ptr<Bundle> > BundleAdded;
sigc::signal<void,boost::shared_ptr<Bundle> > BundleRemoved;
/* MIDI control */
void midi_panic(void);
- int set_mtc_port (string port_tag);
- int set_mmc_port (string port_tag);
- int set_midi_port (string port_tag);
- int set_midi_clock_port (string port_tag);
+ int set_mtc_port (std::string port_tag);
+ int set_mmc_port (std::string port_tag);
+ int set_midi_port (std::string port_tag);
+ int set_midi_clock_port (std::string port_tag);
MIDI::Port *mtc_port() const { return _mtc_port; }
MIDI::Port *mmc_port() const { return _mmc_port; }
MIDI::Port *midi_port() const { return _midi_port; }
uint32_t undo_depth() const { return _history.undo_depth(); }
uint32_t redo_depth() const { return _history.redo_depth(); }
- string next_undo() const { return _history.next_undo(); }
- string next_redo() const { return _history.next_redo(); }
+ std::string next_undo() const { return _history.next_undo(); }
+ std::string next_redo() const { return _history.next_redo(); }
- void begin_reversible_command (const string& cmd_name);
+ void begin_reversible_command (const std::string& cmd_name);
void commit_reversible_command (Command* cmd = 0);
void add_command (Command *const cmd) {
- current_trans->add_command (cmd);
+ assert(!_current_trans.empty ());
+ _current_trans.top()->add_command (cmd);
}
std::map<PBD::ID, PBD::StatefulThingWithGoingAway*> registry;
class GlobalRouteStateCommand : public Command
{
- public:
+ public:
GlobalRouteStateCommand (Session&, void*);
GlobalRouteStateCommand (Session&, const XMLNode& node);
- int set_state (const XMLNode&);
+ int set_state (const XMLNode&, int version);
XMLNode& get_state ();
- protected:
+ protected:
GlobalRouteBooleanState before, after;
Session& sess;
void* src;
-
};
class GlobalSoloStateCommand : public GlobalRouteStateCommand
{
- public:
+ public:
GlobalSoloStateCommand (Session &, void *src);
GlobalSoloStateCommand (Session&, const XMLNode&);
void operator()(); //redo
class GlobalMuteStateCommand : public GlobalRouteStateCommand
{
- public:
+ public:
GlobalMuteStateCommand(Session &, void *src);
GlobalMuteStateCommand (Session&, const XMLNode&);
void operator()(); // redo
class GlobalRecordEnableStateCommand : public GlobalRouteStateCommand
{
- public:
+ public:
GlobalRecordEnableStateCommand(Session &, void *src);
GlobalRecordEnableStateCommand (Session&, const XMLNode&);
void operator()(); // redo
class GlobalMeteringStateCommand : public Command
{
- public:
+ public:
GlobalMeteringStateCommand(Session &, void *src);
GlobalMeteringStateCommand (Session&, const XMLNode&);
void operator()();
void undo();
XMLNode &get_state();
- int set_state (const XMLNode&);
+ int set_state (const XMLNode&, int version);
void mark();
- protected:
+ protected:
Session& sess;
void* src;
GlobalRouteMeterState before;
/* ranges */
- void set_audio_range (list<AudioRange>&);
- void set_music_range (list<MusicRange>&);
+ void set_audio_range (std::list<AudioRange>&);
+ void set_music_range (std::list<MusicRange>&);
void request_play_range (bool yn);
bool get_play_range () const { return _play_range; }
gain_t* gain_automation_buffer () const { return _gain_automation_buffer; }
pan_t** pan_automation_buffer () const { return _pan_automation_buffer; }
+ void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany);
+
/* VST support */
static long vst_callback (AEffect* effect,
SessionMetadata & metadata () { return *_metadata; }
+ SessionConfiguration config;
+
+ bool exporting () const {
+ return _exporting;
+ }
+
protected:
friend class AudioEngine;
void set_block_size (nframes_t nframes);
void update_latency_compensation (bool, bool);
private:
- int create (bool& new_session, const string& mix_template, nframes_t initial_length);
+ int create (bool& new_session, const std::string& mix_template, nframes_t initial_length);
void destroy ();
nframes_t compute_initial_length ();
Location* start_location;
Slave* _slave;
bool _silent;
- volatile double _transport_speed;
- double _last_transport_speed;
- // fixed point transport speed for varispeed playback
- uint64_t phi;
- // fixed point target transport speed for varispeed playback when tempo changes
- uint64_t target_phi;
- // fixed point phase for varispeed playback
- uint64_t phase;
+
+ // varispeed playback
+ volatile double _transport_speed;
+ double _last_transport_speed;
+ double _target_transport_speed;
+ CubicInterpolation interpolation;
+
bool auto_play_legal;
nframes_t _last_slave_transport_frame;
nframes_t maximum_output_latency;
bool _have_captured;
float _meter_hold;
float _meter_falloff;
- bool _end_location_is_free;
+ bool _non_soloed_outs_muted;
+ uint32_t _listen_cnt;
+ bool _writable;
void set_worst_io_latencies ();
- void set_worst_io_latencies_x (IOChange asifwecare, void *ignored) {
+ void set_worst_io_latencies_x (IOChange, void *) {
set_worst_io_latencies ();
}
void reset_slave_state ();
bool follow_slave (nframes_t);
void calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta);
- void track_slave_state(float slave_speed, nframes_t slave_transport_frame,
- nframes_t this_delta, bool starting);
+ void track_slave_state(float slave_speed, nframes_t slave_transport_frame,
+ nframes_t this_delta, bool starting);
void follow_slave_silently(nframes_t nframes, float slave_speed);
-
+
void set_slave_source (SlaveSource);
SlaveSource post_export_slave;
bool _exporting;
bool _exporting_realtime;
-
+
boost::shared_ptr<ExportHandler> export_handler;
boost::shared_ptr<ExportStatus> export_status;
int pre_export ();
int stop_audio_export ();
void finalize_audio_export ();
-
+
sigc::connection export_freewheel_connection;
void prepare_diskstreams ();
if (actively_recording()) {
return true;
} else {
- if (Config->get_auto_input()) {
+ if (config.get_auto_input()) {
return false;
} else {
return true;
}
bool maybe_stop (nframes_t limit) {
- if ( (_transport_speed > 0.0f && _transport_frame >= limit)
- || (_transport_speed < 0.0f && _transport_frame == 0) ) {
+ if ( (_transport_speed > 0.0f && _transport_frame >= limit)
+ || (_transport_speed < 0.0f && _transport_frame == 0) ) {
stop_transport ();
return true;
}
MIDI::Port* _mtc_port;
MIDI::Port* _midi_port;
MIDI::Port* _midi_clock_port;
- string _path;
- string _name;
+ std::string _path;
+ std::string _name;
bool session_send_mmc;
bool session_send_mtc;
bool session_midi_feedback;
void when_engine_running ();
void graph_reordered ();
- string _current_snapshot_name;
+ std::string _current_snapshot_name;
- XMLTree* state_tree;
- bool state_was_pending;
+ XMLTree* state_tree;
+ bool state_was_pending;
StateOfTheState _state_of_the_state;
void auto_save();
int load_options (const XMLNode&);
- XMLNode& get_options () const;
- int load_state (string snapshot_name);
- bool save_config_options_predicate (ConfigVariableBase::Owner owner) const;
+ int load_state (std::string snapshot_name);
nframes_t _last_roll_location;
nframes_t _last_record_location;
bool pending_abort;
bool pending_auto_loop;
- Sample* butler_mixdown_buffer;
- float* butler_gain_buffer;
pthread_t butler_thread;
Glib::Mutex butler_request_lock;
Glib::Cond butler_paused;
sigc::connection auto_loop_changed_connection;
void auto_loop_changed (Location *);
- typedef list<Event *> Events;
+ typedef std::list<Event *> Events;
Events events;
Events immediate_events;
Events::iterator next_event;
bool _remove_event (Event *);
void _clear_event_type (Event::Type);
- void first_stage_init (string path, string snapshot_name);
+ void first_stage_init (std::string path, std::string snapshot_name);
int second_stage_init (bool new_tracks);
void find_current_end ();
void remove_empty_sounds ();
double step_speed;
typedef sigc::slot<bool> MidiTimeoutCallback;
- typedef list<MidiTimeoutCallback> MidiTimeoutList;
+ typedef std::list<MidiTimeoutCallback> MidiTimeoutList;
MidiTimeoutList midi_timeouts;
bool mmc_step_timeout ();
/* edit/mix groups */
- int load_route_groups (const XMLNode&, bool is_edit);
- int load_edit_groups (const XMLNode&);
- int load_mix_groups (const XMLNode&);
+ int load_route_groups (const XMLNode&, int);
-
- list<RouteGroup *> edit_groups;
- list<RouteGroup *> mix_groups;
+ std::list<RouteGroup *> _route_groups;
/* disk-streams */
void add_routes (RouteList&, bool save);
uint32_t destructive_index;
- boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&);
+ boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int);
/* mixer stuff */
- bool solo_update_disabled;
- bool currently_soloing;
+ bool solo_update_disabled;
+ void route_listen_changed (void *src, boost::weak_ptr<Route>);
void route_mute_changed (void *src);
void route_solo_changed (void *src, boost::weak_ptr<Route>);
- void catch_up_on_solo ();
- void catch_up_on_solo_mute_override ();
- void update_route_solo_state ();
- void modify_solo_mute (bool, bool);
- void strip_portname_for_solo (string& portname);
+ void update_route_solo_state (boost::shared_ptr<RouteList> r = boost::shared_ptr<RouteList>());
+
+ void listen_position_changed ();
+ void solo_control_mode_changed ();
/* REGION MANAGEMENT */
void update_region_name_map (boost::shared_ptr<Region>);
mutable Glib::Mutex region_lock;
- typedef map<PBD::ID,boost::shared_ptr<Region> > RegionList;
+ typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionList;
RegionList regions;
void add_region (boost::shared_ptr<Region>);
int load_regions (const XMLNode& node);
+ void route_group_changed ();
+
/* SOURCES */
mutable Glib::Mutex source_lock;
/* PLAYLISTS */
mutable Glib::Mutex playlist_lock;
- typedef set<boost::shared_ptr<Playlist> > PlaylistList;
+ typedef std::set<boost::shared_ptr<Playlist> > PlaylistList;
PlaylistList playlists;
PlaylistList unused_playlists;
void remove_playlist (boost::weak_ptr<Playlist>);
void track_playlist (bool, boost::weak_ptr<Playlist>);
- boost::shared_ptr<Playlist> playlist_factory (string name);
+ boost::shared_ptr<Playlist> playlist_factory (std::string name);
boost::shared_ptr<Playlist> XMLPlaylistFactory (const XMLNode&);
void playlist_length_changed ();
/* NAMED SELECTIONS */
mutable Glib::Mutex named_selection_lock;
- typedef set<NamedSelection *> NamedSelectionList;
+ typedef std::set<NamedSelection *> NamedSelectionList;
NamedSelectionList named_selections;
int load_named_selections (const XMLNode&);
- NamedSelection *named_selection_factory (string name);
+ NamedSelection *named_selection_factory (std::string name);
NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
/* CURVES and AUTOMATION LISTS */
/* INSERT AND SEND MANAGEMENT */
- list<PortInsert *> _port_inserts;
- list<PluginInsert *> _plugin_inserts;
- list<Send *> _sends;
boost::dynamic_bitset<uint32_t> send_bitset;
+ boost::dynamic_bitset<uint32_t> return_bitset;
boost::dynamic_bitset<uint32_t> insert_bitset;
- uint32_t send_cnt;
- uint32_t insert_cnt;
-
void add_processor (Processor *);
void remove_processor (Processor *);
struct space_and_path {
uint32_t blocks; /* 4kB blocks */
- string path;
+ std::string path;
space_and_path() {
blocks = 0;
}
};
- void setup_raid_path (string path);
+ void setup_raid_path (std::string path);
- vector<space_and_path> session_dirs;
- vector<space_and_path>::iterator last_rr_session_dir;
+ std::vector<space_and_path> session_dirs;
+ std::vector<space_and_path>::iterator last_rr_session_dir;
uint32_t _total_free_4k_blocks;
Glib::Mutex space_lock;
- string get_best_session_directory_for_new_source ();
+ std::string get_best_session_directory_for_new_source ();
void refresh_disk_space ();
mutable gint _playback_load;
void reverse_diskstream_buffers ();
- UndoHistory _history;
- UndoTransaction* current_trans;
+ UndoHistory _history;
+ std::stack<UndoTransaction*> _current_trans;
GlobalRouteBooleanState get_global_route_boolean (bool (Route::*method)(void) const);
GlobalRouteMeterState get_global_route_metering ();
Click (nframes_t s, nframes_t d, const Sample *b)
: start (s), duration (d), data (b) { offset = 0; }
- void *operator new(size_t ignored) {
+ void *operator new (size_t) {
return pool.alloc ();
};
- void operator delete(void *ptr, size_t size) {
+ void operator delete(void *ptr, size_t /*size*/) {
pool.release (ptr);
}
- private:
+ private:
static Pool pool;
};
- typedef list<Click*> Clicks;
+ typedef std::list<Click*> Clicks;
Clicks clicks;
bool _clicking;
void clear_clicks ();
void click (nframes_t start, nframes_t nframes);
- vector<Route*> master_outs;
+ std::vector<Route*> master_outs;
/* range playback */
- list<AudioRange> current_audio_range;
+ std::list<AudioRange> current_audio_range;
bool _play_range;
void set_play_range (bool yn);
void setup_auto_play ();
/* main outs */
uint32_t main_outs;
- boost::shared_ptr<IO> _master_out;
- boost::shared_ptr<IO> _control_out;
+ boost::shared_ptr<Route> _master_out;
+ boost::shared_ptr<Route> _control_out;
gain_t* _gain_automation_buffer;
pan_t** _pan_automation_buffer;
int find_all_sources (std::string path, std::set<std::string>& result);
int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot);
- LayerModel layer_model;
- CrossfadeModel xfade_model;
-
typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables;
Glib::Mutex controllables_lock;
Controllables controllables;
bool first_file_data_format_reset;
bool first_file_header_format_reset;
- void config_changed (const char*);
+ void config_changed (std::string, bool);
XMLNode& get_control_protocol_state ();
void sync_order_keys ();
static bool _disable_all_loaded_plugins;
-
+
SessionMetadata * _metadata;
mutable bool have_looped; ///< Used in ::audible_frame(*)
+
+ void update_have_rec_enabled_diskstream ();
+ gint _have_rec_enabled_diskstream;
};
} // namespace ARDOUR