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

make session restore work by using explicit data types when creating new playlists ... poses question - how did this ever compile before? 

git-svn-id: svn://localhost/ardour2/branches/midi@1774 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-05-02 13:09:03 +00:00
parent 0c7b7216ef
commit a612857eb6
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/editor_ops.cc
View File

@ -2823,21 +2823,19 @@ Editor::cut_copy_regions (CutCopyOp op)
boost::shared_ptr<Region> r = (*x)->region();
boost::shared_ptr<Region> _xx;
assert (r != 0);
switch (op) {
case Cut:
if (!r) break;
_xx = RegionFactory::create ((*x)->region());
npl->add_region (_xx, (*x)->region()->position() - first_position);
pl->remove_region (((*x)->region()));
_xx = RegionFactory::create (r);
npl->add_region (_xx, r->position() - first_position);
pl->remove_region (r);
break;
case Copy:
if (!r) break;
/* copy region before adding, so we're not putting same object into two different playlists */
npl->add_region (RegionFactory::create ((*x)->region()), (*x)->region()->position() - first_position);
npl->add_region (RegionFactory::create (r, r->position() - first_position);
break;
case Clear:

3
gtk2_ardour/gain_meter.cc
View File

@ -454,8 +454,7 @@ GainMeter::setup_meters ()
int
GainMeter::get_gm_width ()
{
Gtk::Requisition sz;
hbox.size_request (sz);
Gtk::Requisition sz = hbox.size_request ();
return sz.width;
}

4
libs/ardour/audio_diskstream.cc
View File

@ -243,7 +243,7 @@ AudioDiskstream::find_and_use_playlist (const string& name)
boost::shared_ptr<AudioPlaylist> playlist;
if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (_session.playlist_by_name (name))) == 0) {
playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (_session, name));
playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (DataType::AUDIO, _session, name));
}
if (!playlist) {
@ -280,7 +280,7 @@ AudioDiskstream::use_new_playlist ()
newname = Playlist::bump_name (_name, _session);
}
if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (_session, newname, hidden()))) != 0) {
if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (DataType::AUDIO, _session, newname, hidden()))) != 0) {
playlist->set_orig_diskstream_id (id());
return use_playlist (playlist);

2
libs/ardour/audio_track.cc
View File

@ -818,7 +818,7 @@ AudioTrack::freeze (InterThreadInfo& itt)
}
}
new_playlist = PlaylistFactory::create (_session, new_playlist_name, false);
new_playlist = PlaylistFactory::create (DataType::AUDIO, _session, new_playlist_name, false);
region_name = new_playlist_name;
/* create a new region from all filesources, keep it private */

2
libs/ardour/midi_diskstream.cc
View File

@ -222,7 +222,7 @@ MidiDiskstream::find_and_use_playlist (const string& name)
boost::shared_ptr<MidiPlaylist> playlist;
if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (_session.playlist_by_name (name))) == 0) {
playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (_session, name));
playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (DataType::MIDI, _session, name));
}
if (!playlist) {