LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add control port to ardour.rc.in and fix crash bug caused by bad shared_ptr<Region>(this) construct, seen when invoking "Original Position" from region context menu 

git-svn-id: svn://localhost/ardour2/trunk@973 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-10-10 19:51:35 +00:00
parent 5a545c3c27
commit b94f199970
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -15,7 +15,7 @@ import SCons.Node.FS
SConsignFile()
EnsureSConsVersion(0, 96)
version = '2.0beta5'
version = '2.0beta5.1'
subst_dict = { }

1
ardour.rc.in
View File

@ -1,6 +1,7 @@
<?xml version="1.0"?>
<Ardour>
<MIDI-port tag="%MIDITAG%" device="ardour" type="%MIDITYPE%" mode="duplex"/>
<MIDI-port tag="control" device="ardour" type="%MIDITYPE%" mode="duplex"/>
<Config>
<Option name="minimum-disk-io-bytes" value="262144"/>
<Option name="track-buffer-seconds" value="5.000000"/>

7
libs/ardour/audioregion.cc
View File

@ -1238,7 +1238,12 @@ AudioRegion::get_parent()
boost::shared_ptr<Region> r;
if (_playlist) {
r = _playlist->session().find_whole_file_parent (boost::shared_ptr<AudioRegion>(this));
boost::shared_ptr<AudioRegion> ar;
boost::shared_ptr<AudioRegion> grrr2 = boost::dynamic_pointer_cast<AudioRegion> (shared_from_this());
if (grrr2 && (ar = _playlist->session().find_whole_file_parent (grrr2))) {
return boost::static_pointer_cast<Region> (ar);
}
}
return r;

2
libs/ardour/region.cc
View File

@ -293,7 +293,7 @@ Region::move_to_natural_position (void *src)
if (!_playlist) {
return;
}
boost::shared_ptr<Region> whole_file_region = get_parent();
if (whole_file_region) {

2
libs/ardour/session.cc
View File

@ -2524,7 +2524,7 @@ Session::find_whole_file_parent (boost::shared_ptr<AudioRegion> child)
}
}
return boost::shared_ptr<AudioRegion> ((AudioRegion*) 0);
return boost::shared_ptr<AudioRegion> ();
}
void