ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix uninitialised variable and remove bind of shared_ptr to a slot. 

git-svn-id: svn://localhost/ardour2/branches/3.0@6057 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-11-10 23:54:04 +00:00
parent a65149b246
commit 5568bd9524
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View File

@ -1477,7 +1477,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
boost::shared_ptr<Playlist> XMLPlaylistFactory (const XMLNode&);
void playlist_length_changed ();
void diskstream_playlist_changed (boost::shared_ptr<Diskstream>);
void diskstream_playlist_changed (boost::weak_ptr<Diskstream>);
/* NAMED SELECTIONS */

13
libs/ardour/session.cc
View File

@ -132,6 +132,7 @@ Session::Session (AudioEngine &eng,
pending_events (2048),
state_tree (0),
_butler (new Butler (this)),
_post_transport_work (0),
_send_timecode_update (false),
midi_thread (pthread_t (0)),
midi_requests (128), // the size of this should match the midi request pool size
@ -217,6 +218,7 @@ Session::Session (AudioEngine &eng,
pending_events (2048),
state_tree (0),
_butler (new Butler (this)),
_post_transport_work (0),
_send_timecode_update (false),
midi_thread (pthread_t (0)),
midi_requests (16),
@ -869,8 +871,13 @@ Session::playlist_length_changed ()
}
void
Session::diskstream_playlist_changed (boost::shared_ptr<Diskstream> dstream)
Session::diskstream_playlist_changed (boost::weak_ptr<Diskstream> wp)
{
boost::shared_ptr<Diskstream> dstream = wp.lock ();
if (!dstream) {
return;
}
boost::shared_ptr<Playlist> playlist;
if ((playlist = dstream->playlist()) != 0) {
@ -2284,9 +2291,9 @@ Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
/* writer goes out of scope, copies ds back to main */
}
dstream->PlaylistChanged.connect (sigc::bind (mem_fun (*this, &Session::diskstream_playlist_changed), dstream));
dstream->PlaylistChanged.connect (sigc::bind (mem_fun (*this, &Session::diskstream_playlist_changed), boost::weak_ptr<Diskstream> (dstream)));
/* this will connect to future changes, and check the current length */
diskstream_playlist_changed (dstream);
diskstream_playlist_changed (boost::weak_ptr<Diskstream> (dstream));
dstream->RecordEnableChanged.connect (mem_fun (*this, &Session::update_have_rec_enabled_diskstream));