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

Fix needlessley explodey MidiPlaylist constructor.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5909 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-24 22:39:11 +00:00
parent 31416ab7b1
commit 74fc799497
3 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/debug.h
View File

@ -31,12 +31,13 @@ namespace ARDOUR {
namespace DEBUG {
/* this namespace is so that we can write DEBUG::bit_name */
enum DebugBits {
MidiSourceIO = 0x1,
MidiPlaylistIO = 0x2
};
}
}
}
#ifndef NDEBUG

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

@ -1,6 +1,6 @@
/*
Copyright (C) 2006 Paul Davis
Written by Dave Robillard, 2006
Written by Dave Robillard, 2006
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

47
libs/ardour/midi_playlist.cc
View File

@ -44,8 +44,8 @@ using namespace sigc;
using namespace std;
MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
: Playlist (session, node, DataType::MIDI, hidden)
, _note_mode(Sustained)
: Playlist (session, node, DataType::MIDI, hidden)
, _note_mode(Sustained)
{
const XMLProperty* prop = node.property("type");
assert(prop && DataType(prop->value()) == DataType::MIDI);
@ -56,52 +56,13 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
}
MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
: Playlist (session, name, DataType::MIDI, hidden)
: Playlist (session, name, DataType::MIDI, hidden)
{
}
MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
: Playlist (other, name, hidden)
: Playlist (other, name, hidden)
{
throw; // nope
/*
list<Region*>::const_iterator in_o = other.regions.begin();
list<Region*>::iterator in_n = regions.begin();
while (in_o != other.regions.end()) {
MidiRegion *ar = dynamic_cast<MidiRegion *>( (*in_o) );
for (list<Crossfade *>::const_iterator xfades = other._crossfades.begin(); xfades != other._crossfades.end(); ++xfades) {
if ( &(*xfades)->in() == ar) {
// We found one! Now copy it!
list<Region*>::const_iterator out_o = other.regions.begin();
list<Region*>::const_iterator out_n = regions.begin();
while (out_o != other.regions.end()) {
MidiRegion *ar2 = dynamic_cast<MidiRegion *>( (*out_o) );
if ( &(*xfades)->out() == ar2) {
MidiRegion *in = dynamic_cast<MidiRegion*>( (*in_n) );
MidiRegion *out = dynamic_cast<MidiRegion*>( (*out_n) );
Crossfade *new_fade = new Crossfade( *(*xfades), in, out);
add_crossfade(*new_fade);
break;
}
out_o++;
out_n++;
}
// cerr << "HUH!? second region in the crossfade not found!" << endl;
}
}
in_o++;
in_n++;
}
*/
}
MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t dur, string name, bool hidden)