diff options
| author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
| commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
| tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /libs/ardour/import.cc | |
| parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) | |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index b10f76424b..f16a6e7d8c 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -65,7 +65,7 @@ Session::import_audiofile (import_status& status) long n; string basepath; string sounds_dir; - jack_nframes_t so_far; + nframes_t so_far; char buf[PATH_MAX+1]; int ret = -1; vector<string> new_paths; |