diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /gtk2_ardour/sfdb_ui.cc | |
parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/sfdb_ui.cc')
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index f116041d03..bf2b90355f 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -344,7 +344,8 @@ SoundFileBox::audition () try { afs = boost::dynamic_pointer_cast<AudioFileSource> ( SourceFactory::createExternal (DataType::AUDIO, *_session, - path, n, Source::Flag (0), false)); + path, n, + Source::Flag (0), false)); srclist.push_back(afs); |