diff options
author | David Robillard <d@drobilla.net> | 2009-02-18 18:32:13 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-02-18 18:32:13 +0000 |
commit | 227eca405458d95ba5c7cbc89dc6d17272f990f8 (patch) | |
tree | e71711f436ca7085aac4687fe44c23a84914d4a0 /libs/ardour | |
parent | 2463be97f79dddbeb90aa5fe5c323c8f2621bbab (diff) |
Fix ardour2 -> ardour3 issues.
git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/macosx/ardour.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | libs/ardour/source.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj index 4026b65f59..8786691730 100644 --- a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj +++ b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj @@ -1080,7 +1080,7 @@ /Library/Frameworks/SampleRate.framework/Headers, /Library/Frameworks/Raptor.framework/Headers, /Library/Frameworks/LRdf.framework/Headers, - /opt/ardour/src/ardour2/libs/surfaces/control_protocol, + /opt/ardour/src/ardour3/libs/surfaces/control_protocol, ); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; @@ -1138,7 +1138,7 @@ /Library/Frameworks/SampleRate.framework/Headers, /Library/Frameworks/Raptor.framework/Headers, /Library/Frameworks/LRdf.framework/Headers, - /opt/ardour/src/ardour2/libs/surfaces/control_protocol, + /opt/ardour/src/ardour3/libs/surfaces/control_protocol, ); INSTALL_PATH = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc index a0ee2ac706..12a5e7c071 100644 --- a/libs/ardour/source.cc +++ b/libs/ardour/source.cc @@ -161,7 +161,9 @@ Source::add_playlist (boost::shared_ptr<Playlist> pl) res.first->second++; } - pl->GoingAway.connect (bind (mem_fun (*this, &Source::remove_playlist), boost::weak_ptr<Playlist> (pl))); + pl->GoingAway.connect (bind ( + mem_fun (*this, &Source::remove_playlist), + boost::weak_ptr<Playlist> (pl))); } void |