smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 01:56:34 +01:00
Code Issues Projects Releases Wiki Activity

Remove LengthChanged that no-one was listening to.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11023 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-20 02:03:38 +00:00
parent e9b4f14668
commit 3c8786f45b
2 changed files with 1 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/playlist.h
View file

@ -180,7 +180,6 @@ public:
PBD::Signal1<void,boost::weak_ptr<Region> > RegionAdded; PBD::Signal1<void,boost::weak_ptr<Region> > RegionAdded;
PBD::Signal1<void,boost::weak_ptr<Region> > RegionRemoved; PBD::Signal1<void,boost::weak_ptr<Region> > RegionRemoved;
PBD::Signal0<void> NameChanged; PBD::Signal0<void> NameChanged;
PBD::Signal0<void> LengthChanged;
PBD::Signal0<void> LayeringChanged; PBD::Signal0<void> LayeringChanged;
/** Emitted when regions have moved (not when regions have only been trimmed) */ /** Emitted when regions have moved (not when regions have only been trimmed) */
@ -265,7 +264,6 @@ public:
RegionList pending_bounds; RegionList pending_bounds;
bool pending_contents_change; bool pending_contents_change;
bool pending_layering; bool pending_layering;
bool pending_length;
/** Movements of time ranges caused by region moves; note that /** Movements of time ranges caused by region moves; note that
* region trims are not included in this list; it is used to * region trims are not included in this list; it is used to

35
libs/ardour/playlist.cc
View file

@ -304,7 +304,6 @@ Playlist::init (bool hide)
g_atomic_int_set (&block_notifications, 0); g_atomic_int_set (&block_notifications, 0);
g_atomic_int_set (&ignore_state_changes, 0); g_atomic_int_set (&ignore_state_changes, 0);
pending_contents_change = false; pending_contents_change = false;
pending_length = false;
pending_layering = false; pending_layering = false;
first_set_state = true; first_set_state = true;
_refcnt = 0; _refcnt = 0;
@ -473,13 +472,10 @@ Playlist::notify_region_removed (boost::shared_ptr<Region> r)
if (holding_state ()) { if (holding_state ()) {
pending_removes.insert (r); pending_removes.insert (r);
pending_contents_change = true; pending_contents_change = true;
pending_length = true;
} else { } else {
/* this might not be true, but we have to act /* this might not be true, but we have to act
as though it could be. as though it could be.
*/ */
pending_length = false;
LengthChanged (); /* EMIT SIGNAL */
pending_contents_change = false; pending_contents_change = false;
RegionRemoved (boost::weak_ptr<Region> (r)); /* EMIT SIGNAL */ RegionRemoved (boost::weak_ptr<Region> (r)); /* EMIT SIGNAL */
ContentsChanged (); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */
@ -559,11 +555,8 @@ Playlist::notify_region_added (boost::shared_ptr<Region> r)
if (holding_state()) { if (holding_state()) {
pending_adds.insert (r); pending_adds.insert (r);
pending_contents_change = true; pending_contents_change = true;
pending_length = true;
} else { } else {
r->clear_changes (); r->clear_changes ();
pending_length = false;
LengthChanged (); /* EMIT SIGNAL */
pending_contents_change = false; pending_contents_change = false;
RegionAdded (boost::weak_ptr<Region> (r)); /* EMIT SIGNAL */ RegionAdded (boost::weak_ptr<Region> (r)); /* EMIT SIGNAL */
ContentsChanged (); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */
@ -573,11 +566,7 @@ Playlist::notify_region_added (boost::shared_ptr<Region> r)
void void
Playlist::notify_length_changed () Playlist::notify_length_changed ()
{ {
if (holding_state ()) { if (!holding_state ()) {
pending_length = true;
} else {
pending_length = false;
LengthChanged(); /* EMIT SIGNAL */
pending_contents_change = false; pending_contents_change = false;
ContentsChanged (); /* EMIT SIGNAL */ ContentsChanged (); /* EMIT SIGNAL */
} }
@ -590,8 +579,6 @@ Playlist::flush_notifications (bool from_undo)
set<boost::shared_ptr<Region> > dependent_checks_needed; set<boost::shared_ptr<Region> > dependent_checks_needed;
set<boost::shared_ptr<Region> >::iterator s; set<boost::shared_ptr<Region> >::iterator s;
uint32_t regions_changed = false; uint32_t regions_changed = false;
bool check_length = false;
framecnt_t old_length = 0;
if (in_flush) { if (in_flush) {
return; return;
@ -601,10 +588,6 @@ Playlist::flush_notifications (bool from_undo)
if (!pending_bounds.empty() || !pending_removes.empty() || !pending_adds.empty()) { if (!pending_bounds.empty() || !pending_removes.empty() || !pending_adds.empty()) {
regions_changed = true; regions_changed = true;
if (!pending_length) {
old_length = _get_extent ().second;
check_length = true;
}
} }
/* we have no idea what order the regions ended up in pending /* we have no idea what order the regions ended up in pending
@ -638,19 +621,6 @@ Playlist::flush_notifications (bool from_undo)
dependent_checks_needed.insert (*s); dependent_checks_needed.insert (*s);
} }
if (check_length) {
if (old_length != _get_extent().second) {
pending_length = true;
// cerr << _name << " length has changed\n";
}
}
if (pending_length || (freeze_length != _get_extent().second)) {
pending_length = false;
// cerr << _name << " sends LengthChanged\n";
LengthChanged(); /* EMIT SIGNAL */
}
if (regions_changed || pending_contents_change) { if (regions_changed || pending_contents_change) {
if (!in_set_state) { if (!in_set_state) {
relayer (); relayer ();
@ -692,7 +662,6 @@ Playlist::flush_notifications (bool from_undo)
pending_range_moves.clear (); pending_range_moves.clear ();
pending_region_extensions.clear (); pending_region_extensions.clear ();
pending_contents_change = false; pending_contents_change = false;
pending_length = false;
} }
/************************************************************* /*************************************************************
@ -1701,8 +1670,6 @@ Playlist::flush_notifications (bool from_undo)
} }
pending_removes.clear (); pending_removes.clear ();
pending_length = false;
LengthChanged ();
pending_contents_change = false; pending_contents_change = false;
ContentsChanged (); ContentsChanged ();
} }