X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdiskstream.cc;h=6912846cd0023c93b66da2fe051a94d47ecd1232;hb=7b94110c545415af8437fc6631e7663ebb5c28f3;hp=8de2faeb15635af7f00b7d0edf4f52c8a2c49808;hpb=49ee64ada7f7661067a1dde8c02d40a8e2f6ca66;p=ardour.git diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 8de2faeb15..6912846cd0 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,21 +33,26 @@ #include -#include -#include +#include "pbd/error.h" +#include "pbd/basename.h" #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "pbd/xml++.h" +#include "pbd/memento_command.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/diskstream.h" +#include "ardour/utils.h" +#include "ardour/configuration.h" +#include "ardour/audiofilesource.h" +#include "ardour/send.h" +#include "ardour/playlist.h" +#include "ardour/cycle_timer.h" +#include "ardour/region.h" +#include "ardour/panner.h" +#include "ardour/session.h" +#include "ardour/io.h" +#include "ardour/route.h" #include "i18n.h" #include @@ -56,7 +61,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -/* XXX This goes uninitialized when there is no ~/.ardour2 directory. +/* XXX This goes uninitialized when there is no ~/.ardour3 directory. * I can't figure out why, so this will do for now (just stole the * default from configuration_vars.h). 0 is not a good value for * allocating buffer sizes.. @@ -71,8 +76,8 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) { init (flag); } - -Diskstream::Diskstream (Session& sess, const XMLNode& node) + +Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) : SessionObject(sess, "unnamed diskstream") { init (Recordable); @@ -82,7 +87,7 @@ void Diskstream::init (Flag f) { _flags = f; - _io = 0; + _route = 0; _alignment_style = ExistingMaterial; _persistent_alignment_style = ExistingMaterial; first_input_change = true; @@ -106,8 +111,8 @@ Diskstream::init (Flag f) loop_location = 0; wrap_buffer_size = 0; speed_buffer_size = 0; - last_phase = 0; - phi = (uint64_t) (0x1000000); + _speed = 1.0; + _target_speed = _speed; file_frame = 0; playback_sample = 0; playback_distance = 0; @@ -128,14 +133,19 @@ Diskstream::~Diskstream () } void -Diskstream::set_io (IO& io) +Diskstream::set_route (Route& r) { - _io = &io; + _route = &r; + _io = _route->input(); + input_change_pending = ConfigurationChanged; + non_realtime_input_change (); set_align_style_from_io (); + + _route->GoingAway.connect (mem_fun (*this, &Diskstream::route_going_away)); } void -Diskstream::handle_input_change (IOChange change, void *src) +Diskstream::handle_input_change (IOChange change, void * /*src*/) { Glib::Mutex::Lock lm (state_lock); @@ -173,23 +183,23 @@ Diskstream::realtime_set_speed (double sp, bool global) { bool changed = false; double new_speed = sp * _session.transport_speed(); - + if (_visible_speed != sp) { _visible_speed = sp; changed = true; } - + if (new_speed != _actual_speed) { - - nframes_t required_wrap_size = (nframes_t) floor (_session.get_block_size() * + + nframes_t required_wrap_size = (nframes_t) floor (_session.get_block_size() * fabs (new_speed)) + 1; - + if (required_wrap_size > wrap_buffer_size) { _buffer_reallocation_required = true; } - + _actual_speed = new_speed; - phi = (uint64_t) (0x1000000 * fabs(_actual_speed)); + _target_speed = fabs(_actual_speed); } if (changed) { @@ -226,7 +236,7 @@ Diskstream::set_capture_offset () return; } - _capture_offset = _io->input_latency(); + _capture_offset = _io->latency(); } void @@ -311,20 +321,22 @@ Diskstream::use_playlist (boost::shared_ptr playlist) plmod_connection.disconnect (); plgone_connection.disconnect (); + plregion_connection.disconnect (); if (_playlist) { _playlist->release(); } - + _playlist = playlist; _playlist->use(); if (!in_set_state && recordable()) { reset_write_sources (false); } - + plmod_connection = _playlist->Modified.connect (mem_fun (*this, &Diskstream::playlist_modified)); plgone_connection = _playlist->GoingAway.connect (bind (mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr(_playlist))); + plregion_connection = _playlist->RangesMoved.connect (mem_fun (*this, &Diskstream::playlist_ranges_moved)); } /* don't do this if we've already asked for it *or* if we are setting up @@ -336,7 +348,7 @@ Diskstream::use_playlist (boost::shared_ptr playlist) _session.request_overwrite_buffer (this); overwrite_queued = true; } - + PlaylistChanged (); /* EMIT SIGNAL */ _session.set_dirty (); @@ -344,7 +356,7 @@ Diskstream::use_playlist (boost::shared_ptr playlist) } void -Diskstream::playlist_changed (Change ignored) +Diskstream::playlist_changed (Change) { playlist_modified (); } @@ -355,7 +367,7 @@ Diskstream::playlist_modified () if (!i_am_the_modifier && !overwrite_queued) { _session.request_overwrite_buffer (this); overwrite_queued = true; - } + } } void @@ -365,14 +377,14 @@ Diskstream::playlist_deleted (boost::weak_ptr wpl) if (pl == _playlist) { - /* this catches an ordering issue with session destruction. playlists + /* this catches an ordering issue with session destruction. playlists are destroyed before diskstreams. we have to invalidate any handles we have to the playlist. */ - + if (_playlist) { _playlist.reset (); - } + } } } @@ -382,9 +394,9 @@ Diskstream::set_name (const string& str) if (str != _name) { assert(playlist()); playlist()->set_name (str); - + SessionObject::set_name(str); - + if (!in_set_state && recordable()) { /* rename existing capture files so that they have the correct name */ return rename_write_sources (); @@ -404,7 +416,73 @@ Diskstream::remove_region_from_last_capture (boost::weak_ptr wregion) if (!region) { return; } - + _last_capture_regions.remove (region); } +void +Diskstream::playlist_ranges_moved (list< Evoral::RangeMove > const & movements_frames) +{ + if (!_route || Config->get_automation_follows_regions () == false) { + return; + } + + list< Evoral::RangeMove > movements; + + for (list< Evoral::RangeMove >::const_iterator i = movements_frames.begin(); + i != movements_frames.end(); + ++i) { + + movements.push_back(Evoral::RangeMove(i->from, i->length, i->to)); + } + + /* move panner automation */ + boost::shared_ptr p = _route->main_outs()->panner (); + if (p) { + for (uint32_t i = 0; i < p->npanners (); ++i) { + boost::shared_ptr pan_alist = p->streampanner(i).pan_control()->alist(); + XMLNode & before = pan_alist->get_state (); + pan_alist->move_ranges (movements); + _session.add_command (new MementoCommand ( + *pan_alist.get(), &before, &pan_alist->get_state ())); + } + } + + /* move processor automation */ + _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &Diskstream::move_processor_automation), movements_frames)); +} + +void +Diskstream::move_processor_automation (boost::weak_ptr p, + list< Evoral::RangeMove > const & movements_frames) +{ + boost::shared_ptr processor (p.lock ()); + if (!processor) { + return; + } + + list< Evoral::RangeMove > movements; + for (list< Evoral::RangeMove >::const_iterator i = movements_frames.begin(); + i != movements_frames.end(); ++i) { + movements.push_back(Evoral::RangeMove(i->from, i->length, i->to)); + } + + set const a = processor->what_can_be_automated (); + + for (set::iterator i = a.begin (); i != a.end (); ++i) { + boost::shared_ptr al = processor->automation_control(*i)->alist(); + XMLNode & before = al->get_state (); + al->move_ranges (movements); + _session.add_command ( + new MementoCommand ( + *al.get(), &before, &al->get_state () + ) + ); + } +} + +void +Diskstream::route_going_away () +{ + _io.reset (); +}