void
Editor::remove_a_region (boost::shared_ptr<Region> r)
{
- _session->remove_region_from_region_list (r);
+ // _session->remove_region_from_region_list (r);
}
void
#include "ardour/audioregion.h"
#include "ardour/audiofilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
#include "ardour/silentfilesource.h"
-#include "ardour/session_region.h"
#include "ardour/profile.h"
#include <gtkmm2ext/stop_signal.h>
if (_session) {
_session->RegionsAdded.connect (_session_connections, ui_bind (&EditorRegions::handle_new_regions, this, _1), gui_context());
- _session->RegionRemoved.connect (_session_connections, ui_bind (&EditorRegions::handle_region_removed, this, _1), gui_context());
_session->RegionHiddenChange.connect (_session_connections, ui_bind (&EditorRegions::region_hidden, this, _1), gui_context());
}
}
void
-EditorRegions::handle_region_removed (boost::weak_ptr<Region> wregion)
-{
- ENSURE_GUI_THREAD (*this, &EditorRegions::handle_region_removed, wregion)
-
- redisplay ();
-}
-
-void
-EditorRegions::handle_new_regions (vector<boost::weak_ptr<Region> >& v)
+EditorRegions::handle_new_regions (vector<boost::shared_ptr<Region> >& v)
{
ENSURE_GUI_THREAD (*this, &EditorRegions::handle_new_regions, v)
add_regions (v);
void
-EditorRegions::add_regions (vector<boost::weak_ptr<Region> >& regions)
+EditorRegions::add_regions (vector<boost::shared_ptr<Region> >& regions)
{
- for (vector<boost::weak_ptr<Region> >::iterator x = regions.begin(); x != regions.end(); ++x) {
- boost::shared_ptr<Region> region ((*x).lock());
- if (region) {
- add_region (region);
- }
+ for (vector<boost::shared_ptr<Region> >::iterator x = regions.begin(); x != regions.end(); ++x) {
+ add_region (*x);
}
}
*/
tmp_region_list.clear();
- _session->foreach_region (this, &EditorRegions::insert_into_tmp_regionlist);
+
+ const RegionFactory::RegionMap& regions (RegionFactory::regions());
+ for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+ insert_into_tmp_regionlist (i->second);
+ }
for (list<boost::shared_ptr<Region> >::iterator r = tmp_region_list.begin(); r != tmp_region_list.end(); ++r) {
add_region (*r);
}
if (region && Keyboard::is_delete_event (ev)) {
- _session->remove_region_from_region_list (region);
+ // _session->remove_region_from_region_list (region);
return true;
}
int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
- void handle_new_regions (std::vector<boost::weak_ptr<ARDOUR::Region> >& );
- void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
+ void handle_new_regions (std::vector<boost::shared_ptr<ARDOUR::Region> >& );
void add_region (boost::shared_ptr<ARDOUR::Region>);
- void add_regions (std::vector<boost::
weak_ptr<ARDOUR::Region> > & );
+ void add_regions (std::vector<boost::
shared_ptr<ARDOUR::Region> > & );
void region_hidden (boost::shared_ptr<ARDOUR::Region>);
void region_hidden_weak (boost::weak_ptr<ARDOUR::Region>);
void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &);
#include <glibmm/thread.h>
#include "pbd/id.h"
+#include "pbd/signals.h"
#include "ardour/types.h"
#include "ardour/region.h"
/** create a region with specified sources @param srcs and XML state */
static boost::shared_ptr<Region> create (SourceList& srcs, const XMLNode&);
+ static void map_remove (boost::shared_ptr<Region>);
+ static void delete_all_regions ();
+ static const RegionMap& regions() { return region_map; }
+ static uint32_t nregions ();
+
private:
static Glib::StaticMutex region_map_lock;
static RegionMap region_map;
static void map_add (boost::shared_ptr<Region>);
- static void map_remove (boost::shared_ptr<Region>);
+
+ static PBD::ScopedConnectionList region_list_connections;
};
}
/* region info */
- boost::shared_ptr<Region> region_by_id (const PBD::ID&) const;
boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>) const;
void add_regions (std::vector<boost::shared_ptr<Region> >&);
- PBD::Signal1<void,boost::weak_ptr<Region> > RegionAdded;
- PBD::Signal1<void,std::vector<boost::weak_ptr<Region> >&> RegionsAdded;
- PBD::Signal1<void,boost::weak_ptr<Region> > RegionRemoved;
+ PBD::Signal1<void,std::vector<boost::shared_ptr<Region> >&> RegionsAdded;
+ PBD::Signal1<void,boost::shared_ptr<Region> > RegionRemoved;
int region_name (std::string& result, std::string base = std::string(""), bool newlevel = false);
std::string new_region_name (std::string);
boost::shared_ptr<AudioRegion> XMLAudioRegionFactory (const XMLNode&, bool full);
boost::shared_ptr<MidiRegion> XMLMidiRegionFactory (const XMLNode&, bool full);
- template<class T> void foreach_region (T *obj, void (T::*func)(boost::shared_ptr<Region>));
-
/* source management */
void import_audiofiles (ImportStatus&);
void update_region_name_map (boost::shared_ptr<Region>);
mutable Glib::Mutex region_lock;
- typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionList;
- RegionList regions;
void add_region (boost::shared_ptr<Region>);
void region_changed (const PBD::PropertyChange&, boost::weak_ptr<Region>);
+++ /dev/null
-/*
- Copyright (C) 2000-2007 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __ardour_session_region_h__
-#define __ardour_session_region_h__
-
-#include "ardour/session.h"
-#include "ardour/audioregion.h"
-
-namespace ARDOUR {
-
-template<class T> void
-Session::foreach_region (T *obj, void (T::*func)(boost::shared_ptr<Region>))
-{
- Glib::Mutex::Lock lm (region_lock);
- for (RegionList::iterator i = regions.begin(); i != regions.end(); i++) {
- (obj->*func) (i->second);
- }
-}
-
-} // namespace ARDOUR
-
-#endif /* __ardour_session_region_h__ */
{
boost::shared_ptr<Region> ret = _playlist.region_by_id (id);
- if (!ret) {
- ret = _playlist.session().region_by_id (id);
- }
-
if (!ret) {
ret = RegionFactory::region_by_id (id);
}
+
return ret;
}
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
- /* XXX property name needs capitalizing */
-
if ((*i)->name() == capitalize (regions.property_name())) {
RegionListProperty* rlp = new RegionListProperty (*const_cast<Playlist*> (this));
PluginManager::~PluginManager()
{
+#ifdef HAVE_SLV2
delete _lv2_world;
+#endif
}
PBD::Signal1<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion;
Glib::StaticMutex RegionFactory::region_map_lock;
RegionFactory::RegionMap RegionFactory::region_map;
+PBD::ScopedConnectionList RegionFactory::region_list_connections;
boost::shared_ptr<Region>
RegionFactory::create (boost::shared_ptr<const Region> region)
return ret;
}
-
void
RegionFactory::map_add (boost::shared_ptr<Region> r)
{
{
Glib::Mutex::Lock lm (region_map_lock);
region_map.insert (p);
- /* we pay no attention to attempts to delete regions */
}
+
+ r->DropReferences.connect_same_thread (region_list_connections, boost::bind (&RegionFactory::map_remove, r));
}
void
RegionFactory::map_remove (boost::shared_ptr<Region> r)
{
- {
- Glib::Mutex::Lock lm (region_map_lock);
- RegionMap::iterator i = region_map.find (r->id());
- if (i != region_map.end()) {
- region_map.erase (i);
- }
+ Glib::Mutex::Lock lm (region_map_lock);
+ RegionMap::iterator i = region_map.find (r->id());
+
+ if (i != region_map.end()) {
+ region_map.erase (i);
}
}
void
RegionFactory::clear_map ()
{
- region_map.clear ();
+ region_list_connections.drop_connections ();
+
+ {
+ Glib::Mutex::Lock lm (region_map_lock);
+ region_map.clear ();
+ }
+
+}
+
+void
+RegionFactory::delete_all_regions ()
+{
+ RegionMap copy;
+
+ /* copy region list */
+ {
+ Glib::Mutex::Lock lm (region_map_lock);
+ copy = region_map;
+ }
+
+ /* clear existing map */
+ clear_map ();
+
+ /* tell everyone to drop references */
+ for (RegionMap::iterator i = copy.begin(); i != copy.end(); ++i) {
+ i->second->drop_references ();
+ }
+
+ /* the copy should now hold the only references, which will
+ vanish as we leave this scope, thus calling all destructors.
+ */
+}
+
+uint32_t
+RegionFactory::nregions ()
+{
+ Glib::Mutex::Lock lm (region_map_lock);
+ return region_map.size ();
}
_engine.remove_session ();
- /* clear region map. it doesn't hold references, but lets just be sensible here */
-
- RegionFactory::clear_map ();
-
/* clear history so that no references to objects are held any more */
_history.clear ();
named_selections.clear ();
DEBUG_TRACE (DEBUG::Destruction, "delete regions\n");
- for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
- DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for region %1 ; pre-ref = %2\n", i->second->name(), i->second.use_count()));
- i->second->drop_references ();
- }
- regions.clear ();
+ RegionFactory::delete_all_regions ();
DEBUG_TRACE (DEBUG::Destruction, "delete routes\n");
while (number < (UINT_MAX-1)) {
- RegionList::const_iterator i;
+ const RegionFactory::RegionMap& regions (RegionFactory::regions());
+ RegionFactory::RegionMap::const_iterator i;
string sbuf;
number++;
if (base == "") {
- Glib::Mutex::Lock lm (region_lock);
-
- snprintf (buf, sizeof (buf), "%d", (int)regions.size() + 1);
+ snprintf (buf, sizeof (buf), "%d", RegionFactory::nregions() + 1);
result = "region.";
result += buf;
void
Session::add_regions (vector<boost::shared_ptr<Region> >& new_regions)
{
- bool added = false;
-
- {
- Glib::Mutex::Lock lm (region_lock);
-
- for (vector<boost::shared_ptr<Region> >::iterator ii = new_regions.begin(); ii != new_regions.end(); ++ii) {
-
- boost::shared_ptr<Region> region = *ii;
-
- if (region == 0) {
-
- error << _("Session::add_region() ignored a null region. Warning: you might have lost a region.") << endmsg;
-
- } else {
-
- RegionList::iterator x;
-
- for (x = regions.begin(); x != regions.end(); ++x) {
-
- if (region->region_list_equivalent (x->second)) {
- break;
- }
- }
-
- if (x == regions.end()) {
-
- pair<RegionList::key_type,RegionList::mapped_type> entry;
-
- entry.first = region->id();
- entry.second = region;
-
- pair<RegionList::iterator,bool> x = regions.insert (entry);
-
- if (!x.second) {
- return;
- }
-
- added = true;
- }
- }
- }
- }
-
- /* mark dirty because something has changed even if we didn't
- add the region to the region list.
+ /* mark dirty because something has changed
*/
set_dirty ();
-
- if (added) {
-
- vector<boost::weak_ptr<Region> > v;
- boost::shared_ptr<Region> first_r;
-
- for (vector<boost::shared_ptr<Region> >::iterator ii = new_regions.begin(); ii != new_regions.end(); ++ii) {
-
- boost::shared_ptr<Region> region = *ii;
-
- if (region == 0) {
-
- error << _("Session::add_region() ignored a null region. Warning: you might have lost a region.") << endmsg;
-
- } else {
- v.push_back (region);
-
- if (!first_r) {
- first_r = region;
- }
- }
-
- region->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::region_changed, this, _1, boost::weak_ptr<Region>(region)));
- update_region_name_map (region);
- }
-
- if (!v.empty()) {
- RegionsAdded (v); /* EMIT SIGNAL */
- }
- }
+
+ for (vector<boost::shared_ptr<Region> >::iterator ii = new_regions.begin(); ii != new_regions.end(); ++ii) {
+
+ boost::shared_ptr<Region> region = *ii;
+ assert (region);
+
+ region->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::region_changed, this, _1, boost::weak_ptr<Region>(region)));
+ update_region_name_map (region);
+ }
+
+ if (!new_regions.empty()) {
+ RegionsAdded (new_regions); /* EMIT SIGNAL */
+ }
}
void
void
Session::remove_region (boost::weak_ptr<Region> weak_region)
{
- RegionList::iterator i;
boost::shared_ptr<Region> region (weak_region.lock ());
if (!region) {
return;
}
- bool removed = false;
-
- {
- Glib::Mutex::Lock lm (region_lock);
-
- if ((i = regions.find (region->id())) != regions.end()) {
- regions.erase (i);
- removed = true;
- }
- }
-
- /* mark dirty because something has changed even if we didn't
- remove the region from the region list.
- */
-
+ RegionFactory::map_remove (region);
set_dirty();
- if (removed) {
- RegionRemoved(region); /* EMIT SIGNAL */
- }
+ RegionRemoved(region); /* EMIT SIGNAL */
}
boost::shared_ptr<Region>
Session::find_whole_file_parent (boost::shared_ptr<Region const> child) const
{
- RegionList::const_iterator i;
+ const RegionFactory::RegionMap& regions (RegionFactory::regions());
+ RegionFactory::RegionMap::const_iterator i;
boost::shared_ptr<Region> region;
Glib::Mutex::Lock lm (region_lock);
return boost::shared_ptr<Region> ();
}
-boost::shared_ptr<Region>
-Session::region_by_id (const PBD::ID& id) const
-{
- Glib::Mutex::Lock lm (region_lock);
-
- RegionList::const_iterator i = regions.find (id);
-
- if (i != regions.end()) {
- return i->second;
- }
-
- return boost::shared_ptr<Region> ();
-}
-
int
Session::destroy_region (boost::shared_ptr<Region> region)
{
for (vector<boost::shared_ptr<Source> >::iterator i = srcs.begin(); i != srcs.end(); ++i) {
- (*i)->mark_for_remove ();
- (*i)->drop_references ();
-
- cerr << "source was not used by any playlist\n";
+ (*i)->mark_for_remove ();
+ (*i)->drop_references ();
+
+ cerr << "source was not used by any playlist\n";
}
return 0;
}
}
- for (list<boost::shared_ptr<Region> >::iterator i = r.begin(); i != r.end(); ++i) {
- remove_region (*i);
- }
-
destroy_regions (r);
save_state (_current_snapshot_name);
return 0;
}
-int
-Session::remove_region_from_region_list (boost::shared_ptr<Region> r)
-{
- remove_region (r);
- return 0;
-}
-
/* Source Management */
void
if (full_state) {
Glib::Mutex::Lock rl (region_lock);
-#if 0
- for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-
- /* only store regions not attached to playlists */
-
- if (i->second->playlist() == 0) {
- child->add_child_nocopy (i->second->state (true));
- }
- }
-#else
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<Region> r = i->second;
child->add_child_nocopy (r->state (true));
}
}
-#endif
-
}
child = node->add_child ("DiskStreams");
*/
+#include "pbd/property_list.h"
+
#include "ardour/strip_silence.h"
#include "ardour/audioregion.h"
#include "ardour/region_factory.h"
results.clear ();
/* we only operate on AudioRegions, for now, though this could be adapted to MIDI
- as well I guess */
+ as well I guess
+ */
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (r);
InterThreadInfo itt;
}
std::list<std::pair<framepos_t, framecnt_t > >::const_iterator s = silence.begin ();
- framepos_t const pos = region->position ();
- framepos_t const end = region->start () + region->length() - 1;
- framepos_t const start = region->start ();
-
- region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region));
- region->set_name (session.new_region_name (region->name ()));
- boost::shared_ptr<AudioRegion> last_region = region;
- results.push_back (region);
-
- if (s->first == 0) {
- /* the region starts with some silence */
-
- /* we must set length to an intermediate value here, otherwise the call
- ** to set_start will fail */
- region->set_length (region->length() - s->second + _fade_length, 0);
- region->set_start (start + s->second - _fade_length, 0);
- region->set_position (pos + s->second - _fade_length, 0);
- region->set_fade_in_active (true);
- region->set_fade_in (AudioRegion::Linear, _fade_length);
- s++;
- }
+ PBD::PropertyList plist;
+ framepos_t start = 0;
+ framepos_t end;
+ bool in_silence;
+ boost::shared_ptr<AudioRegion> copy;
- while (s != silence.end()) {
+ if (s->first == 0) {
+ /* initial segment, starting at zero, is silent */
+ end = s->second;
+ in_silence = true;
+ } else {
+ /* initial segment, starting at zero, is audible */
+ end = s->first;
+ in_silence = false;
+ }
- /* trim the end of this region */
- region->trim_end (pos + s->first + _fade_length, 0);
- region->set_fade_out_active (true);
- region->set_fade_out (AudioRegion::Linear, _fade_length);
+ while (s != silence.end()) {
- /* make a new region and trim its start */
- region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (region));
- region->set_name (session.new_region_name (region->name ()));
- last_region = region;
- assert (region);
- results.push_back (region);
+ framecnt_t interval_duration;
- /* set length here for the same reasons as above */
- region->set_length (region->length() - s->second + _fade_length, 0);
- region->set_start (start + s->second - _fade_length, 0);
- region->set_position (pos + s->second - _fade_length, 0);
- region->set_fade_in_active (true);
- region->set_fade_in (AudioRegion::Linear, _fade_length);
+ interval_duration = end - start;
- s++;
- }
- if (silence.back().second == end) {
- /* the last region we created is zero-sized, so just remove it */
- results.pop_back ();
- } else {
- /* finish off the last region */
- last_region->trim_end (end, 0);
- }
+ if (!in_silence && interval_duration > 0) {
+
+ plist.clear ();
+ plist.add (Properties::length, interval_duration);
+ plist.add (Properties::position, region->position() + start);
+
+ copy = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create
+ (region, start, plist));
+
+ copy->set_name (session.new_region_name (region->name ()));
+
+ std::cerr << "New silent delineated region called " << copy->name()
+ << " @ " << copy->start() << " length = " << copy->length() << " pos = " <<
+ copy->position() << std::endl;
+
+ copy->set_fade_in_active (true);
+ copy->set_fade_in (AudioRegion::Linear, _fade_length);
+ results.push_back (copy);
+ }
+
+ start = end;
+ ++s;
+ end = s->first;
+ in_silence = !in_silence;
+ }
return 0;
}
projects / ardour.git / commitdiff